Make ObPrompt windows get managed as clients, and make them able to reconfigure as well.
This commit is contained in:
Dana Jansens
parent
974e88581f
commit
457fdc5ccb
5 changed files with 87 additions and 24 deletions
|
|
@ -32,6 +32,7 @@
|
|||
#include "session.h"
|
||||
#include "event.h"
|
||||
#include "grab.h"
|
||||
#include "prompt.h"
|
||||
#include "focus.h"
|
||||
#include "stacking.h"
|
||||
#include "openbox.h"
|
||||
|
|
@ -211,13 +212,13 @@ void client_manage_all(void)
|
|||
if (attrib.override_redirect) continue;
|
||||
|
||||
if (attrib.map_state != IsUnmapped)
|
||||
client_manage(children[i]);
|
||||
client_manage(children[i], NULL);
|
||||
}
|
||||
}
|
||||
XFree(children);
|
||||
}
|
||||
|
||||
void client_manage(Window window)
|
||||
void client_manage(Window window, ObPrompt *prompt)
|
||||
{
|
||||
ObClient *self;
|
||||
XEvent e;
|
||||
|
|
@ -280,6 +281,7 @@ void client_manage(Window window)
|
|||
self = g_new0(ObClient, 1);
|
||||
self->obwin.type = Window_Client;
|
||||
self->window = window;
|
||||
self->prompt = prompt;
|
||||
|
||||
/* non-zero defaults */
|
||||
self->wmstate = WithdrawnState; /* make sure it gets updated first time */
|
||||
|
|
@ -299,7 +301,8 @@ void client_manage(Window window)
|
|||
|
||||
/* specify that if we exit, the window should not be destroyed and
|
||||
should be reparented back to root automatically */
|
||||
XChangeSaveSet(ob_display, window, SetModeInsert);
|
||||
if (!self->prompt)
|
||||
XChangeSaveSet(ob_display, window, SetModeInsert);
|
||||
|
||||
/* create the decoration frame for the client window */
|
||||
self->frame = frame_new(self);
|
||||
|
|
@ -700,7 +703,8 @@ void client_unmanage(ObClient *self)
|
|||
mouse_grab_for_client(self, FALSE);
|
||||
|
||||
/* remove the window from our save set */
|
||||
XChangeSaveSet(ob_display, self->window, SetModeDelete);
|
||||
if (!self->prompt)
|
||||
XChangeSaveSet(ob_display, self->window, SetModeDelete);
|
||||
|
||||
/* update the focus lists */
|
||||
focus_order_remove(self);
|
||||
|
|
@ -3342,6 +3346,11 @@ void client_close(ObClient *self)
|
|||
{
|
||||
if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return;
|
||||
|
||||
if (self->prompt) {
|
||||
prompt_hide(self);
|
||||
return;
|
||||
}
|
||||
|
||||
/* in the case that the client provides no means to requesting that it
|
||||
close, we just kill it */
|
||||
if (!self->delete_window)
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
struct _ObFrame;
|
||||
struct _ObGroup;
|
||||
struct _ObSessionState;
|
||||
struct _ObPrompt;
|
||||
|
||||
typedef struct _ObClient ObClient;
|
||||
typedef struct _ObClientIcon ObClientIcon;
|
||||
|
|
@ -82,6 +83,10 @@ struct _ObClient
|
|||
ObWindow obwin;
|
||||
Window window;
|
||||
|
||||
/*! If this client is managing an ObPrompt window, then this is set to the
|
||||
prompt */
|
||||
struct _ObPrompt *prompt;
|
||||
|
||||
/*! The window's decorations. NULL while the window is being managed! */
|
||||
struct _ObFrame *frame;
|
||||
|
||||
|
|
@ -325,8 +330,10 @@ void client_remove_destroy_notify(ObClientCallback func);
|
|||
/*! Manages all existing windows */
|
||||
void client_manage_all();
|
||||
/*! Manages a given window
|
||||
@param prompt This specifies an ObPrompt which is being managed. It is
|
||||
possible to manage Openbox-owned windows through this.
|
||||
*/
|
||||
void client_manage(Window win);
|
||||
void client_manage(Window win, struct _ObPrompt *prompt);
|
||||
/*! Unmanages all managed windows */
|
||||
void client_unmanage_all();
|
||||
/*! Unmanages a given client */
|
||||
|
|
|
|||
|
|
@ -644,7 +644,7 @@ static void event_process(const XEvent *ec, gpointer data)
|
|||
else if (window == RootWindow(ob_display, ob_screen))
|
||||
event_handle_root(e);
|
||||
else if (e->type == MapRequest)
|
||||
client_manage(window);
|
||||
client_manage(window, NULL);
|
||||
else if (e->type == MappingNotify) {
|
||||
/* keyboard layout changes for modifier mapping changes. reload the
|
||||
modifier map, and rebind all the key bindings as appropriate */
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
#include "openbox.h"
|
||||
#include "screen.h"
|
||||
#include "openbox.h"
|
||||
#include "client.h"
|
||||
#include "prop.h"
|
||||
#include "gettext.h"
|
||||
|
||||
static GList *prompt_list = NULL;
|
||||
|
|
@ -31,6 +33,10 @@ static RrAppearance *prompt_a_press;
|
|||
/* we change the max width which would screw with others */
|
||||
static RrAppearance *prompt_a_msg;
|
||||
|
||||
static void prompt_layout(ObPrompt *self);
|
||||
static void render_all(ObPrompt *self);
|
||||
static void render_button(ObPrompt *self, ObPromptElement *e);
|
||||
|
||||
void prompt_startup(gboolean reconfig)
|
||||
{
|
||||
RrColor *c_button, *c_hover, *c_press;
|
||||
|
|
@ -62,6 +68,15 @@ void prompt_startup(gboolean reconfig)
|
|||
|
||||
prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
|
||||
prompt_a_msg->texture[0].data.text.flow = TRUE;
|
||||
|
||||
if (reconfig) {
|
||||
GList *it;
|
||||
for (it = prompt_list; it; it = g_list_next(it)) {
|
||||
ObPrompt *p = it->data;
|
||||
prompt_layout(p);
|
||||
render_all(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void prompt_shutdown(gboolean reconfig)
|
||||
|
|
@ -79,7 +94,7 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
|
|||
guint i;
|
||||
const gchar *const *c;
|
||||
|
||||
attrib.override_redirect = TRUE;
|
||||
attrib.override_redirect = FALSE;
|
||||
attrib.border_pixel = RrColorPixel(ob_rr_theme->osd_border_color);
|
||||
|
||||
self = g_new0(ObPrompt, 1);
|
||||
|
|
@ -87,14 +102,14 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
|
|||
self->super.type = Window_Prompt;
|
||||
self->super.window = XCreateWindow(ob_display,
|
||||
RootWindow(ob_display, ob_screen),
|
||||
0, 0, 1, 1, 0,
|
||||
0, 0, 1, 1, ob_rr_theme->obwidth,
|
||||
CopyFromParent, InputOutput,
|
||||
CopyFromParent,
|
||||
CWOverrideRedirect | CWBorderPixel,
|
||||
&attrib);
|
||||
g_hash_table_insert(window_map, &self->super.window,
|
||||
PROMPT_AS_WINDOW(self));
|
||||
|
||||
PROP_SET32(self->super.window, net_wm_window_type, atom,
|
||||
prop_atoms.net_wm_window_type_dialog);
|
||||
|
||||
self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
|
||||
|
||||
|
|
@ -134,6 +149,8 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
|
|||
PROMPT_AS_WINDOW(self));
|
||||
}
|
||||
|
||||
prompt_list = g_list_prepend(prompt_list, self);
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
|
|
@ -147,6 +164,8 @@ void prompt_unref(ObPrompt *self)
|
|||
if (self && --self->ref == 0) {
|
||||
guint i;
|
||||
|
||||
prompt_list = g_list_remove(prompt_list, self);
|
||||
|
||||
for (i = 0; i < self->n_buttons; ++i) {
|
||||
g_hash_table_remove(window_map, &self->button[i].window);
|
||||
XDestroyWindow(ob_display, self->button[i].window);
|
||||
|
|
@ -156,22 +175,23 @@ void prompt_unref(ObPrompt *self)
|
|||
|
||||
RrAppearanceFree(self->a_bg);
|
||||
|
||||
g_hash_table_remove(window_map, &self->super.window);
|
||||
XDestroyWindow(ob_display, self->super.window);
|
||||
g_free(self);
|
||||
}
|
||||
}
|
||||
|
||||
static void prompt_layout(ObPrompt *self, const Rect *area)
|
||||
static void prompt_layout(ObPrompt *self)
|
||||
{
|
||||
gint l, r, t, b;
|
||||
guint i;
|
||||
gint allbuttonsw, allbuttonsh, buttonx;
|
||||
gint w, h;
|
||||
gint maxw;
|
||||
|
||||
const gint OUTSIDE_MARGIN = 4;
|
||||
const gint MSG_BUTTON_SEPARATION = 4;
|
||||
const gint BUTTON_SEPARATION = 4;
|
||||
const gint MAX_WIDTH = 600;
|
||||
|
||||
RrMargins(self->a_bg, &l, &t, &r, &b);
|
||||
l += OUTSIDE_MARGIN;
|
||||
|
|
@ -179,6 +199,12 @@ static void prompt_layout(ObPrompt *self, const Rect *area)
|
|||
r += OUTSIDE_MARGIN;
|
||||
b += OUTSIDE_MARGIN;
|
||||
|
||||
{
|
||||
Rect *area = screen_physical_area_all_monitors();
|
||||
maxw = MIN(MAX_WIDTH, area->width*4/5);
|
||||
g_free(area);
|
||||
}
|
||||
|
||||
/* find the button sizes and how much space we need for them */
|
||||
allbuttonsw = allbuttonsh = 0;
|
||||
for (i = 0; i < self->n_buttons; ++i) {
|
||||
|
|
@ -201,15 +227,13 @@ static void prompt_layout(ObPrompt *self, const Rect *area)
|
|||
allbuttonsh = MAX(allbuttonsh, self->button[i].height);
|
||||
}
|
||||
|
||||
self->msg_wbound = MAX(allbuttonsw, area->width*3/5);
|
||||
self->msg_wbound = MAX(allbuttonsw, maxw);
|
||||
|
||||
/* measure the text message area */
|
||||
prompt_a_msg->texture[0].data.text.string = self->msg.text;
|
||||
prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound;
|
||||
RrMinSize(prompt_a_msg, &self->msg.width, &self->msg.height);
|
||||
|
||||
g_print("height %d\n", self->msg.height);
|
||||
|
||||
/* width and height inside the outer margins */
|
||||
w = MAX(self->msg.width, allbuttonsw);
|
||||
h = self->msg.height + MSG_BUTTON_SEPARATION + allbuttonsh;
|
||||
|
|
@ -230,12 +254,9 @@ static void prompt_layout(ObPrompt *self, const Rect *area)
|
|||
/* size and position the toplevel window */
|
||||
self->width = w + l + r;
|
||||
self->height = h + t + b;
|
||||
self->x = (area->width - self->width) / 2;
|
||||
self->y = (area->height - self->height) / 2;
|
||||
|
||||
/* move and resize the actual windows */
|
||||
XMoveResizeWindow(ob_display, self->super.window,
|
||||
self->x, self->y, self->width, self->height);
|
||||
XResizeWindow(ob_display, self->super.window, self->width, self->height);
|
||||
XMoveResizeWindow(ob_display, self->msg.window,
|
||||
self->msg.x, self->msg.y,
|
||||
self->msg.width, self->msg.height);
|
||||
|
|
@ -273,13 +294,25 @@ static void render_all(ObPrompt *self)
|
|||
render_button(self, &self->button[i]);
|
||||
}
|
||||
|
||||
void prompt_show(ObPrompt *self, const Rect *area)
|
||||
void prompt_show(ObPrompt *self, ObClient *parent)
|
||||
{
|
||||
XSizeHints hints;
|
||||
|
||||
if (self->mapped) return;
|
||||
|
||||
prompt_layout(self, area);
|
||||
prompt_layout(self);
|
||||
render_all(self);
|
||||
XMapWindow(ob_display, self->super.window);
|
||||
|
||||
/* you can't resize the prompt */
|
||||
hints.flags = PMinSize | PMaxSize;
|
||||
hints.min_width = hints.max_width = self->width;
|
||||
hints.min_height = hints.max_height = self->height;
|
||||
XSetWMNormalHints(ob_display, self->super.window, &hints);
|
||||
|
||||
XSetTransientForHint(ob_display, (parent ? parent->window : 0),
|
||||
self->super.window);
|
||||
|
||||
client_manage(self->super.window, self);
|
||||
|
||||
self->mapped = TRUE;
|
||||
}
|
||||
|
|
@ -289,3 +322,16 @@ void prompt_hide(ObPrompt *self)
|
|||
XUnmapWindow(ob_display, self->super.window);
|
||||
self->mapped = FALSE;
|
||||
}
|
||||
|
||||
void prompt_hide_window(Window window)
|
||||
{
|
||||
GList *it;
|
||||
ObPrompt *p = NULL;
|
||||
|
||||
for (it = prompt_list; it; it = g_list_next(it)) {
|
||||
p = it->data;
|
||||
if (p->super.window == window) break;
|
||||
}
|
||||
g_assert(it != NULL);
|
||||
prompt_hide(p);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ struct _ObPrompt
|
|||
RrAppearance *a_bg;
|
||||
|
||||
gboolean mapped;
|
||||
gint x, y, width, height;
|
||||
gint width, height;
|
||||
gint msg_wbound;
|
||||
|
||||
ObPromptElement msg;
|
||||
|
|
@ -62,7 +62,8 @@ void prompt_ref(ObPrompt *self);
|
|||
void prompt_unref(ObPrompt *self);
|
||||
|
||||
/*! Show the prompt. It will be centered within the given area rectangle */
|
||||
void prompt_show(ObPrompt *self, const Rect *area);
|
||||
void prompt_show(ObPrompt *self, struct _ObClient *parent);
|
||||
void prompt_hide(ObPrompt *self);
|
||||
void prompt_hide_window(Window window);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue