X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=a9b045ff99de68c2d890da82c96e4d2db10fe08c;hb=5579b28481a54d9df451e40854d86b927a64a2f4;hp=2e8965e2cd957d609ec13e24fa83e4d43bbcc010;hpb=cca8a9030154a13c05d63ab700bc94c578707891;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index 2e8965e2..a9b045ff 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -52,6 +52,7 @@ static gboolean screen_validate_layout(ObDesktopLayout *l); static gboolean replace_wm(); +static void screen_tell_ksplash(); guint screen_num_desktops; guint screen_num_monitors; @@ -294,7 +295,7 @@ gboolean screen_annex() supported[i++] = prop_atoms.ob_wm_action_undecorate; supported[i++] = prop_atoms.ob_wm_state_undecorated; supported[i++] = prop_atoms.openbox_pid; - supported[i++] = prop_atoms.ob_config; + supported[i++] = prop_atoms.ob_theme; supported[i++] = prop_atoms.ob_control; g_assert(i == num_support); @@ -302,9 +303,45 @@ gboolean screen_annex() net_supported, atom, supported, num_support); g_free(supported); + screen_tell_ksplash(); + return TRUE; } +static void screen_tell_ksplash() +{ + XEvent e; + char **argv; + + argv = g_new(gchar*, 6); + argv[0] = g_strdup("dcop"); + argv[1] = g_strdup("ksplash"); + argv[2] = g_strdup("ksplash"); + argv[3] = g_strdup("upAndRunning(QString)"); + argv[4] = g_strdup("wm started"); + argv[5] = NULL; + + /* tell ksplash through the dcop server command line interface */ + g_spawn_async(NULL, argv, NULL, + G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD | + G_SPAWN_STDERR_TO_DEV_NULL | G_SPAWN_STDOUT_TO_DEV_NULL, + NULL, NULL, NULL, NULL); + g_strfreev(argv); + + /* i'm not sure why we do this, kwin does it, but ksplash doesn't seem to + hear it anyways. perhaps it is for old ksplash. or new ksplash. or + something. oh well. */ + e.xclient.type = ClientMessage; + e.xclient.display = ob_display; + e.xclient.window = RootWindow(ob_display, ob_screen); + e.xclient.message_type = + XInternAtom(ob_display, "_KDE_SPLASH_PROGRESS", False ); + e.xclient.format = 8; + strcpy(e.xclient.data.b, "wm started"); + XSendEvent(ob_display, RootWindow(ob_display, ob_screen), + False, SubstructureNotifyMask, &e ); +} + void screen_startup(gboolean reconfig) { gchar **names = NULL; @@ -368,6 +405,7 @@ void screen_startup(gboolean reconfig) else screen_set_num_desktops(config_desktops_num); + screen_desktop = screen_num_desktops; /* something invalid */ /* start on the current desktop when a wm was already running */ if (PROP_GET32(RootWindow(ob_display, ob_screen), net_current_desktop, cardinal, &d) && @@ -380,6 +418,7 @@ void screen_startup(gboolean reconfig) else screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops) - 1, FALSE); + screen_last_desktop = screen_desktop; /* don't start in showing-desktop mode */ screen_showing_desktop = FALSE; @@ -503,20 +542,25 @@ void screen_set_desktop(guint num, gboolean dofocus) ObClient *c; GList *it; guint old; + gulong ignore_start; g_assert(num < screen_num_desktops); old = screen_desktop; screen_desktop = num; - PROP_SET32(RootWindow(ob_display, ob_screen), - net_current_desktop, cardinal, num); if (old == num) return; + PROP_SET32(RootWindow(ob_display, ob_screen), + net_current_desktop, cardinal, num); + screen_last_desktop = old; ob_debug("Moving to desktop %d\n", num+1); + /* ignore enter events caused by the move */ + ignore_start = event_start_ignore_all_enters(); + if (moveresize_client) client_set_desktop(moveresize_client, num, TRUE); @@ -530,16 +574,20 @@ void screen_set_desktop(guint num, gboolean dofocus) } } + if (focus_client && ((client_normal(focus_client) && + focus_client->desktop == DESKTOP_ALL) || + focus_client->desktop == screen_desktop)) + dofocus = FALSE; + /* have to try focus here because when you leave an empty desktop - there is no focus out to watch for + there is no focus out to watch for. also, we have different rules + here. we always allow it to look under the mouse pointer if + config_focus_last is FALSE do this before hiding the windows so if helper windows are coming with us, they don't get hidden */ - if (dofocus - && (!focus_client || (focus_client->desktop != DESKTOP_ALL - && focus_client->desktop != num)) - && (c = focus_fallback(TRUE))) + if (dofocus && (c = focus_fallback(TRUE, !config_focus_last, FALSE))) { /* only do the flicker reducing stuff ahead of time if we are going to call xsetinputfocus on the window ourselves. otherwise there is @@ -562,7 +610,7 @@ void screen_set_desktop(guint num, gboolean dofocus) } } - event_ignore_all_queued_enters(); + event_end_ignore_all_enters(ignore_start); if (event_curtime != CurrentTime) screen_desktop_user_time = event_curtime; @@ -683,7 +731,7 @@ void screen_desktop_popup(guint d, gboolean show) if (!show) { pager_popup_hide(desktop_cycle_popup); } else { - a = screen_physical_area_monitor(0); + a = screen_physical_area_monitor_active(); pager_popup_position(desktop_cycle_popup, CenterGravity, a->x + a->width / 2, a->y + a->height / 2); pager_popup_icon_size_multiplier(desktop_cycle_popup, @@ -935,7 +983,7 @@ void screen_update_desktop_names() it = g_slist_nth(config_desktops_names, i); for (; i < screen_num_desktops; ++i) { - if (it) + if (it && ((char*)it->data)[0]) /* not empty */ /* use the names from the config file when possible */ screen_desktop_names[i] = g_strdup(it->data); else @@ -1002,7 +1050,7 @@ void screen_show_desktop(gboolean show, ObClient *show_only) else if (!show_only) { ObClient *c; - if ((c = focus_fallback(TRUE))) { + if ((c = focus_fallback(TRUE, FALSE, TRUE))) { /* only do the flicker reducing stuff ahead of time if we are going to call xsetinputfocus on the window ourselves. otherwise there is no guarantee the window will actually take focus.. */ @@ -1021,17 +1069,16 @@ void screen_show_desktop(gboolean show, ObClient *show_only) void screen_install_colormap(ObClient *client, gboolean install) { - if (client == NULL) { + if (client == NULL || client->colormap == None) { if (install) XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); else XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); } else { xerror_set_ignore(TRUE); - if (install) { - if (client->colormap != None) - XInstallColormap(RrDisplay(ob_rr_inst), client->colormap); - } else + if (install) + XInstallColormap(RrDisplay(ob_rr_inst), client->colormap); + else XUninstallColormap(RrDisplay(ob_rr_inst), client->colormap); xerror_set_ignore(FALSE); } @@ -1318,6 +1365,24 @@ Rect *screen_physical_area_monitor(guint head) return &monitor_area[head]; } +Rect *screen_physical_area_monitor_active() +{ + Rect *a; + gint x, y; + + if (focus_client) + a = screen_physical_area_monitor(client_monitor(focus_client)); + else { + Rect mon; + if (screen_pointer_pos(&x, &y)) + RECT_SET(mon, x, y, 1, 1); + else + RECT_SET(mon, 0, 0, 1, 1); + a = screen_physical_area_monitor(screen_find_monitor(&mon)); + } + return a; +} + void screen_set_root_cursor() { if (sn_app_starting())