Removed
Link Here
|
1 |
--- main.c 2005-01-29 03:31:33.000000000 +0000 |
2 |
+++ main.c 2016-07-01 20:14:55.443662000 +0000 |
3 |
@@ -210,14 +210,14 @@ |
4 |
static int close_window (Display *disp, Window win); |
5 |
static int longest_str (gchar **strv); |
6 |
static int window_to_desktop (Display *disp, Window win, int desktop); |
7 |
-static void window_set_title (Display *disp, Window win, char *str, char mode); |
8 |
+static void window_set_title (Display *disp, Window win, const char *str, char mode); |
9 |
static gchar *get_window_title (Display *disp, Window win); |
10 |
static gchar *get_window_class (Display *disp, Window win); |
11 |
static gchar *get_property (Display *disp, Window win, |
12 |
Atom xa_prop_type, gchar *prop_name, unsigned long *size); |
13 |
static void init_charset(void); |
14 |
-static int window_move_resize (Display *disp, Window win, char *arg); |
15 |
-static int window_state (Display *disp, Window win, char *arg); |
16 |
+static int window_move_resize (Display *disp, Window win, const char *arg); |
17 |
+static int window_state (Display *disp, Window win, const char *arg); |
18 |
static Window Select_Window(Display *dpy); |
19 |
static Window get_active_window(Display *dpy); |
20 |
|
21 |
@@ -629,9 +629,9 @@ |
22 |
}/*}}}*/ |
23 |
|
24 |
static void window_set_title (Display *disp, Window win, /* {{{ */ |
25 |
- char *title, char mode) { |
26 |
- gchar *title_utf8; |
27 |
- gchar *title_local; |
28 |
+ const char *title, char mode) { |
29 |
+ void *title_utf8; |
30 |
+ void *title_local; |
31 |
|
32 |
if (envir_utf8) { |
33 |
title_utf8 = g_strdup(title); |
34 |
@@ -734,7 +734,7 @@ |
35 |
0, 0, 0, 0, 0); |
36 |
}/*}}}*/ |
37 |
|
38 |
-static int window_state (Display *disp, Window win, char *arg) {/*{{{*/ |
39 |
+static int window_state (Display *disp, Window win, const char *arg) {/*{{{*/ |
40 |
unsigned long action; |
41 |
Atom prop1 = 0; |
42 |
Atom prop2 = 0; |
43 |
@@ -827,7 +827,7 @@ |
44 |
return FALSE; |
45 |
}/*}}}*/ |
46 |
|
47 |
-static int window_move_resize (Display *disp, Window win, char *arg) {/*{{{*/ |
48 |
+static int window_move_resize (Display *disp, Window win, const char *arg) {/*{{{*/ |
49 |
signed long grav, x, y, w, h; |
50 |
unsigned long grflags; |
51 |
const char *argerr = "The -e option expects a list of comma separated integers: \"gravity,X,Y,width,height\"\n"; |
52 |
@@ -1441,6 +1441,9 @@ |
53 |
|
54 |
/* null terminate the result to make string handling easier */ |
55 |
tmp_size = (ret_format / 8) * ret_nitems; |
56 |
+ /* Correct 64 Architecture implementation of 32 bit data */ |
57 |
+ if (ret_format == 32) |
58 |
+ tmp_size *= sizeof(long)/4; |
59 |
ret = g_malloc(tmp_size + 1); |
60 |
memcpy(ret, ret_prop, tmp_size); |
61 |
ret[tmp_size] = '\0'; |
62 |
- |