projects
/
dana
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'backport' into work
[dana/openbox.git]
/
openbox
/
popup.c
diff --git
a/openbox/popup.c
b/openbox/popup.c
index
2a0d596
..
bddf137
100644
(file)
--- a/
openbox/popup.c
+++ b/
openbox/popup.c
@@
-25,7
+25,6
@@
#include "stacking.h"
#include "event.h"
#include "screen.h"
#include "stacking.h"
#include "event.h"
#include "screen.h"
-#include "mainloop.h"
#include "render/render.h"
#include "render/theme.h"
#include "render/render.h"
#include "render/theme.h"
@@
-34,7
+33,7
@@
ObPopup *popup_new(void)
XSetWindowAttributes attrib;
ObPopup *self = g_new0(ObPopup, 1);
XSetWindowAttributes attrib;
ObPopup *self = g_new0(ObPopup, 1);
- self->obwin.type =
Window_Internal
;
+ self->obwin.type =
OB_WINDOW_CLASS_INTERNAL
;
self->gravity = NorthWestGravity;
self->x = self->y = self->textw = self->h = 0;
self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
self->gravity = NorthWestGravity;
self->x = self->y = self->textw = self->h = 0;
self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
@@
-42,34
+41,34
@@
ObPopup *popup_new(void)
self->iconwm = self->iconhm = 1;
attrib.override_redirect = True;
self->iconwm = self->iconhm = 1;
attrib.override_redirect = True;
- self->bg = XCreateWindow(ob
_display, RootWindow(ob_display,
ob_screen),
+ self->bg = XCreateWindow(ob
t_display, obt_root(
ob_screen),
0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
InputOutput, RrVisual(ob_rr_inst),
CWOverrideRedirect, &attrib);
0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
InputOutput, RrVisual(ob_rr_inst),
CWOverrideRedirect, &attrib);
- self->text = XCreateWindow(ob_display, self->bg,
+ self->text = XCreateWindow(ob
t
_display, self->bg,
0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
InputOutput, RrVisual(ob_rr_inst), 0, NULL);
0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
InputOutput, RrVisual(ob_rr_inst), 0, NULL);
- XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->obwidth);
- XSetWindowBorder(ob_display, self->bg,
+ XSetWindowBorderWidth(ob
t
_display, self->bg, ob_rr_theme->obwidth);
+ XSetWindowBorder(ob
t
_display, self->bg,
RrColorPixel(ob_rr_theme->osd_border_color));
RrColorPixel(ob_rr_theme->osd_border_color));
- XMapWindow(ob_display, self->text);
+ XMapWindow(ob
t
_display, self->text);
stacking_add(INTERNAL_AS_WINDOW(self));
stacking_add(INTERNAL_AS_WINDOW(self));
-
g_hash_table_insert(window_map, &self->bg, self
);
+
window_add(&self->bg, INTERNAL_AS_WINDOW(self)
);
return self;
}
void popup_free(ObPopup *self)
{
if (self) {
return self;
}
void popup_free(ObPopup *self)
{
if (self) {
- XDestroyWindow(ob_display, self->bg);
- XDestroyWindow(ob_display, self->text);
+ XDestroyWindow(ob
t
_display, self->bg);
+ XDestroyWindow(ob
t
_display, self->text);
RrAppearanceFree(self->a_bg);
RrAppearanceFree(self->a_text);
RrAppearanceFree(self->a_bg);
RrAppearanceFree(self->a_text);
-
g_hash_table_remove(window_map, &
self->bg);
+
window_remove(
self->bg);
stacking_remove(self);
g_free(self);
}
stacking_remove(self);
g_free(self);
}
@@
-141,7
+140,7
@@
static gboolean popup_show_timeout(gpointer data)
{
ObPopup *self = data;
{
ObPopup *self = data;
- XMapWindow(ob_display, self->bg);
+ XMapWindow(ob
t
_display, self->bg);
stacking_raise(INTERNAL_AS_WINDOW(self));
self->mapped = TRUE;
self->delay_mapped = FALSE;
stacking_raise(INTERNAL_AS_WINDOW(self));
self->mapped = TRUE;
self->delay_mapped = FALSE;
@@
-273,7
+272,7
@@
void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
}
/* set the windows/appearances up */
}
/* set the windows/appearances up */
- XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
+ XMoveResizeWindow(ob
t
_display, self->bg, x, y, w, h);
/* when there is no icon and the text is not parent relative, then
fill the whole dialog with the text appearance, don't use the bg at all
*/
/* when there is no icon and the text is not parent relative, then
fill the whole dialog with the text appearance, don't use the bg at all
*/
@@
-284,7
+283,7
@@
void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
self->a_text->surface.parent = self->a_bg;
self->a_text->surface.parentx = textx;
self->a_text->surface.parenty = texty;
self->a_text->surface.parent = self->a_bg;
self->a_text->surface.parentx = textx;
self->a_text->surface.parenty = texty;
- XMoveResizeWindow(ob_display, self->text, textx, texty, textw, texth);
+ XMoveResizeWindow(ob
t
_display, self->text, textx, texty, textw, texth);
RrPaint(self->a_text, self->text, textw, texth);
}
RrPaint(self->a_text, self->text, textw, texth);
}
@@
-296,9
+295,9
@@
void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
if (usec) {
/* don't kill previous show timers */
if (!self->delay_mapped) {
if (usec) {
/* don't kill previous show timers */
if (!self->delay_mapped) {
- ob_main_loop_timeout_add(ob_main_loop, usec,
- popup_show_timeout, self,
- g_direct_equal, NULL);
+ ob
t
_main_loop_timeout_add(ob_main_loop, usec,
+
popup_show_timeout, self,
+
g_direct_equal, NULL);
self->delay_mapped = TRUE;
}
} else {
self->delay_mapped = TRUE;
}
} else {
@@
-315,12
+314,12
@@
void popup_hide(ObPopup *self)
/* kill enter events cause by this unmapping */
ignore_start = event_start_ignore_all_enters();
/* kill enter events cause by this unmapping */
ignore_start = event_start_ignore_all_enters();
- XUnmapWindow(ob_display, self->bg);
+ XUnmapWindow(ob
t
_display, self->bg);
self->mapped = FALSE;
event_end_ignore_all_enters(ignore_start);
} else if (self->delay_mapped) {
self->mapped = FALSE;
event_end_ignore_all_enters(ignore_start);
} else if (self->delay_mapped) {
- ob_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE);
+ ob
t
_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE);
self->delay_mapped = FALSE;
}
}
self->delay_mapped = FALSE;
}
}
@@
-332,7
+331,7
@@
static void icon_popup_draw_icon(gint x, gint y, gint w, gint h, gpointer data)
self->a_icon->surface.parent = self->popup->a_bg;
self->a_icon->surface.parentx = x;
self->a_icon->surface.parenty = y;
self->a_icon->surface.parent = self->popup->a_bg;
self->a_icon->surface.parentx = x;
self->a_icon->surface.parenty = y;
- XMoveResizeWindow(ob_display, self->icon, x, y, w, h);
+ XMoveResizeWindow(ob
t
_display, self->icon, x, y, w, h);
RrPaint(self->a_icon, self->icon, w, h);
}
RrPaint(self->a_icon, self->icon, w, h);
}
@@
-343,11
+342,11
@@
ObIconPopup *icon_popup_new(void)
self = g_new0(ObIconPopup, 1);
self->popup = popup_new();
self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
self = g_new0(ObIconPopup, 1);
self->popup = popup_new();
self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
- self->icon = XCreateWindow(ob_display, self->popup->bg,
+ self->icon = XCreateWindow(ob
t
_display, self->popup->bg,
0, 0, 1, 1, 0,
RrDepth(ob_rr_inst), InputOutput,
RrVisual(ob_rr_inst), 0, NULL);
0, 0, 1, 1, 0,
RrDepth(ob_rr_inst), InputOutput,
RrVisual(ob_rr_inst), 0, NULL);
- XMapWindow(ob_display, self->icon);
+ XMapWindow(ob
t
_display, self->icon);
self->popup->hasicon = TRUE;
self->popup->draw_icon = icon_popup_draw_icon;
self->popup->hasicon = TRUE;
self->popup->draw_icon = icon_popup_draw_icon;
@@
-359,7
+358,7
@@
ObIconPopup *icon_popup_new(void)
void icon_popup_free(ObIconPopup *self)
{
if (self) {
void icon_popup_free(ObIconPopup *self)
{
if (self) {
- XDestroyWindow(ob_display, self->icon);
+ XDestroyWindow(ob
t
_display, self->icon);
RrAppearanceFree(self->a_icon);
popup_free(self->popup);
g_free(self);
RrAppearanceFree(self->a_icon);
popup_free(self->popup);
g_free(self);
@@
-485,7
+484,7
@@
static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
a->surface.parent = self->popup->a_bg;
a->surface.parentx = x + px;
a->surface.parenty = y + py;
a->surface.parent = self->popup->a_bg;
a->surface.parentx = x + px;
a->surface.parenty = y + py;
- XMoveResizeWindow(ob_display, self->wins[n],
+ XMoveResizeWindow(ob
t
_display, self->wins[n],
x + px, y + py, eachw, eachh);
RrPaint(a, self->wins[n], eachw, eachh);
}
x + px, y + py, eachw, eachh);
RrPaint(a, self->wins[n], eachw, eachh);
}
@@
-520,7
+519,7
@@
void pager_popup_free(ObPagerPopup *self)
guint i;
for (i = 0; i < self->desks; ++i)
guint i;
for (i = 0; i < self->desks; ++i)
- XDestroyWindow(ob_display, self->wins[i]);
+ XDestroyWindow(ob
t
_display, self->wins[i]);
g_free(self->wins);
RrAppearanceFree(self->hilight);
RrAppearanceFree(self->unhilight);
g_free(self->wins);
RrAppearanceFree(self->hilight);
RrAppearanceFree(self->unhilight);
@@
-536,7
+535,7
@@
void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
if (screen_num_desktops < self->desks)
for (i = screen_num_desktops; i < self->desks; ++i)
if (screen_num_desktops < self->desks)
for (i = screen_num_desktops; i < self->desks; ++i)
- XDestroyWindow(ob_display, self->wins[i]);
+ XDestroyWindow(ob
t
_display, self->wins[i]);
if (screen_num_desktops != self->desks)
self->wins = g_renew(Window, self->wins, screen_num_desktops);
if (screen_num_desktops != self->desks)
self->wins = g_renew(Window, self->wins, screen_num_desktops);
@@
-547,12
+546,12
@@
void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
attr.border_pixel =
RrColorPixel(ob_rr_theme->osd_border_color);
attr.border_pixel =
RrColorPixel(ob_rr_theme->osd_border_color);
- self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
+ self->wins[i] = XCreateWindow(ob
t
_display, self->popup->bg,
0, 0, 1, 1, ob_rr_theme->obwidth,
RrDepth(ob_rr_inst), InputOutput,
RrVisual(ob_rr_inst), CWBorderPixel,
&attr);
0, 0, 1, 1, ob_rr_theme->obwidth,
RrDepth(ob_rr_inst), InputOutput,
RrVisual(ob_rr_inst), CWBorderPixel,
&attr);
- XMapWindow(ob_display, self->wins[i]);
+ XMapWindow(ob
t
_display, self->wins[i]);
}
self->desks = screen_num_desktops;
}
self->desks = screen_num_desktops;