-
Notifications
You must be signed in to change notification settings - Fork 1
/
openbox.title.patch
297 lines (268 loc) · 7.21 KB
/
openbox.title.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
diff -Naur openbox.origin/openbox-3.5.2/openbox/client.c openbox/openbox-3.5.2/openbox/client.c
--- openbox.origin/openbox-3.5.2/openbox/client.c 2018-02-19 21:00:42.000000000 +0100
+++ openbox/openbox-3.5.2/openbox/client.c 2018-06-26 10:51:13.411938955 +0200
@@ -115,6 +115,14 @@
static void client_setup_default_decor_and_functions(ObClient *self);
static void client_setup_decor_undecorated(ObClient *self);
+
+#ifdef HAVE_SIGNAL_H
+/* for notify */
+#define SIG_MANAGED_WINDOW SIGUSR1
+#define SIG_UNMANAGED_WINDOW SIGUSR2
+extern void send_signal_notify( int sig );
+#endif
+
void client_startup(gboolean reconfig)
{
client_default_icon = RrImageNewFromData(
@@ -536,10 +544,16 @@
/* free the ObAppSettings shallow copy */
g_slice_free(ObAppSettings, settings);
+#ifdef HAVE_SIGNAL_H
+ send_signal_notify( SIG_MANAGED_WINDOW );
+#endif
+
ob_debug("Managed window 0x%lx plate 0x%x (%s)",
window, self->frame->window, self->class);
}
+
+
ObClient *client_fake_manage(Window window)
{
ObClient *self;
@@ -607,6 +621,12 @@
mouse_grab_for_client(self, FALSE);
+
+#ifdef HAVE_SIGNAL_H
+ send_signal_notify( SIG_UNMANAGED_WINDOW );
+#endif
+
+
self->managed = FALSE;
/* remove the window from our save set, unless we are managing an internal
diff -Naur openbox.origin/openbox-3.5.2/openbox/config.c openbox/openbox-3.5.2/openbox/config.c
--- openbox.origin/openbox-3.5.2/openbox/config.c 2018-02-19 21:00:42.000000000 +0100
+++ openbox/openbox-3.5.2/openbox/config.c 2018-06-26 10:51:13.411938955 +0200
@@ -105,6 +105,9 @@
GSList *config_per_app_settings;
+gchar *config_notify_filename_pid;
+
+
ObAppSettings* config_create_app_settings(void)
{
ObAppSettings *settings = g_slice_new0(ObAppSettings);
@@ -948,6 +951,23 @@
}
}
+static void parse_notify(xmlNodePtr node, gpointer d)
+{
+ xmlNodePtr n;
+ node = node->children;
+
+ if ((n = obt_xml_find_node(node, "filenamepid"))) {
+ gchar *c;
+
+ g_free(config_notify_filename_pid);
+ c = obt_xml_node_string(n);
+ config_notify_filename_pid = obt_paths_expand_tilde(c);
+ g_free(c);
+ }
+}
+
+
+
static void parse_resistance(xmlNodePtr node, gpointer d)
{
xmlNodePtr n;
@@ -1072,6 +1092,7 @@
obt_xml_register(i, "margins", parse_margins, NULL);
+ config_notify_filename_pid = NULL;
config_theme = NULL;
config_animate_iconify = TRUE;
@@ -1086,6 +1107,8 @@
config_font_activeosd = NULL;
config_font_inactiveosd = NULL;
+ obt_xml_register(i, "notify", parse_notify, NULL);
+
obt_xml_register(i, "theme", parse_theme, NULL);
config_desktops_num = 4;
@@ -1159,7 +1182,7 @@
GSList *it;
g_free(config_theme);
-
+ g_free(config_notify_filename_pid);
g_free(config_title_layout);
RrFontClose(config_font_activewindow);
diff -Naur openbox.origin/openbox-3.5.2/openbox/config.h openbox/openbox-3.5.2/openbox/config.h
--- openbox.origin/openbox-3.5.2/openbox/config.h 2018-02-19 21:00:42.000000000 +0100
+++ openbox/openbox-3.5.2/openbox/config.h 2018-06-26 10:51:13.411938955 +0200
@@ -141,6 +141,9 @@
/*! The modifiers to be used with the button to move dock apps */
extern guint config_dock_app_move_modifiers;
+/*! The name of the file to read a process pid to send notify signal SIGUSR1 SIGUSR2 */
+extern gchar *config_notify_filename_pid;
+
/*! The name of the theme */
extern gchar *config_theme;
diff -Naur openbox.origin/openbox-3.5.2/openbox/frame.c openbox/openbox-3.5.2/openbox/frame.c
--- openbox.origin/openbox-3.5.2/openbox/frame.c 2013-08-12 03:33:24.000000000 +0200
+++ openbox/openbox-3.5.2/openbox/frame.c 2018-06-26 10:51:13.411938955 +0200
@@ -45,6 +45,16 @@
#define FRAME_HANDLE_Y(f) (f->size.top + f->client->area.height + f->cbwidth_b)
+
+
+#ifdef HAVE_SIGNAL_H
+/* for notify */
+#define SIG_MANAGED_WINDOW SIGUSR1
+#define SIG_UNMANAGED_WINDOW SIGUSR2
+extern void send_signal_notify( int sig );
+#endif
+
+
static void flash_done(gpointer data);
static gboolean flash_timeout(gpointer data);
@@ -981,6 +991,7 @@
{
self->need_render = TRUE;
framerender_frame(self);
+ send_signal_notify( SIG_MANAGED_WINDOW );
}
void frame_adjust_icon(ObFrame *self)
diff -Naur openbox.origin/openbox-3.5.2/openbox/window.c openbox/openbox-3.5.2/openbox/window.c
--- openbox.origin/openbox-3.5.2/openbox/window.c 2013-08-12 03:33:24.000000000 +0200
+++ openbox/openbox-3.5.2/openbox/window.c 2018-06-26 10:51:13.419938955 +0200
@@ -29,11 +29,28 @@
#include "obt/prop.h"
#include "obt/xqueue.h"
+#ifdef HAVE_SIGNAL_H
+#include <signal.h> /* for kill() */
+#endif
+
+
static GHashTable *window_map;
static guint window_hash(Window *w) { return *w; }
static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; }
+
+
+#ifdef HAVE_SIGNAL_H
+/* for notify */
+#define SIG_MANAGED_WINDOW SIGUSR1
+#define SIG_UNMANAGED_WINDOW SIGUSR2
+extern void send_signal_notify( int sig );
+#endif
+
+
+
+
void window_startup(gboolean reconfig)
{
if (reconfig) return;
@@ -96,12 +113,20 @@
g_assert(xwin != NULL);
g_assert(win != NULL);
g_hash_table_insert(window_map, xwin, win);
+#ifdef HAVE_SIGNAL_H
+ //send_signal_notify( SIG_MANAGED_WINDOW );
+#endif
+
}
void window_remove(Window xwin)
{
g_assert(xwin != None);
g_hash_table_remove(window_map, &xwin);
+#ifdef HAVE_SIGNAL_H
+ //send_signal_notify( SIG_UNMANAGED_WINDOW );
+#endif
+
}
void window_manage_all(void)
@@ -162,6 +187,11 @@
gboolean is_dockapp = FALSE;
Window icon_win = None;
+#ifdef HAVE_SIGNAL_H
+ // send_signal_notify( SIG_MANAGED_WINDOW );
+#endif
+
+
grab_server(TRUE);
/* check if it has already been unmapped by the time we started
@@ -227,3 +257,79 @@
dock_unmanage_all();
client_unmanage_all();
}
+
+
+#ifdef HAVE_SIGNAL_H
+
+
+int getinfo_pid(const char* filename)
+{
+ if (!filename)
+ {
+ ob_debug("Can not open filename null to get pid, notify failed" );
+ return 0;
+ }
+
+ FILE* fptr = fopen(filename, "r");
+ if (fptr != NULL)
+ {
+ char buf[ 16 ];
+ memset( buf, 0, 16);
+ int nr = fread(buf, 1, 16, fptr);
+ fclose(fptr);
+ if (nr > 0)
+ {
+ int pid = atoi( buf );
+ return pid;
+ }
+ else
+ ob_debug("Can not read file %s, notify failed", filename );
+ }
+ else
+ ob_debug("Can not open file %s to get pid, notify failed", filename );
+ return 0;
+}
+
+
+int s_kill(int sig)
+{
+ static int current_pid = 0;
+ int n=-1;
+
+ if (current_pid > 0)
+ {
+ /* try to send signal */
+ n=kill( current_pid, sig );
+ if (n)
+ {
+ /* Some thing wrong pid has changed ?*/
+ current_pid = getinfo_pid( config_notify_filename_pid );
+ if (current_pid > 0)
+ n=kill( current_pid, sig );
+ }
+ }
+ else
+ {
+ current_pid = getinfo_pid(config_notify_filename_pid);
+ if (current_pid > 0)
+ n = kill( current_pid, sig );
+ }
+ return n;
+}
+
+
+
+
+extern void send_signal_notify( int sig )
+{
+ if ( !config_notify_filename_pid)
+ return;
+ int n = s_kill( sig );
+ if (n)
+ ob_debug("Notify has failed to send signal %d", sig);
+}
+
+
+
+#endif // HAVE_SIGNAL_H
+