#include "client.h"
#include "screen.h"
#include "focus.h"
-#include "focus_cycle.h"
#include "openbox.h"
#include "window.h"
#include "event.h"
{
XSetWindowAttributes attrib;
- single_popup = icon_popup_new(TRUE);
+ single_popup = icon_popup_new();
popup.obwin.type = Window_Internal;
popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
XMapWindow(ob_display, popup.text);
stacking_add(INTERNAL_AS_WINDOW(&popup));
+ g_hash_table_insert(window_map, &popup.bg, &popup);
}
void focus_cycle_popup_shutdown(gboolean reconfig)
{
icon_popup_free(single_popup);
+ g_hash_table_remove(window_map, &popup.bg);
stacking_remove(INTERNAL_AS_WINDOW(&popup));
while(popup.targets) {
}
g_free(popup.hilite_rgba);
+ popup.hilite_rgba = NULL;
XDestroyWindow(ob_display, popup.text);
XDestroyWindow(ob_display, popup.bg);
for (it = g_list_last(focus_order); it; it = g_list_previous(it)) {
ObClient *ft = it->data;
- if (focus_cycle_target_valid(ft,
- iconic_windows,
- all_desktops,
- dock_windows,
- desktop_windows))
+ if (focus_valid_target(ft, TRUE,
+ iconic_windows,
+ all_desktops,
+ dock_windows,
+ desktop_windows))
{
gchar *text = popup_get_name(ft);
gint ml, mt, mr, mb;
gint l, t, r, b;
gint x, y, w, h;
- Rect *screen_area;
+ Rect *screen_area = NULL;
gint icons_per_row;
gint icon_rows;
gint textx, texty, textw, texth;
const ObFocusCyclePopupTarget *newtarget;
gint newtargetx, newtargety;
- /* XXX find the middle monitor? */
- screen_area = screen_physical_area_monitor(0);
+ screen_area = screen_physical_area_active();
/* get the outside margins */
RrMargins(p->a_bg, &ml, &mt, &mr, &mb);
RrPaint(p->a_text, p->text, textw, texth);
p->last_target = newtarget;
+
+ g_free(screen_area);
}
void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
XMapWindow(ob_display, popup.bg);
XFlush(ob_display);
popup.mapped = TRUE;
+ screen_hide_desktop_popup();
}
}
-void focus_cycle_popup_hide()
+void focus_cycle_popup_hide(void)
{
gulong ignore_start;
g_free(t->text);
XDestroyWindow(ob_display, t->win);
+ g_free(t);
popup.targets = g_list_delete_link(popup.targets, popup.targets);
}
g_assert(popup.targets == NULL);
/* position the popup */
- a = screen_physical_area_monitor(0);
+ a = screen_physical_area_active();
icon_popup_position(single_popup, CenterGravity,
a->x + a->width / 2, a->y + a->height / 2);
icon_popup_height(single_popup, POPUP_HEIGHT);
icon_popup_min_width(single_popup, POPUP_WIDTH);
icon_popup_max_width(single_popup, MAX(a->width/3, POPUP_WIDTH));
icon_popup_text_width(single_popup, popup.maxtextw);
+ g_free(a);
}
text = popup_get_name(c);
icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE));
g_free(text);
+ screen_hide_desktop_popup();
}
-void focus_cycle_popup_single_hide()
+void focus_cycle_popup_single_hide(void)
{
icon_popup_hide(single_popup);
}