summaryrefslogtreecommitdiff
path: root/src/add_window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/add_window.c')
-rw-r--r--src/add_window.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/add_window.c b/src/add_window.c
index d02a1c8..009d8f8 100644
--- a/src/add_window.c
+++ b/src/add_window.c
@@ -188,8 +188,8 @@ AddWindow(Window w, int iconm, IconMgr *iconp)
if (!I18N_FetchName(dpy, tmp_win->w, &name))
name = NULL;
- tmp_win->class = NoClass;
- XGetClassHint(dpy, tmp_win->w, &tmp_win->class);
+ tmp_win->xclass = NoClass;
+ XGetClassHint(dpy, tmp_win->w, &tmp_win->xclass);
FetchWmProtocols(tmp_win);
FetchWmColormapWindows(tmp_win);
@@ -263,44 +263,44 @@ AddWindow(Window w, int iconm, IconMgr *iconp)
tmp_win->transient = (short) Transient(tmp_win->w, &tmp_win->transientfor);
tmp_win->nameChanged = 0;
- if (tmp_win->class.res_name == NULL)
- tmp_win->class.res_name = NoName;
- if (tmp_win->class.res_class == NULL)
- tmp_win->class.res_class = NoName;
+ if (tmp_win->xclass.res_name == NULL)
+ tmp_win->xclass.res_name = NoName;
+ if (tmp_win->xclass.res_class == NULL)
+ tmp_win->xclass.res_class = NoName;
tmp_win->full_name = strdup(tmp_win->name);
namelen = (int) strlen(tmp_win->name);
tmp_win->highlight = Scr->Highlight &&
(!short_lookup LookInList(Scr->NoHighlight, tmp_win->full_name,
- &tmp_win->class));
+ &tmp_win->xclass));
tmp_win->stackmode = Scr->StackMode &&
(!short_lookup LookInList(Scr->NoStackModeL, tmp_win->full_name,
- &tmp_win->class));
+ &tmp_win->xclass));
tmp_win->titlehighlight = Scr->TitleHighlight &&
(!short_lookup LookInList(Scr->NoTitleHighlight, tmp_win->full_name,
- &tmp_win->class));
+ &tmp_win->xclass));
tmp_win->auto_raise = short_lookup LookInList(Scr->AutoRaise,
tmp_win->full_name,
- &tmp_win->class);
+ &tmp_win->xclass);
if (tmp_win->auto_raise)
Scr->NumAutoRaises++;
if (Scr->IconifyByUnmapping) {
tmp_win->iconify_by_unmapping = iconm ? FALSE :
!short_lookup LookInList(Scr->DontIconify, tmp_win->full_name,
- &tmp_win->class);
+ &tmp_win->xclass);
}
else {
tmp_win->iconify_by_unmapping = Scr->IconifyByUnmapping;
}
tmp_win->iconify_by_unmapping |=
short_lookup LookInList(Scr->IconifyByUn, tmp_win->full_name,
- &tmp_win->class);
+ &tmp_win->xclass);
- if (LookInList(Scr->WindowRingL, tmp_win->full_name, &tmp_win->class)) {
+ if (LookInList(Scr->WindowRingL, tmp_win->full_name, &tmp_win->xclass)) {
if (Scr->Ring) {
tmp_win->ring.next = Scr->Ring->ring.next;
if (Scr->Ring->ring.next->ring.prev)
@@ -323,10 +323,10 @@ AddWindow(Window w, int iconm, IconMgr *iconp)
*/
if (HasShape) {
if (!LookInList(Scr->DontSqueezeTitleL, tmp_win->full_name,
- &tmp_win->class)) {
+ &tmp_win->xclass)) {
tmp_win->squeeze_info = (SqueezeInfo *)
LookInList(Scr->SqueezeTitleL, tmp_win->full_name,
- &tmp_win->class);
+ &tmp_win->xclass);
if (!tmp_win->squeeze_info) {
static SqueezeInfo default_squeeze = { J_LEFT, 0, 0 };
if (Scr->SqueezeTitle)
@@ -348,16 +348,16 @@ AddWindow(Window w, int iconm, IconMgr *iconp)
tmp_win->title_height = Scr->TitleHeight + tmp_win->frame_bw;
if (Scr->NoTitlebar)
tmp_win->title_height = 0;
- if (LookInList(Scr->MakeTitle, tmp_win->full_name, &tmp_win->class))
+ if (LookInList(Scr->MakeTitle, tmp_win->full_name, &tmp_win->xclass))
tmp_win->title_height = Scr->TitleHeight + tmp_win->frame_bw;
- if (LookInList(Scr->NoTitle, tmp_win->full_name, &tmp_win->class))
+ if (LookInList(Scr->NoTitle, tmp_win->full_name, &tmp_win->xclass))
tmp_win->title_height = 0;
/* if it is a transient window, don't put a title on it */
if (tmp_win->transient && !Scr->DecorateTransients)
tmp_win->title_height = 0;
- if (LookInList(Scr->StartIconified, tmp_win->full_name, &tmp_win->class)) {
+ if (LookInList(Scr->StartIconified, tmp_win->full_name, &tmp_win->xclass)) {
if (!tmp_win->wmhints) {
tmp_win->wmhints = malloc(sizeof(XWMHints));
tmp_win->wmhints->flags = 0;
@@ -793,22 +793,22 @@ AddWindow(Window w, int iconm, IconMgr *iconp)
tmp_win->iconc.fore = Scr->IconC.fore;
tmp_win->iconc.back = Scr->IconC.back;
- GetColorFromList(Scr->BorderColorL, tmp_win->full_name, &tmp_win->class,
- &tmp_win->border);
- GetColorFromList(Scr->IconBorderColorL, tmp_win->full_name, &tmp_win->class,
- &tmp_win->icon_border);
+ GetColorFromList(Scr->BorderColorL, tmp_win->full_name,
+ &tmp_win->xclass, &tmp_win->border);
+ GetColorFromList(Scr->IconBorderColorL, tmp_win->full_name,
+ &tmp_win->xclass, &tmp_win->icon_border);
GetColorFromList(Scr->BorderTileForegroundL, tmp_win->full_name,
- &tmp_win->class, &tmp_win->border_tile.fore);
+ &tmp_win->xclass, &tmp_win->border_tile.fore);
GetColorFromList(Scr->BorderTileBackgroundL, tmp_win->full_name,
- &tmp_win->class, &tmp_win->border_tile.back);
- GetColorFromList(Scr->TitleForegroundL, tmp_win->full_name, &tmp_win->class,
- &tmp_win->title.fore);
- GetColorFromList(Scr->TitleBackgroundL, tmp_win->full_name, &tmp_win->class,
- &tmp_win->title.back);
- GetColorFromList(Scr->IconForegroundL, tmp_win->full_name, &tmp_win->class,
- &tmp_win->iconc.fore);
- GetColorFromList(Scr->IconBackgroundL, tmp_win->full_name, &tmp_win->class,
- &tmp_win->iconc.back);
+ &tmp_win->xclass, &tmp_win->border_tile.back);
+ GetColorFromList(Scr->TitleForegroundL, tmp_win->full_name,
+ &tmp_win->xclass, &tmp_win->title.fore);
+ GetColorFromList(Scr->TitleBackgroundL, tmp_win->full_name,
+ &tmp_win->xclass, &tmp_win->title.back);
+ GetColorFromList(Scr->IconForegroundL, tmp_win->full_name,
+ &tmp_win->xclass, &tmp_win->iconc.fore);
+ GetColorFromList(Scr->IconBackgroundL, tmp_win->full_name,
+ &tmp_win->xclass, &tmp_win->iconc.back);
/* create windows */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:45:12 +0000