nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

on shutdown: destroy the net support window. clear a few more properties we dont want across restart. select NoEventMask on root.

Browse source
This commit is contained in:
Dana Jansens 2003-03-19 09:36:09 +00:00
parent 16787d0a17
commit 4fbc127a57
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
openbox/screen.c
View file

@ -29,6 +29,7 @@ GPtrArray *screen_desktop_names;
static Rect *area = NULL; static Rect *area = NULL;
static Strut *strut = NULL; static Strut *strut = NULL;
static Window support_window = None;
static void screen_update_area(); static void screen_update_area();
@ -45,7 +46,6 @@ static int another_running(Display *d, XErrorEvent *e)
gboolean screen_annex() gboolean screen_annex()
{ {
XErrorHandler old; XErrorHandler old;
Window support;
pid_t pid; pid_t pid;
int i, num_support; int i, num_support;
Atom *supported; Atom *supported;
@ -68,14 +68,14 @@ gboolean screen_annex()
PROP_SET32(ob_root, openbox_pid, cardinal, pid); PROP_SET32(ob_root, openbox_pid, cardinal, pid);
/* create the netwm support window */ /* create the netwm support window */
support = XCreateSimpleWindow(ob_display, ob_root, 0, 0, 1, 1, 0, 0, 0); support_window = XCreateSimpleWindow(ob_display, ob_root, 0,0,1,1,0,0,0);
/* set supporting window */ /* set supporting window */
PROP_SET32(ob_root, net_supporting_wm_check, window, support); PROP_SET32(ob_root, net_supporting_wm_check, window, support_window);
/* set properties on the supporting window */ /* set properties on the supporting window */
PROP_SETS(support, net_wm_name, utf8, "Openbox"); PROP_SETS(support_window, net_wm_name, utf8, "Openbox");
PROP_SET32(support, net_supporting_wm_check, window, support); PROP_SET32(support_window, net_supporting_wm_check, window,support_window);
/* set the _NET_SUPPORTED_ATOMS hint */ /* set the _NET_SUPPORTED_ATOMS hint */
num_support = 48; num_support = 48;
@ -167,7 +167,13 @@ void screen_shutdown()
{ {
guint i; guint i;
XSelectInput(ob_display, ob_root, NoEventMask);
PROP_ERASE(ob_root, openbox_pid); /* we're not running here no more! */ PROP_ERASE(ob_root, openbox_pid); /* we're not running here no more! */
PROP_ERASE(ob_root, net_supported); /* not without us */
PROP_ERASE(ob_root, net_showing_desktop); /* don't keep this mode */
XDestroyWindow(ob_display, support_window);
for (i = 0; i < screen_desktop_names->len; ++i) for (i = 0; i < screen_desktop_names->len; ++i)
g_free(g_ptr_array_index(screen_desktop_names, i)); g_free(g_ptr_array_index(screen_desktop_names, i));