The R Project SVN – R – Diff – /branches/R-exp-R5/src/modules/X11/dataentry.c

 #include <Print.h>
 /* For the input handlers of the event loop mechanism: */
 #include <R_ext/eventloop.h>
 #include <R_ext/RS.h>           /* for CallocCharBuf */
-#ifdef SUPPORT_MBCS
-/* This only uses a FontSet in a MBCS */
 # define USE_FONTSET 1
 /* In theory we should do this, but it works less well
 # ifdef X_HAVE_UTF8_STRING
 #  define HAVE_XUTF8TEXTEXTENTS 1
 #  define HAVE_XUTF8DRAWSTRING 1
 #  define HAVE_XUTF8DRAWIMAGESTRING 1
 # endif */
-#endif
 #ifndef HAVE_KEYSYM
 #define KeySym int
 #endif
 static const char *get_col_name(DEstruct, int col);
 static int  get_col_width(DEstruct, int col);
 static CellType get_col_type(DEstruct, int col);
-#ifdef USE_FONTSET
 static void calc_pre_edit_pos(DEstruct DE);
-#endif
 static int last_wchar_bytes(char *);
 static SEXP ssNewVector(SEXPTYPE, int);
 static SEXP ssNA_STRING;
 static char buf[BOOSTED_BUF_SIZE];	/* boosted to allow for MBCS */
 static char *bufp;
 static char copycontents[sizeof(buf)+1] ;
 /* The next few and used only for the editor in MBCS locales */
-#ifdef USE_FONTSET
 static Status           status;
 static XFontSet         font_set = NULL;
 static XFontStruct	**fs_list;
 static int		font_set_cnt;
 static char             fontset_name[]="-*-fixed-medium-r-*-*-*-120-*-*-*-*-*-*";
     XIMStatusNothing,
     XIMStatusNone,
     (XIMStyle)NULL,
 };
 static XIC ioic = NULL;
-#endif
 #ifndef max
 #define max(a, b) (((a)>(b))?(a):(b))
 #endif
 #ifndef min
 	if(fdView >= 0) { /* might be open after viewers, but unlikely */
 	    removeInputHandler(&R_InputHandlers,
 			       getInputHandler(R_InputHandlers,fdView));
 	    fdView = -1;
+	}
-#ifdef USE_FONTSET
 	if(font_set) {
 	    XFreeFontSet(iodisplay, font_set);
 	    font_set = NULL;
+	}
-#endif
 	XCloseDisplay(iodisplay);
 	iodisplay = NULL;
+    }
     /* drop out unused columns */
 static void printstring(DEstruct DE, const char *ibuf, int buflen, int row,
 			int col, int left)
+{
     int i, x_pos, y_pos, bw, bufw;
     char pbuf[BOOSTED_BUF_SIZE];
-#ifdef USE_FONTSET
     int wcsbufw,j;
     wchar_t wcspbuf[BOOSTED_BUF_SIZE], *wcspc = wcspbuf;
     wchar_t wcs[BOOSTED_BUF_SIZE];
     char    s[BOOSTED_BUF_SIZE];
     wchar_t *w_p;
     cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(s)-1,NULL);
     drawtext(DE, x_pos + DE->text_offset, y_pos + DE->box_h - DE->text_offset,
 	     s, cnt);
-#else  /* USE_FONTSET */
-    char *pc = pbuf;
-    find_coords(DE, row, col, &x_pos, &y_pos);
-    if (col == 0) bw = DE->boxw[0]; else bw = BOXW(col+DE->colmin-1);
-    cleararea(DE, x_pos + 2, y_pos + 2, bw - 3, DE->box_h - 3);
-    bufw = (buflen > 200) ? 200 : buflen;
-    strncpy(pbuf, ibuf, bufw);
-    if(left) {
-	for (i = bufw; i > 1; i--) {
-	    if (textwidth(DE, pc, i) < (bw - DE->text_offset)) break;
-	    *(++pc) = '<';
-	}
-    } else {
-	for (i = bufw; i > 1; i--) {
-	    if (textwidth(DE, pbuf, i) < (bw - DE->text_offset)) break;
-	    *(pbuf + i - 2) = '>';
-	}
-    }
-    drawtext(DE, x_pos + DE->text_offset, y_pos + DE->box_h - DE->text_offset,
-	     pc, i);
-#endif /* USE_FONTSET */
     Rsync(DE);
+}
 static void clearrect(DEstruct DE)
