isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix atom name; it's _NET_SHOW_DESKTOP, not _NET_WM_SHOW_DESKTOP.

Browse Source 
2002-05-07  Anders Carlsson  <andersca@gnu.org>

	* src/display.c: (meta_display_open), (event_callback),
	(meta_display_update_show_desktop_hint):
	* src/display.h:
	* src/screen.c: (set_supported_hint):
	Fix atom name; it's _NET_SHOW_DESKTOP, not
	_NET_WM_SHOW_DESKTOP.

	* src/frames.c: (meta_frames_unmanage_window):
	Restore the mouse cursor to default when unmanaging a window.
This commit is contained in:
Anders Carlsson 2002-05-07 14:42:47 +00:00 committed by Anders Carlsson
parent de41777c69
commit 9138b9aa3c
5 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,15 @@
2002-05-07 Anders Carlsson <andersca@gnu.org>
* src/display.c: (meta_display_open), (event_callback),
(meta_display_update_show_desktop_hint):
* src/display.h:
* src/screen.c: (set_supported_hint):
Fix atom name; it's _NET_SHOW_DESKTOP, not
_NET_WM_SHOW_DESKTOP.
* src/frames.c: (meta_frames_unmanage_window):
Restore the mouse cursor to default when unmanaging a window.
2002-05-06 Anders Carlsson <andersca@gnu.org> 2002-05-06 Anders Carlsson <andersca@gnu.org>
* src/display.c: (set_utf8_string_hint): * src/display.c: (set_utf8_string_hint):
@ -8,7 +20,7 @@
(meta_display_show_desktop), (meta_display_unshow_desktop): (meta_display_show_desktop), (meta_display_unshow_desktop):
* src/display.h: * src/display.h:
* src/screen.c: (set_supported_hint): * src/screen.c: (set_supported_hint):
Add support for _NET_WM_SHOW desktop, both as a message and Add support for _NET_WM_SHOW_DESKTOP, both as a message and
as a root window property. as a root window property.
2002-05-05 Havoc Pennington <hp@pobox.com> 2002-05-05 Havoc Pennington <hp@pobox.com>

8
src/display.c
View File

@ -206,7 +206,7 @@ meta_display_open (const char *name)
"_NET_WM_PID", "_NET_WM_PID",
"WM_CLIENT_MACHINE", "WM_CLIENT_MACHINE",
"_NET_WM_WORKAREA", "_NET_WM_WORKAREA",
"_NET_WM_SHOW_DESKTOP" "_NET_SHOW_DESKTOP"
}; };
Atom atoms[G_N_ELEMENTS(atom_names)]; Atom atoms[G_N_ELEMENTS(atom_names)];
@ -314,7 +314,7 @@ meta_display_open (const char *name)
display->atom_net_wm_pid = atoms[54]; display->atom_net_wm_pid = atoms[54];
display->atom_wm_client_machine = atoms[55]; display->atom_wm_client_machine = atoms[55];
display->atom_net_wm_workarea = atoms[56]; display->atom_net_wm_workarea = atoms[56];
display->atom_net_wm_show_desktop = atoms[57]; display->atom_net_show_desktop = atoms[57];
/* Offscreen unmapped window used for _NET_SUPPORTING_WM_CHECK, /* Offscreen unmapped window used for _NET_SUPPORTING_WM_CHECK,
* created in screen_new * created in screen_new
@ -1267,7 +1267,7 @@ event_callback (XEvent *event,
meta_prefs_set_num_workspaces (num_spaces); meta_prefs_set_num_workspaces (num_spaces);
} }
else if (event->xclient.message_type == else if (event->xclient.message_type ==
display->atom_net_wm_show_desktop) display->atom_net_show_desktop)
{ {
gboolean show_desktop; gboolean show_desktop;
@ -2299,7 +2299,7 @@ meta_display_update_show_desktop_hint (MetaDisplay *display)
meta_error_trap_push (display); meta_error_trap_push (display);
XChangeProperty (display->xdisplay, screen->xroot, XChangeProperty (display->xdisplay, screen->xroot,
display->atom_net_wm_show_desktop, display->atom_net_show_desktop,
XA_CARDINAL, XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1); 32, PropModeReplace, (guchar*) data, 1);
meta_error_trap_pop (display); meta_error_trap_pop (display);

2
src/display.h
View File

@ -129,7 +129,7 @@ struct _MetaDisplay
Atom atom_wm_client_machine; Atom atom_wm_client_machine;
Atom atom_net_wm_state_fullscreen; Atom atom_net_wm_state_fullscreen;
Atom atom_net_wm_workarea; Atom atom_net_wm_workarea;
Atom atom_net_wm_show_desktop; Atom atom_net_show_desktop;
/* This is the actual window from focus events, /* This is the actual window from focus events,
* not the one we last set * not the one we last set

7
src/frames.c
View File

@ -450,7 +450,12 @@ meta_frames_unmanage_window (MetaFrames *frames,
frame = g_hash_table_lookup (frames->frames, &xwindow); frame = g_hash_table_lookup (frames->frames, &xwindow);
if (frame) if (frame)
{ {
/* restore the cursor */
meta_core_set_screen_cursor (gdk_display,
frame->xwindow,
META_CURSOR_DEFAULT);
gdk_window_set_user_data (frame->window, NULL); gdk_window_set_user_data (frame->window, NULL);
if (frames->last_motion_frame == frame) if (frames->last_motion_frame == frame)

2
src/screen.c
View File

@ -116,7 +116,7 @@ set_supported_hint (MetaScreen *screen)
atoms[27] = screen->display->atom_net_wm_ping; atoms[27] = screen->display->atom_net_wm_ping;
atoms[28] = screen->display->atom_net_active_window; atoms[28] = screen->display->atom_net_active_window;
atoms[29] = screen->display->atom_net_wm_workarea; atoms[29] = screen->display->atom_net_wm_workarea;
atoms[30] = screen->display->atom_net_wm_show_desktop; atoms[30] = screen->display->atom_net_show_desktop;
XChangeProperty (screen->display->xdisplay, screen->xroot, XChangeProperty (screen->display->xdisplay, screen->xroot,
screen->display->atom_net_supported, screen->display->atom_net_supported,