summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
Diffstat (limited to 'openbox')
-rw-r--r--openbox/frame.c4
-rw-r--r--openbox/framerender.c54
-rw-r--r--openbox/menu_render.c6
-rw-r--r--openbox/popup.c12
-rw-r--r--openbox/screen.c2
5 files changed, 40 insertions, 38 deletions
diff --git a/openbox/frame.c b/openbox/frame.c
index 211a275c..358144dc 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -310,7 +310,7 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
self->bwidth;
XMapWindow(ob_display, self->handle);
- if (theme_a_focused_grip->surface.data.planar.grad ==
+ if (theme_a_focused_grip->surface.grad ==
Background_ParentRelative)
RECT_SET(self->a_focused_handle->area, 0, 0,
self->width, theme_handle_height);
@@ -319,7 +319,7 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
theme_grip_width + self->bwidth, 0,
self->width - (theme_grip_width + self->bwidth) * 2,
theme_handle_height);
- if (theme_a_unfocused_grip->surface.data.planar.grad ==
+ if (theme_a_unfocused_grip->surface.grad ==
Background_ParentRelative)
RECT_SET(self->a_unfocused_handle->area, 0, 0,
self->width, theme_handle_height);
diff --git a/openbox/framerender.c b/openbox/framerender.c
index 737dfe95..11092333 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -79,33 +79,33 @@ void framerender_frame(Frame *self)
paint(self->title, t);
/* set parents for any parent relative guys */
- l->surface.data.planar.parent = t;
- l->surface.data.planar.parentx = self->label_x;
- l->surface.data.planar.parenty = theme_bevel;
+ l->surface.parent = t;
+ l->surface.parentx = self->label_x;
+ l->surface.parenty = theme_bevel;
- m->surface.data.planar.parent = t;
- m->surface.data.planar.parentx = self->max_x;
- m->surface.data.planar.parenty = theme_bevel + 1;
+ m->surface.parent = t;
+ m->surface.parentx = self->max_x;
+ m->surface.parenty = theme_bevel + 1;
- n->surface.data.planar.parent = t;
- n->surface.data.planar.parentx = self->icon_x;
- n->surface.data.planar.parenty = theme_bevel;
+ n->surface.parent = t;
+ n->surface.parentx = self->icon_x;
+ n->surface.parenty = theme_bevel;
- i->surface.data.planar.parent = t;
- i->surface.data.planar.parentx = self->iconify_x;
- i->surface.data.planar.parenty = theme_bevel + 1;
+ i->surface.parent = t;
+ i->surface.parentx = self->iconify_x;
+ i->surface.parenty = theme_bevel + 1;
- d->surface.data.planar.parent = t;
- d->surface.data.planar.parentx = self->desk_x;
- d->surface.data.planar.parenty = theme_bevel + 1;
+ d->surface.parent = t;
+ d->surface.parentx = self->desk_x;
+ d->surface.parenty = theme_bevel + 1;
- s->surface.data.planar.parent = t;
- s->surface.data.planar.parentx = self->shade_x;
- s->surface.data.planar.parenty = theme_bevel + 1;
+ s->surface.parent = t;
+ s->surface.parentx = self->shade_x;
+ s->surface.parenty = theme_bevel + 1;
- c->surface.data.planar.parent = t;
- c->surface.data.planar.parentx = self->close_x;
- c->surface.data.planar.parenty = theme_bevel + 1;
+ c->surface.parent = t;
+ c->surface.parentx = self->close_x;
+ c->surface.parenty = theme_bevel + 1;
framerender_label(self, l);
framerender_max(self, m);
@@ -124,19 +124,19 @@ void framerender_frame(Frame *self)
g = (self->focused ?
theme_a_focused_grip : theme_a_unfocused_grip);
- if (g->surface.data.planar.grad == Background_ParentRelative) {
- g->surface.data.planar.parent = h;
+ if (g->surface.grad == Background_ParentRelative) {
+ g->surface.parent = h;
paint(self->handle, h);
} else
paint(self->handle, h);
- g->surface.data.planar.parentx = 0;
- g->surface.data.planar.parenty = 0;
+ g->surface.parentx = 0;
+ g->surface.parenty = 0;
paint(self->lgrip, g);
- g->surface.data.planar.parentx = self->width - theme_grip_width;
- g->surface.data.planar.parenty = 0;
+ g->surface.parentx = self->width - theme_grip_width;
+ g->surface.parenty = 0;
paint(self->rgrip, g);
}
diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index 4df4e413..fcaf6869 100644
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -133,9 +133,9 @@ void menu_entry_render(MenuEntry *self)
XMoveResizeWindow(ob_display, self->item, 0, self->y,
menu->size.width, menu->item_h);
- a->surface.data.planar.parent = menu->a_items;
- a->surface.data.planar.parentx = 0;
- a->surface.data.planar.parenty = self->y;
+ a->surface.parent = menu->a_items;
+ a->surface.parentx = 0;
+ a->surface.parenty = self->y;
paint(self->item, a);
}
diff --git a/openbox/popup.c b/openbox/popup.c
index a550e815..7406d2f1 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -195,10 +195,10 @@ void popup_show(Popup *self, char *text, Icon *icon)
RECT_SET(self->a_text->area, 0, 0, textw, texth);
RECT_SET(self->a_text->texture[0].position, theme_bevel, theme_bevel,
textw - theme_bevel * 2, texth - theme_bevel * 2);
- self->a_text->surface.data.planar.parent = self->a_bg;
- self->a_text->surface.data.planar.parentx = iconw +
+ self->a_text->surface.parent = self->a_bg;
+ self->a_text->surface.parentx = iconw +
theme_bevel * (self->hasicon ? 2 : 1);
- self->a_text->surface.data.planar.parenty = theme_bevel;
+ self->a_text->surface.parenty = theme_bevel;
XMoveResizeWindow(ob_display, self->text,
iconw + theme_bevel * (self->hasicon ? 2 : 1),
theme_bevel, textw, texth);
@@ -207,9 +207,9 @@ void popup_show(Popup *self, char *text, Icon *icon)
if (iconw < 1) iconw = 1; /* sanity check for crashes */
RECT_SET(self->a_icon->area, 0, 0, iconw, texth);
RECT_SET(self->a_icon->texture[0].position, 0, 0, iconw, texth);
- self->a_icon->surface.data.planar.parent = self->a_bg;
- self->a_icon->surface.data.planar.parentx = theme_bevel;
- self->a_icon->surface.data.planar.parenty = theme_bevel;
+ self->a_icon->surface.parent = self->a_bg;
+ self->a_icon->surface.parentx = theme_bevel;
+ self->a_icon->surface.parenty = theme_bevel;
XMoveResizeWindow(ob_display, self->icon,
theme_bevel, theme_bevel, iconw, texth);
}
diff --git a/openbox/screen.c b/openbox/screen.c
index 984010bf..85bf036d 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -336,7 +336,9 @@ void screen_set_desktop(guint num)
/* focus the last focused window on the desktop, and ignore enter events
from the switch so it doesnt mess with the focus */
while (XCheckTypedEvent(ob_display, EnterNotify, &e));
+ g_message("switch fallback");
focus_fallback(Fallback_Desktop);
+ g_message("/switch fallback");
dispatch_ob(Event_Ob_Desktop, num, old);
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-17 19:16:25 +0000