From 47b229d79ffe0f24ddfbe6cf437c4c1367f39b5c Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@mit.edu>
Date: Sun, 22 Mar 2009 17:34:39 +0000
Subject: clean up and modernize some of the CMU patch fallout

---
 zwgc/xcut.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'zwgc/xcut.c')

diff --git a/zwgc/xcut.c b/zwgc/xcut.c
index 22a94c9..e1ce7c7 100644
--- a/zwgc/xcut.c
+++ b/zwgc/xcut.c
@@ -29,6 +29,7 @@ static const char rcsid_xcut_c[] = "$Id$";
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <zephyr/zephyr.h>
 #include "new_memory.h"
 #include "new_string.h"
 #include "X_gram.h"
@@ -38,8 +39,10 @@ static const char rcsid_xcut_c[] = "$Id$";
 #include "error.h"
 #include "xrevstack.h"
 #include "X_driver.h"
+#include "xcut.h"
 #ifdef CMU_ZWGCPLUS
 #include "plus.h"
+#include "variables.h"
 #endif
 
 /*
@@ -213,7 +216,7 @@ xcut(Display *dpy,
         char c;
         char *plusvar;
         int res, metaflag;
-        res = XLookupString(event, &c, 1, NULL, NULL);
+        res = XLookupString(&(event->xkey), &c, 1, NULL, NULL);
         metaflag = event->xkey.state & Mod1Mask;
 
         /* Recheck if zwgcplus is turned on;
@@ -221,7 +224,7 @@ xcut(Display *dpy,
          */
 
         zwgcplus = 1;
-        plusvar = (char *)ZGetVariable("zwgcplus") ? (char *)ZGetVariable("zwgcplus") : (char *)var_get_variable("zwgcplus");
+        plusvar = ZGetVariable("zwgcplus") ? ZGetVariable("zwgcplus") : (char *)var_get_variable("zwgcplus");
 
         if ((plusvar[0]=='\0') || (strcmp(plusvar,"no") == 0))
           zwgcplus = 0;
-- 
cgit v1.2.3