X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=openbox%2Fframe.c;h=0f2d56ebaf7ce37c6e55c445444f7328afe94ced;hp=4f26255437f6a6124e220796312f025033d203bb;hb=9325c92056ff4268db2263cdf8c07bb529e158aa;hpb=c129c236919694e8daef2250f0485a933478b1dc diff --git a/openbox/frame.c b/openbox/frame.c index 4f262554..0f2d56eb 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -41,7 +41,7 @@ EnterWindowMask | LeaveWindowMask) #define FRAME_ANIMATE_ICONIFY_TIME 150000 /* .15 seconds */ -#define FRAME_ANIMATE_ICONIFY_STEP_TIME (G_USEC_PER_SEC / 60) /* 60 Hz */ +#define FRAME_ANIMATE_ICONIFY_STEP_TIME (1000 / 60) /* 60 Hz */ #define FRAME_HANDLE_Y(f) (f->size.top + f->client->area.height + f->cbwidth_b) @@ -190,7 +190,7 @@ ObFrame *frame_new(ObClient *client) /* make sure the size will be different the first time, so the extent hints will be set */ - STRUT_SET(self->size, -1, -1, -1, -1); + STRUT_SET(self->oldsize, -1, -1, -1, -1); set_theme_statics(self); @@ -276,9 +276,14 @@ void frame_adjust_shape_kind(ObFrame *self, int kind) { gint num; XRectangle xrect[2]; + gboolean shaped; - if (!((kind == ShapeBounding && self->client->shaped) || - (kind == ShapeInput && self->client->shaped_input))) { + shaped = (kind == ShapeBounding && self->client->shaped); +#ifdef ShapeInput + shaped |= (kind == ShapeInput && self->client->shaped_input); +#endif + + if (!shaped) { /* clear the shape on the frame window */ XShapeCombineMask(obt_display, self->window, kind, self->size.left, @@ -323,17 +328,15 @@ void frame_adjust_shape(ObFrame *self) { #ifdef SHAPE frame_adjust_shape_kind(self, ShapeBounding); +#ifdef ShapeInput frame_adjust_shape_kind(self, ShapeInput); #endif +#endif } void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized, gboolean fake) { - Strut oldsize; - - oldsize = self->size; - if (resized) { /* do this before changing the frame's status like max_horz max_vert */ frame_adjust_cursors(self); @@ -345,7 +348,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved, self->shaded = self->client->shaded; if (self->decorations & OB_FRAME_DECOR_BORDER) - self->bwidth = ob_rr_theme->fbwidth; + self->bwidth = self->client->undecorated ? + ob_rr_theme->ubwidth : ob_rr_theme->fbwidth; else self->bwidth = 0; @@ -374,13 +378,22 @@ void frame_adjust_area(ObFrame *self, gboolean moved, STRUT_SET(self->size, self->cbwidth_l + (!self->max_horz ? self->bwidth : 0), - self->cbwidth_t + self->bwidth, + self->cbwidth_t + + (!self->max_horz || !self->max_vert ? self->bwidth : 0), self->cbwidth_r + (!self->max_horz ? self->bwidth : 0), self->cbwidth_b + (!self->max_horz || !self->max_vert ? self->bwidth : 0)); if (self->decorations & OB_FRAME_DECOR_TITLEBAR) self->size.top += ob_rr_theme->title_height + self->bwidth; + else if (self->max_horz && self->max_vert) { + /* A maximized and undecorated window needs a small border on the + top of the window to let the user still undecorate/unmaximize the + window via the client menu. */ + /* XXX This size should probably be a theme option. */ + self->size.top += 1; + } + if (self->decorations & OB_FRAME_DECOR_HANDLE && ob_rr_theme->handle_height > 0) { @@ -849,7 +862,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, frame_adjust_shape(self); } - if (!STRUT_EQUAL(self->size, oldsize)) { + if (!STRUT_EQUAL(self->size, self->oldsize)) { gulong vals[4]; vals[0] = self->size.left; vals[1] = self->size.right; @@ -859,6 +872,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, CARDINAL, vals, 4); OBT_PROP_SETA32(self->client->window, KDE_NET_WM_FRAME_STRUT, CARDINAL, vals, 4); + self->oldsize = self->size; } /* if this occurs while we are focus cycling, the indicator needs to @@ -956,7 +970,7 @@ void frame_adjust_state(ObFrame *self) void frame_adjust_focus(ObFrame *self, gboolean hilite) { ob_debug_type(OB_DEBUG_FOCUS, - "Frame for 0x%x has focus: %d\n", + "Frame for 0x%x has focus: %d", self->client->window, hilite); self->focused = hilite; self->need_render = TRUE; @@ -1060,8 +1074,8 @@ static gboolean find_reparent(XEvent *e, gpointer data) void frame_release_client(ObFrame *self) { /* if there was any animation going on, kill it */ - obt_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify, - self, FALSE); + if (self->iconify_animation_timer) + g_source_remove(self->iconify_animation_timer); /* check if the app has already reparented its window away */ if (!xqueue_exists_local(find_reparent, self)) { @@ -1118,7 +1132,7 @@ void frame_release_client(ObFrame *self) window_remove(self->rgriptop); window_remove(self->rgripbottom); - obt_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self, TRUE); + if (self->flash_timer) g_source_remove(self->flash_timer); } /* is there anything present between us and the label? */ @@ -1371,18 +1385,27 @@ ObFrameContext frame_context_from_string(const gchar *name) return OB_FRAME_CONTEXT_CLOSE; else if (!g_ascii_strcasecmp("MoveResize", name)) return OB_FRAME_CONTEXT_MOVE_RESIZE; + else if (!g_ascii_strcasecmp("Dock", name)) + return OB_FRAME_CONTEXT_DOCK; + return OB_FRAME_CONTEXT_NONE; } ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y) { ObFrame *self; + ObWindow *obwin; if (moveresize_in_progress) return OB_FRAME_CONTEXT_MOVE_RESIZE; if (win == obt_root(ob_screen)) - return OB_FRAME_CONTEXT_ROOT ; + return OB_FRAME_CONTEXT_ROOT; + if ((obwin = window_find(win))) { + if (WINDOW_IS_DOCK(obwin)) { + return OB_FRAME_CONTEXT_DOCK; + } + } if (client == NULL) return OB_FRAME_CONTEXT_NONE; if (win == client->window) { /* conceptually, this is the desktop, as far as users are @@ -1651,11 +1674,13 @@ static gboolean flash_timeout(gpointer data) ObFrame *self = data; GTimeVal now; - g_get_current_time(&now); - if (now.tv_sec > self->flash_end.tv_sec || - (now.tv_sec == self->flash_end.tv_sec && - now.tv_usec >= self->flash_end.tv_usec)) - self->flashing = FALSE; + if (config_frame_flash_duration != 0) { + g_get_current_time(&now); + if (now.tv_sec > self->flash_end.tv_sec || + (now.tv_sec == self->flash_end.tv_sec && + now.tv_usec >= self->flash_end.tv_usec)) + self->flashing = FALSE; + } if (!self->flashing) return FALSE; /* we are done */ @@ -1671,17 +1696,19 @@ static gboolean flash_timeout(gpointer data) void frame_flash_start(ObFrame *self) { + if (config_frame_flash_delay == 0) return; + self->flash_on = self->focused; if (!self->flashing) - obt_main_loop_timeout_add(ob_main_loop, - G_USEC_PER_SEC * 0.6, - flash_timeout, - self, - g_direct_equal, - flash_done); - g_get_current_time(&self->flash_end); - g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5); + self->flash_timer = g_timeout_add_full(G_PRIORITY_DEFAULT, + config_frame_flash_delay, flash_timeout, self, + flash_done); + + if (config_frame_flash_duration != 0) { + g_get_current_time(&self->flash_end); + g_time_val_add(&self->flash_end, 1000 * config_frame_flash_duration); + } self->flashing = TRUE; } @@ -1837,12 +1864,13 @@ void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying) } if (new_anim) { - obt_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify, - self, FALSE); - obt_main_loop_timeout_add(ob_main_loop, - FRAME_ANIMATE_ICONIFY_STEP_TIME, - frame_animate_iconify, self, - g_direct_equal, NULL); + if (self->iconify_animation_timer) + g_source_remove(self->iconify_animation_timer); + self->iconify_animation_timer = + g_timeout_add_full(G_PRIORITY_DEFAULT, + FRAME_ANIMATE_ICONIFY_STEP_TIME, + frame_animate_iconify, self, NULL); + /* do the first step */ frame_animate_iconify(self);