projects
/
dana
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'backport' into work
[dana/openbox.git]
/
openbox
/
prompt.c
diff --git
a/openbox/prompt.c
b/openbox/prompt.c
index
84fe2d0
..
df36c8c
100644
(file)
--- a/
openbox/prompt.c
+++ b/
openbox/prompt.c
@@
-19,11
+19,11
@@
#include "prompt.h"
#include "openbox.h"
#include "screen.h"
#include "prompt.h"
#include "openbox.h"
#include "screen.h"
-#include "openbox.h"
#include "client.h"
#include "client.h"
-#include "prop.h"
-#include "modkeys.h"
#include "event.h"
#include "event.h"
+#include "obt/display.h"
+#include "obt/keyboard.h"
+#include "obt/prop.h"
#include "gettext.h"
static GList *prompt_list = NULL;
#include "gettext.h"
static GList *prompt_list = NULL;
@@
-144,9
+144,8
@@
ObPrompt* prompt_new(const gchar *msg,
self->data = data;
self->default_result = default_result;
self->cancel_result = cancel_result;
self->data = data;
self->default_result = default_result;
self->cancel_result = cancel_result;
- self->super.type = Window_Prompt;
- self->super.window = XCreateWindow(ob_display,
- RootWindow(ob_display, ob_screen),
+ self->super.type = OB_WINDOW_CLASS_PROMPT;
+ self->super.window = XCreateWindow(obt_display, obt_root(ob_screen),
0, 0, 1, 1, 0,
CopyFromParent, InputOutput,
CopyFromParent,
0, 0, 1, 1, 0,
CopyFromParent, InputOutput,
CopyFromParent,
@@
-154,19
+153,19
@@
ObPrompt* prompt_new(const gchar *msg,
&attrib);
/* make it a dialog type window */
&attrib);
/* make it a dialog type window */
-
PROP_SET32(self->super.window, net_wm_window_type, atom
,
-
prop_atoms.net_wm_window_type_dialog
);
+
OBT_PROP_SET32(self->super.window, NET_WM_WINDOW_TYPE, ATOM
,
+
OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DIALOG)
);
/* listen for key presses on the window */
self->event_mask = KeyPressMask;
/* set up the text message widow */
self->msg.text = g_strdup(msg);
/* listen for key presses on the window */
self->event_mask = KeyPressMask;
/* set up the text message widow */
self->msg.text = g_strdup(msg);
- self->msg.window = XCreateWindow(ob_display, self->super.window,
+ self->msg.window = XCreateWindow(ob
t
_display, self->super.window,
0, 0, 1, 1, 0,
CopyFromParent, InputOutput,
CopyFromParent, 0, NULL);
0, 0, 1, 1, 0,
CopyFromParent, InputOutput,
CopyFromParent, 0, NULL);
- XMapWindow(ob_display, self->msg.window);
+ XMapWindow(ob
t
_display, self->msg.window);
/* set up the buttons from the answers */
/* set up the buttons from the answers */
@@
-189,16
+188,15
@@
ObPrompt* prompt_new(const gchar *msg,
}
for (i = 0; i < self->n_buttons; ++i) {
}
for (i = 0; i < self->n_buttons; ++i) {
- self->button[i].window = XCreateWindow(ob_display, self->super.window,
+ self->button[i].window = XCreateWindow(ob
t
_display, self->super.window,
0, 0, 1, 1, 0,
CopyFromParent, InputOutput,
CopyFromParent, 0, NULL);
0, 0, 1, 1, 0,
CopyFromParent, InputOutput,
CopyFromParent, 0, NULL);
- XMapWindow(ob_display, self->button[i].window);
- g_hash_table_insert(window_map, &self->button[i].window,
- PROMPT_AS_WINDOW(self));
+ XMapWindow(obt_display, self->button[i].window);
+ window_add(&self->button[i].window, PROMPT_AS_WINDOW(self));
/* listen for button presses on the buttons */
/* listen for button presses on the buttons */
- XSelectInput(ob_display, self->button[i].window,
+ XSelectInput(ob
t
_display, self->button[i].window,
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask);
}
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask);
}
@@
-220,12
+218,12
@@
void prompt_unref(ObPrompt *self)
prompt_list = g_list_remove(prompt_list, self);
for (i = 0; i < self->n_buttons; ++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);
+
window_remove(
self->button[i].window);
+ XDestroyWindow(ob
t
_display, self->button[i].window);
}
}
- XDestroyWindow(ob_display, self->msg.window);
- XDestroyWindow(ob_display, self->super.window);
+ XDestroyWindow(ob
t
_display, self->msg.window);
+ XDestroyWindow(ob
t
_display, self->super.window);
g_free(self);
}
}
g_free(self);
}
}
@@
-309,11
+307,11
@@
static void prompt_layout(ObPrompt *self)
prompt_resize(self, w + l + r, h + t + b);
/* move and resize the internal windows */
prompt_resize(self, w + l + r, h + t + b);
/* move and resize the internal windows */
- XMoveResizeWindow(ob_display, self->msg.window,
+ XMoveResizeWindow(ob
t
_display, self->msg.window,
self->msg.x, self->msg.y,
self->msg.width, self->msg.height);
for (i = 0; i < self->n_buttons; ++i)
self->msg.x, self->msg.y,
self->msg.width, self->msg.height);
for (i = 0; i < self->n_buttons; ++i)
- XMoveResizeWindow(ob_display, self->button[i].window,
+ XMoveResizeWindow(ob
t
_display, self->button[i].window,
self->button[i].x, self->button[i].y,
self->button[i].width, self->button[i].height);
}
self->button[i].x, self->button[i].y,
self->button[i].width, self->button[i].height);
}
@@
-330,13
+328,13
@@
static void prompt_resize(ObPrompt *self, gint w, gint h)
hints.flags = PMinSize | PMaxSize;
hints.min_width = hints.max_width = w;
hints.min_height = hints.max_height = h;
hints.flags = PMinSize | PMaxSize;
hints.min_width = hints.max_width = w;
hints.min_height = hints.max_height = h;
- XSetWMNormalHints(ob_display, self->super.window, &hints);
+ XSetWMNormalHints(ob
t
_display, self->super.window, &hints);
if (self->mapped) {
/* send a configure request like a normal client would */
req.type = ConfigureRequest;
if (self->mapped) {
/* send a configure request like a normal client would */
req.type = ConfigureRequest;
- req.display = ob_display;
- req.parent =
RootWindow(ob_display,
ob_screen);
+ req.display = ob
t
_display;
+ req.parent =
obt_root(
ob_screen);
req.window = self->super.window;
req.width = w;
req.height = h;
req.window = self->super.window;
req.width = w;
req.height = h;
@@
-345,7
+343,7
@@
static void prompt_resize(ObPrompt *self, gint w, gint h)
(XEvent*)&req);
}
else
(XEvent*)&req);
}
else
- XResizeWindow(ob_display, self->super.window, w, h);
+ XResizeWindow(ob
t
_display, self->super.window, w, h);
}
static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a,
}
static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a,
@@
-441,11
+439,11
@@
void prompt_show(ObPrompt *self, ObClient *parent)
if (self->mapped) {
/* activate the prompt */
if (self->mapped) {
/* activate the prompt */
-
PROP_MSG(self->super.window, net_active_window
,
- 1, /* from an application.. */
- event_curtime,
- 0,
- 0);
+
OBT_PROP_MSG(ob_screen, self->super.window, NET_ACTIVE_WINDOW
,
+
1, /* from an application.. */
+
event_curtime,
+
0,
+
0,
0);
return;
}
return;
}
@@
-457,7
+455,7
@@
void prompt_show(ObPrompt *self, ObClient *parent)
break;
}
break;
}
- XSetTransientForHint(ob_display, self->super.window,
+ XSetTransientForHint(ob
t
_display, self->super.window,
(parent ? parent->window : 0));
/* set up the dialog and render it */
(parent ? parent->window : 0));
/* set up the dialog and render it */
@@
-471,7
+469,7
@@
void prompt_show(ObPrompt *self, ObClient *parent)
void prompt_hide(ObPrompt *self)
{
void prompt_hide(ObPrompt *self)
{
- XUnmapWindow(ob_display, self->super.window);
+ XUnmapWindow(ob
t
_display, self->super.window);
self->mapped = FALSE;
}
self->mapped = FALSE;
}
@@
-482,9
+480,7
@@
gboolean prompt_key_event(ObPrompt *self, XEvent *e)
if (e->type != KeyPress) return FALSE;
if (e->type != KeyPress) return FALSE;
- g_print("key 0x%x 0x%x\n", e->xkey.keycode, ob_keycode(OB_KEY_TAB));
-
- shift_mask = modkeys_key_to_mask(OB_MODKEY_KEY_SHIFT);
+ shift_mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT);
shift = !!(e->xkey.state & shift_mask);
/* only accept shift */
shift = !!(e->xkey.state & shift_mask);
/* only accept shift */