+{
 /* handlechar has to be able to parse decimal numbers and strings,
    depending on the current column type, only printing characters
    should get this far */
 /* --- Not true! E.g. ESC ends up in here... */
-#ifdef USE_FONTSET
 #include <R_ext/rlocale.h>
-#include <wchar.h>
-#include <wctype.h>
-#endif
 /* <FIXME> This is not correct for stateful MBCSs, but that's hard to
    do as we get a char at a time */
 static void handlechar(DEstruct DE, char *text)
+{
     int c = text[0], j;
-#ifdef USE_FONTSET
     wchar_t wcs[BOOSTED_BUF_SIZE];
     memset(wcs,0,sizeof(wcs));
-#endif
     if ( c == '\033' ) { /* ESC */
 	CellModified = FALSE;
 	clength = 0;
 	bufp = buf;
 	    bufp = buf;
+	}
+    }
     if (currentexp == 1) {	/* we are parsing a number */
+	char *mbs = text;
+	int i, cnt = mbsrtowcs(wcs, (const char **)&mbs, strlen(text)+1, NULL);
-#ifdef USE_FONTSET
-      char *mbs = text;
-      int i, cnt = mbsrtowcs(wcs, (const char **)&mbs, strlen(text)+1, NULL);
-      for(i = 0; i < cnt; i++) {
+	for(i = 0; i < cnt; i++) {
-	  switch (wcs[i]) {
+	    switch (wcs[i]) {
-	  case L'-':
+	    case L'-':
-	      if (nneg == 0) nneg++; else goto donehc;
-	      break;
-	  case L'.':
-	      if (ndecimal == 0) ndecimal++; else goto donehc;
-	      break;
-	  case L'e':
-	  case L'E':
-	      if (ne == 0) {
-		  nneg = ndecimal = 0;	/* might have decimal in exponent */
-		  ne++;
-	      } else goto donehc;
-	      break;
-	case L'N':
-	    if(nneg) goto donehc;
-	case L'I':
-	    inSpecial++;
-	    break;
-	  default:
-	      if (!inSpecial && !iswdigit(wcs[i])) goto donehc;
-	      break;
-	  }
-      }
-#else
-	switch (c) {
-	case '-':
-	    if (nneg == 0) nneg++; else goto donehc;
+		if (nneg == 0) nneg++; else goto donehc;
-	    break;
-	case '.':
-	    if (ndecimal == 0) ndecimal++; else goto donehc;
 	    break;
-	case 'e':
-	case 'E':
+	    case L'.':
-	    if (ne == 0) {
-		nneg = ndecimal = 0;	/* might have decimal in exponent */
+		if (ndecimal == 0) ndecimal++; else goto donehc;
-		ne++;
-	    } else goto donehc;
 	    break;
-	case 'N':
+	    case L'e':
-	    if(nneg) goto donehc;
+	    case L'E':
-	case 'I':
+		if (ne == 0) {
+		    nneg = ndecimal = 0;	/* might have decimal in exponent */
-	    inSpecial++;
+		    ne++;
+		} else goto donehc;
 	    break;
-	default:
+	    case L'N':
-	    if (!inSpecial && !isdigit(c)) goto donehc;
+		if(nneg) goto donehc;
+	    case L'I':
+		inSpecial++;
 	    break;
+	    default:
+		if (!inSpecial && !iswdigit(wcs[i])) goto donehc;
+		break;
+	    }
+	}
-#endif
+    }
     if (currentexp == 3) {
-#ifdef USE_FONTSET
 	char *mbs = text;
 	int i, cnt = mbsrtowcs(wcs, (const char **)&mbs, strlen(text)+1, NULL);
 	for(i = 0; i < cnt; i++) {
 	    if (iswspace(wcs[i])) goto donehc;
 	    if (clength == 0 && wcs[i] != L'.' && !iswalpha(wcs[i]))
 		goto donehc;
 	    else if (wcs[i] != L'.' && !iswalnum(wcs[i])) goto donehc;
+	}
-#else
-	if (isspace(c)) goto donehc;
-	if (clength == 0  && c != '.' && !isalpha(c)) goto donehc;
-	else if (c != '.' && !isalnum(c)) goto donehc;
-#endif
+    }
     if (clength+strlen(text) > BOOSTED_BUF_SIZE - MB_CUR_MAX - 1) {
 	warning("dataentry: expression too long");
 	goto donehc;
 	XFindContext(iodisplay, ioevent.xany.window, deContext, &temp);
 	if ((DEstruct) temp != DE) { /* so a View window */
 	    if (WhichEvent(ioevent) == Expose)
 		drawwindow((DEstruct) temp);
 	} else {
-#ifdef USE_FONTSET
 	    if (XFilterEvent(&ioevent, None)){
 		if(ioic){
 		    XSetICFocus(ioic);
 		    if (ioim_style & XIMPreeditPosition)
 			calc_pre_edit_pos(DE);
+		}
 		continue;
+	    }
-#endif
 	    switch (WhichEvent(ioevent)) {
 	    case keyDown:/* KeyPress */
 		doSpreadKey(DE, 0, &ioevent);
 		break;
 	    /* NB: this is removing the handler that is currently
 	       being used: only OK to free here in R > 2.8.0 */
 	    removeInputHandler(&R_InputHandlers,
 			       getInputHandler(R_InputHandlers,fdView));
 	    fdView = -1;
-#ifdef USE_FONTSET
 	    if(font_set) {
 		XFreeFontSet(iodisplay, font_set);
 		font_set = NULL;
+	    }
-#endif
 	    XCloseDisplay(iodisplay);
 	    iodisplay = NULL;
+	}
+    }
+}
 static void doSpreadKey(DEstruct DE, int key, DEEvent * event)
+{
     KeySym iokey;
-    char *text;
+    char *text = "";
     iokey = GetKey(event);
     if(DE->isEditor) text = GetCharP(event);
     if (CheckControl(event))
     static char text[BOOSTED_BUF_SIZE];
     KeySym iokey;
     memset(text,0,sizeof(text));
-#ifdef USE_FONTSET
     if(mbcslocale) {
 #ifdef HAVE_XUTF8LOOKUPSTRING
 	if(utf8locale)
 	    Xutf8LookupString(ioic, (XKeyEvent *)event,
 			      text, sizeof(text) - clength,
 			    &iokey, &status);
 	/* FIXME check the return code */
 	if(status == XBufferOverflow)
 	    warning("dataentry: expression too long");
     } else
-#endif
 	XLookupString((XKeyEvent *)event,
 		      text, sizeof(text) - clength,
 		      &iokey, NULL);
     return text;
+}
 /* Initialize/Close Windows */
 void closewin(DEstruct DE)
+{
     XFreeGC(iodisplay, DE->iogc);
-#ifdef USE_FONTSET
     if(mbcslocale  && DE->isEditor) {
 	XDestroyIC(ioic);
 	XCloseIM(ioim);
+    }
-#endif
     XDestroyWindow(iodisplay, DE->iowindow);
     /* XCloseDisplay(iodisplay); */
     Rsync(DE);
+}
     XEvent ioevent;
     XSetWindowAttributes winattr;
     XWindowAttributes attribs;
     XSizeHints *hint;
     unsigned long fevent=0UL;
-#ifdef USE_FONTSET
     int j,k;
     XVaNestedList   xva_nlist;
     XPoint xpoint;
-#endif
     strcpy(copycontents, "");
-#ifdef USE_FONTSET
     if (!XSupportsLocale ())
 	warning("locale not supported by Xlib: some X ops will operate in C locale");
     if (!XSetLocaleModifiers ("")) warning("X cannot set locale modifiers");
-#endif
     if(!iodisplay) {
 	if ((iodisplay = XOpenDisplay(NULL)) == NULL) {
 	    warning("unable to open display");
 	    return TRUE;
+    }
     /* Get Font Loaded if we can */
-#ifdef USE_FONTSET
     if(mbcslocale) {
 	int  missing_charset_count;
 	char **missing_charset_list;
 	char *def_string;
 	char opt_fontset_name[512];
+	}
 	if (font_set == NULL) {
 	    warning("unable to create fontset %s", opt_fontset_name);
 	    return TRUE; /* ERROR */
+	}
-    } else
+    } else {
-#endif
-    {
 	DE->font_info = XLoadQueryFont(iodisplay, font_name);
 	if (DE->font_info == NULL) {
 	    warning("unable to losd font %s", font_name);
 	    return TRUE; /* ERROR */
+	}
     twidth = textwidth(DE, digits, strlen(digits));
     if (DE->nboxchars > 0) twidth = (twidth * DE->nboxchars)/10;
     DE->box_w = twidth + 4;
-#ifdef USE_FONTSET
     if(mbcslocale) {
 	XFontSetExtents *extent = XExtentsOfFontSet(font_set);
 	char **ml;
 	DE->box_h = (extent->max_logical_extent.height)
 	    + (extent->max_logical_extent.height / 5) + 4;
 	font_set_cnt = XFontsOfFontSet(font_set, &fs_list, &ml);
 	DE->text_offset = 2 + fs_list[0]->max_bounds.descent;
-    } else
+    } else {
-#endif
-    {
 	DE->box_h = DE->font_info->max_bounds.ascent
 	    + DE->font_info->max_bounds.descent + 4;
 	DE->text_offset = 2 + DE->font_info->max_bounds.descent;
+    }
     DE->windowHeight = 26 * DE->box_h + DE->hht + 2;
     XSetWMHints(iodisplay, DE->iowindow, &hints);
      */
     DE->iogc = XCreateGC(iodisplay, DE->iowindow, 0, 0);
-#ifdef USE_FONTSET
     if(mbcslocale && DE->isEditor) {
 	ioim = XOpenIM(iodisplay, NULL, NULL, NULL);
 	if(!ioim) {
 	    XDestroyWindow(iodisplay, DE->iowindow);
 	    XCloseDisplay(iodisplay);
+	}
 	/* get XIM processes event. */
 	XGetICValues(ioic, XNFilterEvents, &fevent, NULL);
+    }
-#endif
-#ifdef USE_FONTSET
     if(!mbcslocale)
-#endif
 	XSetFont(iodisplay, DE->iogc, DE->font_info->fid);
     XSetBackground(iodisplay, DE->iogc, iowhite);
     XSetForeground(iodisplay, DE->iogc, ioblack);
     XSetLineAttributes(iodisplay, DE->iogc, 1, LineSolid, CapRound,
 		       JoinRound);
 		   width, height);
+}
 static void drawtext(DEstruct DE, int xpos, int ypos, char *text, int len)
+{
-#ifdef USE_FONTSET
     if(mbcslocale)
 #ifdef HAVE_XUTF8DRAWIMAGESTRING
 	if(utf8locale)
 	    Xutf8DrawImageString(iodisplay, DE->iowindow, font_set,
 				 DE->iogc, xpos, ypos,text, len);
 	else
 #endif
 	    XmbDrawImageString(iodisplay, DE->iowindow, font_set,
 			       DE->iogc, xpos, ypos,text, len);
     else
-#endif
 	XDrawImageString(iodisplay, DE->iowindow, DE->iogc,
 			 xpos, ypos, text, len);
     Rsync(DE);
+}
 static int textwidth(DEstruct DE, const char *text, int nchar)
+{
     int ans;
     char *buf = CallocCharBuf(nchar);
     strncpy(buf, text, nchar);
-#ifdef USE_FONTSET
     if(mbcslocale) {
 #ifdef HAVE_XUTF8TEXTESCAPEMENT
 	if (utf8locale)
 	    ans = Xutf8TextEscapement(font_set, buf, nchar);
 	else
 #endif
 	    ans = XmbTextEscapement(font_set, buf, nchar);
 	Free(buf);
 	return ans;
+    }
-#endif
     ans = XTextWidth(DE->font_info, buf, nchar);
     Free(buf);
     return ans;
+}
 	REPROTECT(DE->lens = lengthgets(DE->lens, popupcol), DE->lpi);
 	DE->xmaxused = popupcol;
+    }
     tvec = VECTOR_ELT(DE->work, popupcol - 1);
     name = CHAR(STRING_ELT(DE->names, popupcol - 1));
