re-enable the log handler, maybe it will break something, I don't remember
2002-09-23 Havoc Pennington <hp@pobox.com> * src/main.c (main): re-enable the log handler, maybe it will break something, I don't remember why I turned it off. * src/display.c: s/_NET_SHOW_DESKTOP/_NET_SHOWING_DESKTOP/ which is what's in the spec
This commit is contained in:
parent
f4e602a791
commit
94e75ba53c
5 changed files with 24 additions and 16 deletions
|
@ -1,3 +1,11 @@
|
|||
2002-09-23 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* src/main.c (main): re-enable the log handler, maybe it will
|
||||
break something, I don't remember why I turned it off.
|
||||
|
||||
* src/display.c: s/_NET_SHOW_DESKTOP/_NET_SHOWING_DESKTOP/ which
|
||||
is what's in the spec
|
||||
|
||||
2002-09-22 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* src/window.c (recalc_window_features): small reordering of
|
||||
|
|
|
@ -200,7 +200,7 @@ meta_display_open (const char *name)
|
|||
"_NET_WM_PID",
|
||||
"WM_CLIENT_MACHINE",
|
||||
"_NET_WORKAREA",
|
||||
"_NET_SHOW_DESKTOP",
|
||||
"_NET_SHOWING_DESKTOP",
|
||||
"_NET_DESKTOP_LAYOUT",
|
||||
"MANAGER",
|
||||
"TARGETS",
|
||||
|
@ -341,7 +341,7 @@ meta_display_open (const char *name)
|
|||
display->atom_net_wm_pid = atoms[54];
|
||||
display->atom_wm_client_machine = atoms[55];
|
||||
display->atom_net_workarea = atoms[56];
|
||||
display->atom_net_show_desktop = atoms[57];
|
||||
display->atom_net_showing_desktop = atoms[57];
|
||||
display->atom_net_desktop_layout = atoms[58];
|
||||
display->atom_manager = atoms[59];
|
||||
display->atom_targets = atoms[60];
|
||||
|
@ -1531,14 +1531,14 @@ event_callback (XEvent *event,
|
|||
meta_prefs_set_num_workspaces (num_spaces);
|
||||
}
|
||||
else if (event->xclient.message_type ==
|
||||
display->atom_net_show_desktop)
|
||||
display->atom_net_showing_desktop)
|
||||
{
|
||||
gboolean show_desktop;
|
||||
|
||||
show_desktop = event->xclient.data.l[0] != 0;
|
||||
meta_verbose ("Request to %s desktop\n", show_desktop ? "show" : "hide");
|
||||
|
||||
if (show_desktop)
|
||||
gboolean showing_desktop;
|
||||
|
||||
showing_desktop = event->xclient.data.l[0] != 0;
|
||||
meta_verbose ("Request to %s desktop\n", showing_desktop ? "show" : "hide");
|
||||
|
||||
if (showing_desktop)
|
||||
meta_display_show_desktop (display);
|
||||
else
|
||||
meta_display_unshow_desktop (display);
|
||||
|
@ -2661,7 +2661,7 @@ meta_display_increment_event_serial (MetaDisplay *display)
|
|||
}
|
||||
|
||||
static void
|
||||
meta_display_update_show_desktop_hint (MetaDisplay *display)
|
||||
meta_display_update_showing_desktop_hint (MetaDisplay *display)
|
||||
{
|
||||
GSList *tmp;
|
||||
|
||||
|
@ -2676,7 +2676,7 @@ meta_display_update_show_desktop_hint (MetaDisplay *display)
|
|||
|
||||
meta_error_trap_push (display);
|
||||
XChangeProperty (display->xdisplay, screen->xroot,
|
||||
display->atom_net_show_desktop,
|
||||
display->atom_net_showing_desktop,
|
||||
XA_CARDINAL,
|
||||
32, PropModeReplace, (guchar*) data, 1);
|
||||
meta_error_trap_pop (display);
|
||||
|
@ -2744,7 +2744,7 @@ meta_display_show_desktop (MetaDisplay *display)
|
|||
|
||||
queue_windows_showing (display);
|
||||
|
||||
meta_display_update_show_desktop_hint (display);
|
||||
meta_display_update_showing_desktop_hint (display);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -2759,7 +2759,7 @@ meta_display_unshow_desktop (MetaDisplay *display)
|
|||
|
||||
queue_windows_showing (display);
|
||||
|
||||
meta_display_update_show_desktop_hint (display);
|
||||
meta_display_update_showing_desktop_hint (display);
|
||||
|
||||
tmp = display->screens;
|
||||
while (tmp != NULL)
|
||||
|
|
|
@ -129,7 +129,7 @@ struct _MetaDisplay
|
|||
Atom atom_wm_client_machine;
|
||||
Atom atom_net_wm_state_fullscreen;
|
||||
Atom atom_net_workarea;
|
||||
Atom atom_net_show_desktop;
|
||||
Atom atom_net_showing_desktop;
|
||||
Atom atom_net_desktop_layout;
|
||||
Atom atom_manager;
|
||||
Atom atom_targets;
|
||||
|
|
|
@ -257,7 +257,7 @@ main (int argc, char **argv)
|
|||
/* must be after UI init so we can override GDK handlers */
|
||||
meta_errors_init ();
|
||||
|
||||
#if 0
|
||||
#if 1
|
||||
g_log_set_handler (NULL,
|
||||
G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
|
||||
log_handler, NULL);
|
||||
|
|
|
@ -115,7 +115,7 @@ set_supported_hint (MetaScreen *screen)
|
|||
atoms[27] = screen->display->atom_net_wm_ping;
|
||||
atoms[28] = screen->display->atom_net_active_window;
|
||||
atoms[29] = screen->display->atom_net_workarea;
|
||||
atoms[30] = screen->display->atom_net_show_desktop;
|
||||
atoms[30] = screen->display->atom_net_showing_desktop;
|
||||
atoms[31] = screen->display->atom_net_desktop_layout;
|
||||
atoms[32] = screen->display->atom_net_desktop_names;
|
||||
atoms[33] = screen->display->atom_net_wm_allowed_actions;
|
||||
|
|
Loading…
Reference in a new issue