diff options
| -rw-r--r-- | openbox/client.c | 73 | ||||
| -rw-r--r-- | openbox/client.h | 3 | ||||
| -rw-r--r-- | openbox/config.c | 4 | ||||
| -rw-r--r-- | openbox/config.h | 2 |
4 files changed, 7 insertions, 75 deletions
diff --git a/openbox/client.c b/openbox/client.c index e09aff53..0feed299 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -268,7 +268,6 @@ void client_manage(Window window) self->window = window; /* non-zero defaults */ - self->title_count = 1; self->wmstate = WithdrawnState; /* make sure it gets updated first time */ self->layer = -1; self->desktop = screen_num_desktops; /* always an invalid value */ @@ -1648,7 +1647,6 @@ void client_update_title(ObClient *self) guint32 nums; guint i; gchar *data = NULL; - gboolean read_title; gchar *old_title; old_title = self->title; @@ -1658,60 +1656,17 @@ void client_update_title(ObClient *self) /* try old x stuff */ if (!(PROP_GETS(self->window, wm_name, locale, &data) || PROP_GETS(self->window, wm_name, utf8, &data))) { - // http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html - if (self->transient) { + if (self->transient != NULL) { + /* + GNOME alert windows are not given titles: + http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html + */ data = g_strdup(""); - goto no_number; } else data = g_strdup("Unnamed Window"); } } - if (config_title_number) { - - /* did the title change? then reset the title_count */ - if (old_title && 0 != strncmp(old_title, data, strlen(data))) - self->title_count = 1; - - /* look for duplicates and append a number */ - nums = 0; - for (it = client_list; it; it = g_list_next(it)) - if (it->data != self) { - ObClient *c = it->data; - - if (c->title_count == 1) { - if (!strcmp(c->title, data)) - nums |= 1 << c->title_count; - } else { - size_t len; - gchar *end; - - /* find the beginning of our " - [%u]", this relies on - that syntax being used */ - end = strrchr(c->title, '-') - 1; - len = end - c->title; - if (!strncmp(c->title, data, len)) - nums |= 1 << c->title_count; - } - } - /* find first free number */ - for (i = 1; i <= 32; ++i) - if (!(nums & (1 << i))) { - if (self->title_count == 1 || i == 1) - self->title_count = i; - break; - } - /* dont display the number for the first window */ - if (self->title_count > 1) { - gchar *ndata; - ndata = g_strdup_printf("%s - [%u]", data, self->title_count); - g_free(data); - data = ndata; - } - } else - self->title_count = 1; - -no_number: PROP_SETS(self->window, net_wm_visible_name, data); self->title = data; @@ -1724,28 +1679,14 @@ no_number: data = NULL; g_free(self->icon_title); - read_title = TRUE; /* try netwm */ if (!PROP_GETS(self->window, net_wm_icon_name, utf8, &data)) /* try old x stuff */ - if (!(PROP_GETS(self->window, wm_icon_name, locale, &data) - || PROP_GETS(self->window, wm_icon_name, utf8, &data))) { + if (!(PROP_GETS(self->window, wm_icon_name, locale, &data) || + PROP_GETS(self->window, wm_icon_name, utf8, &data))) data = g_strdup(self->title); - read_title = FALSE; - } - - /* append the title count, dont display the number for the first window. - * We don't need to check for config_title_number here since title_count - * is not set above 1 then. */ - if (read_title && self->title_count > 1) { - gchar *newdata; - newdata = g_strdup_printf("%s - [%u]", data, self->title_count); - g_free(data); - data = newdata; - } PROP_SETS(self->window, net_wm_visible_icon_name, data); - self->icon_title = data; } diff --git a/openbox/client.h b/openbox/client.h index 5a1e1652..53a318e0 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -114,9 +114,6 @@ struct _ObClient /*! Normal window title */ gchar *title; - /*! The count for the title. When another window with the same title - exists, a count will be appended to it. */ - guint title_count; /*! Window title when iconified */ gchar *icon_title; diff --git a/openbox/config.c b/openbox/config.c index 5e1ee09a..1d2f5432 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -40,7 +40,6 @@ gboolean config_theme_keepborder; gboolean config_theme_hidedisabled; gchar *config_title_layout; -gboolean config_title_number; RrFont *config_font_activewindow; RrFont *config_font_inactivewindow; @@ -437,8 +436,6 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, g_free(config_title_layout); config_title_layout = parse_string(doc, n); } - if ((n = parse_find_node("titleNumber", node))) - config_title_number = parse_bool(doc, n); if ((n = parse_find_node("keepBorder", node))) config_theme_keepborder = parse_bool(doc, n); if ((n = parse_find_node("hideDisabled", node))) @@ -797,7 +794,6 @@ void config_startup(ObParseInst *i) config_theme = NULL; config_title_layout = g_strdup("NLIMC"); - config_title_number = TRUE; config_theme_keepborder = TRUE; config_theme_hidedisabled = FALSE; diff --git a/openbox/config.h b/openbox/config.h index 96cd782c..c69e645b 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -91,8 +91,6 @@ extern gboolean config_theme_keepborder; extern gboolean config_theme_hidedisabled; /*! Titlebar button layout */ extern gchar *config_title_layout; -/*! Append a unique number to windows with same titles */ -extern gboolean config_title_number; /*! The font for the active window's title */ extern RrFont *config_font_activewindow; |