-#ifdef USE_FONTSET
     if(mbcslocale)
 #ifdef HAVE_XUTF8DRAWSTRING
 	if(utf8locale)
 	    Xutf8DrawString(iodisplay,
 			    menupanes[0],
 	    XmbDrawString(iodisplay,
 			  menupanes[0],
 			  font_set, DE->iogc, 3, DE->box_h - 3, name,
 			  strlen(name));
     else
-#endif
 	XDrawString(iodisplay,
 		    menupanes[0], DE->iogc, 3, DE->box_h - 3, name,
 		    strlen(name));
     for (i = 1; i < 4; i++)
-#ifdef USE_FONTSET
-      if(mbcslocale)
+	if(mbcslocale)
 #ifdef HAVE_XUTF8DRAWSTRING
-	if(utf8locale)
+	    if(utf8locale)
-	  Xutf8DrawString(iodisplay,
+		Xutf8DrawString(iodisplay,
-			  menupanes[i],
+				menupanes[i],
-			  font_set, DE->iogc, 3, DE->box_h - 3,
+				font_set, DE->iogc, 3, DE->box_h - 3,
-			  menu_label[i - 1], strlen(menu_label[i - 1]));
+				menu_label[i - 1], strlen(menu_label[i - 1]));
-	else
+	    else
 #endif
-	  XmbDrawString(iodisplay,
+		XmbDrawString(iodisplay,
-			menupanes[i],
+			      menupanes[i],
-			font_set, DE->iogc, 3, DE->box_h - 3,
+			      font_set, DE->iogc, 3, DE->box_h - 3,
+			      menu_label[i - 1], strlen(menu_label[i - 1]));
+	else
+	    XDrawString(iodisplay,
+			menupanes[i], DE->iogc, 3, DE->box_h - 3,
 			menu_label[i - 1], strlen(menu_label[i - 1]));
-      else
-#endif
-	XDrawString(iodisplay,
-		    menupanes[i], DE->iogc, 3, DE->box_h - 3,
-		    menu_label[i - 1], strlen(menu_label[i - 1]));
     if (isNull(tvec) || TYPEOF(tvec) == REALSXP)
-#ifdef USE_FONTSET
-      if(mbcslocale)
+	if(mbcslocale)
 #ifdef HAVE_XUTF8DRAWSTRING
-	if(utf8locale)
+	    if(utf8locale)
-	  Xutf8DrawString(iodisplay,
+		Xutf8DrawString(iodisplay,
-			  menupanes[1],
+				menupanes[1],
-			  font_set, DE->iogc, 0, DE->box_h - 3,
+				font_set, DE->iogc, 0, DE->box_h - 3,
-			  "*", 1);
+				"*", 1);
-	else
+	    else
 #endif
-	  XmbDrawString(iodisplay,
+		XmbDrawString(iodisplay,
-			menupanes[1],
+			      menupanes[1],
-			font_set, DE->iogc, 0, DE->box_h - 3,
+			      font_set, DE->iogc, 0, DE->box_h - 3,
+			      "*", 1);
+	else
+	    XDrawString(iodisplay, menupanes[1], DE->iogc, 0, DE->box_h - 3,
 			"*", 1);
-      else
-#endif
-	XDrawString(iodisplay, menupanes[1], DE->iogc, 0, DE->box_h - 3,
-		    "*", 1);
     else
-#ifdef USE_FONTSET
-      if(mbcslocale)
+	if(mbcslocale)
 #ifdef HAVE_XUTF8DRAWSTRING
-	if(utf8locale)
+	    if(utf8locale)
-	  Xutf8DrawString(iodisplay,
+		Xutf8DrawString(iodisplay,
-			  menupanes[2],
+				menupanes[2],
-			  font_set, DE->iogc, 0, DE->box_h - 3,
+				font_set, DE->iogc, 0, DE->box_h - 3,
-			  "*", 1);
+				"*", 1);
-	else
+	    else
 #endif
-	  XmbDrawString(iodisplay,
+		XmbDrawString(iodisplay,
-			menupanes[2],
+			      menupanes[2],
-			font_set, DE->iogc, 0, DE->box_h - 3,
+			      font_set, DE->iogc, 0, DE->box_h - 3,
+			      "*", 1);
+	else
+	    XDrawString(iodisplay, menupanes[2], DE->iogc, 0, DE->box_h - 3,
 			"*", 1);
-      else
-#endif
-	XDrawString(iodisplay, menupanes[2], DE->iogc, 0, DE->box_h - 3,
-		    "*", 1);
 /*
   start an event loop; we're looking for a button press and a button
   release in the same window
 */
 				DE->box_h - 3,
 				menu_label[i - 1], strlen(menu_label[i - 1]));
+	    }
+	}
+    }
- done:
+done:
     popdownmenu(DE);
     highlightrect(DE);
+}
 void popdownmenu(DEstruct DE)
+    }
     closerect(DE);
     highlightrect(DE);
+}
-#ifdef USE_FONTSET
 static void calc_pre_edit_pos(DEstruct DE)
+{
     XVaNestedList   xva_nlist;
     XPoint          xpoint;
     int i;
     XSetICValues(ioic, XNPreeditAttributes, xva_nlist, NULL);
     XFree(xva_nlist);
     return;
+}
-#endif
 /* last character bytes */
 static int last_wchar_bytes(char *str)
+{
-#ifdef USE_FONTSET
     wchar_t   wcs[BOOSTED_BUF_SIZE];
     mbstate_t mb_st;
     int cnt;
     char last_mbs[8];
     char *mbs;
     if(wcs[0] == L'\0') return 0;
     memset(last_mbs, 0, sizeof(last_mbs));
     bytes = wcrtomb(last_mbs, wcs[cnt-1], &mb_st); /* -Wall */
     return(bytes);
-#else
-    return(1);
-#endif
+}

The R Project SVN R

(root)/branches/R-exp-R5/src/modules/X11/dataentry.c @ 77458 – Rev 48544 → 49591