View | Details | Raw Unified | Return to bug 227951 | Differences between
and this patch

Collapse All | Expand All

(-)./files/patch-src__wmapp.cc (-3 / +12 lines)
Lines 1-6 Link Here
1
--- src/wmapp.cc.orig
1
--- src/wmapp.cc.orig	2013-11-17 16:54:39 UTC
2
+++ src/wmapp.cc
2
+++ src/wmapp.cc
3
@@ -337,7 +337,7 @@
3
@@ -221,7 +221,7 @@ static void registerProtocols2(Window xid) {
4
 #endif
5
 
6
     long pid = getpid();
7
-    const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")";
8
+    const char wmname[] = "IceWM " VERSION " (" HOSTOS "/" HOSTCPU ")";
9
 
10
 #ifdef GNOME1_HINTS
11
     XChangeProperty(xapp->display(), xid, 
12
@@ -337,7 +337,7 @@ static void initFontPath(IApp *app) {
4
             int ndirs; // ------------------- retrieve the old X's font path ---
13
             int ndirs; // ------------------- retrieve the old X's font path ---
5
             char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
14
             char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
6
 
15
 
Lines 9-15 Link Here
9
             newFontPath[ndirs] = fontsdir;
18
             newFontPath[ndirs] = fontsdir;
10
 
19
 
11
             if (fontPath)
20
             if (fontPath)
12
@@ -383,7 +383,7 @@
21
@@ -383,7 +383,7 @@ static void initFontPath(IApp *app) {
13
             XChangeProperty(xapp->display(), manager->handle(),
22
             XChangeProperty(xapp->display(), manager->handle(),
14
                             XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
23
                             XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
15
                             (unsigned char *) fontsdir, strlen(fontsdir));
24
                             (unsigned char *) fontsdir, strlen(fontsdir));
(-)./files/patch-src__wmapp.h (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/wmapp.h.orig
1
--- src/wmapp.h.orig	2013-11-17 16:54:39 UTC
2
+++ src/wmapp.h
2
+++ src/wmapp.h
3
@@ -78,7 +78,7 @@
3
@@ -78,7 +78,7 @@ class YWMApp:  (private)
4
     Window managerWindow;
4
     Window managerWindow;
5
 };
5
 };
6
 
6
 
(-)./files/patch-src__wmmgr.cc (-4 / +2 lines)
Lines 1-8 Link Here
1
diff --git src/wmmgr.cc src/wmmgr.cc
1
--- src/wmmgr.cc.orig	2013-11-17 16:54:39 UTC
2
index 4252bf6..dc1e703 100644
3
--- src/wmmgr.cc
4
+++ src/wmmgr.cc
2
+++ src/wmmgr.cc
5
@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) {
3
@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClient
6
         case ICEWM_ACTION_RESTARTWM:
4
         case ICEWM_ACTION_RESTARTWM:
7
         case ICEWM_ACTION_WINDOWLIST:
5
         case ICEWM_ACTION_WINDOWLIST:
8
         case ICEWM_ACTION_ABOUT:
6
         case ICEWM_ACTION_ABOUT:
(-)./files/patch-src_wmabout.cc (-2 / +2 lines)
Lines 1-5 Link Here
1
--- src/wmabout.cc.orig	2018-02-25 21:00:14.796410000 -0800
1
--- src/wmabout.cc.orig	2013-11-17 16:54:39 UTC
2
+++ src/wmabout.cc	2018-02-25 21:00:22.254233000 -0800
2
+++ src/wmabout.cc
3
@@ -23,7 +23,7 @@
3
@@ -23,7 +23,7 @@
4
 AboutDlg *aboutDlg = 0;
4
 AboutDlg *aboutDlg = 0;
5
 
5
 
(-)./files/patch-src_ybutton.cc (+17 lines)
Line 0 Link Here
1
--- src/ybutton.cc.orig	2018-05-03 18:52:38 UTC
2
+++ src/ybutton.cc
3
@@ -158,10 +158,10 @@ void YButton::paintFocus(Graphics &g, const YRect &/*r
4
         g.setPenStyle(false);
5
     } else {
6
         XRectangle focus[] = {
7
-            { dp, dp, width() - ds, 1 },
8
-            { dp, dp + 1, 1, height() - ds - 2 },
9
-            { dp + width() - ds - 1, dp + 1, 1, height() - ds - 2 },
10
-            { dp, dp + height() - ds - 1, width() - ds, 1 }
11
+            { (short)dp, (short)dp, (unsigned short)(width() - ds), 1 },
12
+            { (short)dp, (short)(dp + 1), 1, (unsigned short)(height() - ds - 2) },
13
+            { (short)(dp + width() - ds - 1), (short)(dp + 1), 1, (unsigned short)(height() - ds - 2) },
14
+            { (short)dp, (short)(dp + height() - ds - 1), (unsigned short)(width() - ds), 1 }
15
         };
16
 
17
         g.setClipRectangles(focus, 4);

Return to bug 227951