xsystem35-1.7.2 を build するため＋WM_CLASS を設定するパッチ

xsystem35-1.7.2.patch

diff --git src/cmd2F.c src/cmd2F.c
index cd160b8..3c7b505 100644
--- src/cmd2F.c
+++ src/cmd2F.c
@@ -1381,7 +1381,7 @@ void commands2F81() {

        for (i = 0; i < eNumof; i++) {
                *vData = LittleEndian_getW(nact->datatbl_addr, 0);
-               ((WORD *)nact->datatbl_addr)++;
+               nact->datatbl_addr++;
                vData++;
        }

@@ -1397,14 +1397,14 @@ void commands2F82() {

        for (i = 0; i < eNumof; i++) {
                v_strcpy(eStrNum + i -1, (const char *)(nact->datatbl_addr));
-               (char *)(nact->datatbl_addr) += (strlen((const char *)nact->datatbl_addr) + 1);
+               nact->datatbl_addr += (strlen((const char *)nact->datatbl_addr) + 1);
        }
 }

 void commands2F83() {
        int eNumof  = sys_getCaliValue();

-       ((WORD *)nact->datatbl_addr) += eNumof;
+       nact->datatbl_addr += eNumof;

        DEBUG_COMMAND("dataSkipWORD %d:\n", eNumof);
 }
@@ -1414,7 +1414,7 @@ void commands2F84() {
        int i;

        for (i = 0; i < eNumof; i++) {
-               (char *)(nact->datatbl_addr) += (strlen((const char *)nact->datatbl_addr) + 1);
+               nact->datatbl_addr += (strlen((const char *)nact->datatbl_addr) + 1);
        }

        DEBUG_COMMAND("dataSkipString %d:\n", eNumof);
diff --git src/cmdf.c src/cmdf.c
index e2a0407..19376b0 100644
--- src/cmdf.c
+++ src/cmdf.c
@@ -82,22 +82,22 @@ static void commandF1() {
        DEBUG_COMMAND("F1 %d,%d:\n", str_number, skip);

        for (i = 0; i < skip; i++) {
-               (char *)(nact->datatbl_addr) += (strlen((const char *)nact->datatbl_addr) + 1);
+               nact->datatbl_addr += (strlen((const char *)nact->datatbl_addr) + 1);
        }

        v_strcpy(str_number - 1 , (const char *)(nact->datatbl_addr));
-       (char *)(nact->datatbl_addr) += (strlen((const char *)nact->datatbl_addr) + 1);
+       nact->datatbl_addr += (strlen((const char *)nact->datatbl_addr) + 1);
 }

 static void commandF2() {
        int *read_var = sys_getCaliVariable();
        int skip      = sys_getCaliValue();

-       ((WORD *)nact->datatbl_addr) += skip;
+       nact->datatbl_addr += skip;

        *read_var = LittleEndian_getW(nact->datatbl_addr, 0);

-       ((WORD *)nact->datatbl_addr)++;
+       nact->datatbl_addr++;

        DEBUG_COMMAND("F2 %d,%d:\n", *read_var, skip);
 }
@@ -118,7 +118,7 @@ static void commandF4() {

        for (i = 0; i < count; i++) {
                *read_var = LittleEndian_getW(nact->datatbl_addr, 0);
-               ((WORD *)nact->datatbl_addr)++;
+               nact->datatbl_addr++;
                read_var++;
        }

@@ -155,7 +155,7 @@ static void commandF7() {
        for (i = 0; i < count; i++) {
                for (j = 0; j < data_width; j++) {
                        *(F6Index[j] + i) = LittleEndian_getW(nact->datatbl_addr, 0);
-                       ((WORD *)nact->datatbl_addr)++;
+                       nact->datatbl_addr++;
                }
        }

diff --git src/counter.h src/counter.h
index 8553505..e65c636 100644
--- src/counter.h
+++ src/counter.h
@@ -21,8 +21,8 @@
 */
 /* $Id: counter.h,v 1.7 2000/11/25 13:09:03 chikama Exp $ */

-#ifndef __COUNTER__
-#define __COUNTER__
+#ifndef __COUNTER_H__
+#define __COUNTER_H__

 #define EXTER_HIGHTCOUNTER_NUM 5
 #define SYSTEMCOUNTER_MP3      (256 + 1)
@@ -36,4 +36,4 @@ extern void reset_counter(int val);
 extern int  get_high_counter(int num);
 extern void reset_counter_high(int num, int division, int val);

-#endif /* !__COUNTER__ */
+#endif /* !__COUNTER_H__ */
diff --git src/font_freetype2.c src/font_freetype2.c
index ef5153c..b9db25e 100644
--- src/font_freetype2.c
+++ src/font_freetype2.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
+#include <ft2build.h>
 #include <freetype/freetype.h>

 #include "portab.h"
diff --git src/xcore_video.c src/xcore_video.c
index a418a03..8e0cecc 100644
--- src/xcore_video.c
+++ src/xcore_video.c
@@ -307,6 +307,10 @@ static void init_window(void) {
                                           0, WIN_DEPTH,
                                           InputOutput, x11_visual, attrib_mask, &at);
        }
+        XClassHint wm_class;
+        wm_class.res_name = "XSystem35";
+        wm_class.res_class = "XSystem35";
+        XSetClassHint( x11_display, x11_window, &wm_class );

        /* determin dib depth candidate */
        dib_depth_candidate = (depth == 16 && vinfo.red_mask == 0x7c00) ? 15: WIN_DEPTH;