another test for cvs notifications

WINGs/Extras/Makefile.am

@@ -22,6 +22,7 @@ libExtraWINGs_a_SOURCES = 	\
 	wtableview.h \
 	wtabledelegates.h 
 
+AM_CFLAGS = -fno-strict-aliasing
 
 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG

WINGs/Makefile.am

@@ -108,7 +108,9 @@ libWUtil_a_SOURCES = 	\
 	wutil.c
 
 
-AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
+
+AM_CFLAGS = -fno-strict-aliasing
 
 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG

WINGs/Tests/wtest.c

@@ -116,14 +116,14 @@ testFrame(WMScreen *scr)
 }
 
 
-static void
+/*static void
 resizedWindow(void *self, WMNotification *notif)
 {
     WMView *view = (WMView*)WMGetNotificationObject(notif);
     WMSize size = WMGetViewSize(view);
 
     WMResizeWidget((WMWidget*)self, size.width, size.height);
-}
+}*/
 
 void
 testBox(WMScreen *scr)
@@ -609,7 +609,8 @@ testText(WMScreen *scr)
         WMFont *font, *ifont;
 
         font = WMDefaultSystemFont(scr);
-        ifont = WMCopyFontWithStyle(scr, font, WFSEmphasized);
+        //ifont = WMCopyFontWithStyle(scr, font, WFSEmphasized);
+        ifont = WMCreateFont(scr, "verdana,sans:pixelsize=12:italic");
         if (ifont) {
             WMSetTextDefaultFont(text, ifont);
             WMReleaseFont(ifont);
@@ -619,7 +620,7 @@ testText(WMScreen *scr)
         WMReleaseFont(font);
     }
 
-    if(file) {
+    if (file) {
         char buf[1024];
 
         WMFreezeText(text);

WINGs/WINGs/WINGs.h

@@ -1834,12 +1834,11 @@ void WMShowFontPanel(WMFontPanel *panel);
 
 void WMHideFontPanel(WMFontPanel *panel);
 
+void WMFreeFontPanel(WMFontPanel *panel);
+
 void WMSetFontPanelAction(WMFontPanel *panel, WMAction2 *action, void *data);
 
-void WMSetFontPanelFont(WMFontPanel *panel, WMFont *font);
-
-/* you can free the returned string */
-char* WMGetFontPanelFontName(WMFontPanel *panel);
+void WMSetFontPanelFont(WMFontPanel *panel, char *fontName);
 
 WMFont* WMGetFontPanelFont(WMFontPanel *panel);
 

WINGs/WINGs/WINGsP.h

@@ -22,19 +22,14 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define DOUBLE_BUFFER
-
 
+#define DOUBLE_BUFFER   1
 
 #define WC_UserWidget	128
 
+#define SCROLLER_WIDTH	20
 
-
-#define SCROLLER_WIDTH	 20
-
-
-
-#define XDND_VERSION 4
+#define XDND_VERSION    4
 
 
 typedef struct W_Application {

WINGs/configuration.c

@@ -14,10 +14,6 @@ _WINGsConfiguration WINGsConfiguration;
 
 #define BOLD_SYSTEM_FONT "-*-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-*-bold-r-*-*-%d-*-*-*-*-*-*-*"
 
-#define XFTSYSTEM_FONT "-*-arial-medium-r-normal-*-%d-*-*-*-*-*-*-*"
-
-#define XFTBOLD_SYSTEM_FONT "-*-arial-bold-r-normal-*-%d-*-*-*-*-*-*-*"
-
 #define FLOPPY_PATH "/floppy"
 
 
@@ -45,6 +41,7 @@ getButtonWithName(const char *name, unsigned defaultButton)
 }
 
 
+// fix this
 static Bool
 missingOrInvalidXLFD(char *xlfd)
 {

WINGs/dragcommon.c

@@ -193,14 +193,15 @@ W_HandleDNDClientMessage(WMView *toplevel, XClientMessageEvent *event)
     WMDraggingInfo *info = &scr->dragInfo;
     Atom messageType = event->message_type;
 
-    char* msgTypeName = XGetAtomName(scr->display, messageType);
-
 #ifdef XDND_DEBUG
+    {
+        char* msgTypeName = XGetAtomName(scr->display, messageType);
 
-    if (msgTypeName != NULL)
-        printf("event type = %s\n", msgTypeName);
-    else
-        printf("pb with event type !\n");
+        if (msgTypeName != NULL)
+            printf("event type = %s\n", msgTypeName);
+        else
+            printf("pb with event type !\n");
+    }
 #endif
 
 

WINGs/dragdestination.c

@@ -79,7 +79,7 @@ createDropDataArray(WMArray *requiredTypes)
 static WMArray*
 getTypesFromTypeList(WMScreen *scr, Window sourceWin)
 {
-    WMDraggingInfo *info = &scr->dragInfo;
+    /* // WMDraggingInfo *info = &scr->dragInfo;*/
     Atom dataType;
     Atom* typeAtomList;
     WMArray* typeList;
@@ -365,7 +365,6 @@ W_DragDestinationStoreEnterMsgInfo(WMDraggingInfo *info,
                                    WMView *toplevel, XClientMessageEvent *event)
 {
     WMScreen *scr = W_VIEW_SCREEN(toplevel);
-    int i,j, typesCount;
 
     if (XDND_DEST_INFO(info) == NULL)
         initDestinationDragInfo(info);
@@ -609,7 +608,7 @@ static void
 sendAllowedAction(WMView *destView, Atom action)
 {
     WMScreen *scr = W_VIEW_SCREEN(destView);
-    WMPoint destPos = WMGetViewScreenPosition(destView);
+    /* // WMPoint destPos = WMGetViewScreenPosition(destView); */
     WMSize destSize = WMGetViewSize(destView);
     int destX, destY;
     Window foo;

WINGs/dragsource.c

@@ -425,6 +425,8 @@ sendEnterMessage(WMDraggingInfo *info)
 }
 
 
+// this functon doesn't return something in all cases.
+// control reaches end of non-void function. fix this -Dan
 static Bool
 sendPositionMessage(WMDraggingInfo *info, WMPoint *mousePos)
 {
@@ -740,7 +742,6 @@ isXdndAware(WMScreen *scr, Window win)
     int format;
     unsigned long count, remain;
     unsigned char *winXdndVersion;
-    unsigned char *proxy;
 
     if (win == None)
         return False;
@@ -876,7 +877,7 @@ initMotionProcess(WMView *view, WMDraggingInfo *info,
 static void
 processMotion(WMDraggingInfo *info, Window windowUnderDrag, WMPoint *mousePos)
 {
-    WMScreen *scr = sourceScreen(info);
+    /* // WMScreen *scr = sourceScreen(info); */
     Window newDestination = findDestination(info, mousePos);
 
     W_DragSourceStopTimer();
@@ -1058,6 +1059,7 @@ traceStatusMsg(Display *dpy, XClientMessageEvent *statusEvent)
 #endif
 
 
+static void
 storeDropAction(WMDraggingInfo *info, Atom destAction)
 {
     WMView* sourceView = XDND_SOURCE_VIEW(info);

WINGs/python/WINGs.py

@@ -26,10 +26,11 @@ class WMTimer:
             self._o = wings.pyWMAddPersistentTimerHandler(milliseconds, (callback, cdata))
         else:
             self._o = wings.pyWMAddTimerHandler(milliseconds, (callback, cdata))
+        self.__WMDeleteTimerHandler = wings.pyWMDeleteTimerHandler
 
     def __del__(self):
-        wings.pyWMDeleteTimerHandler(self._o)
-    #delete = __del__
+        self.__WMDeleteTimerHandler(self._o)
+
 
 class WMPersistentTimer(WMTimer):
     def __init__(self, milliseconds, callback, cdata=None):
@@ -87,14 +88,15 @@ class WMView:
 
 class WMWidget(WMView):
     def __init__(self):
-        self._o = None
         if self.__class__ == WMWidget:
             raise Error, "a WMWidget can't be instantiated directly"
+        self._o = None
+        self.__WMDestroyWidget = wings.WMDestroyWidget
 
     def __del__(self):
-        if (self._o != None):
-            wings.WMDestroyWidget(self._o)
-    
+        if self._o is not None:
+            self.__WMDestroyWidget(self._o)
+
     def resize(self, width, height):
         wings.WMResizeWidget(self._o, width, height)
 

WINGs/wevent.c

@@ -66,8 +66,8 @@ static WMEventHook *extraEventHandler=NULL;
  *
  */
 void
-    WMCreateEventHandler(WMView *view, unsigned long mask, WMEventProc *eventProc,
-                         void *clientData)
+WMCreateEventHandler(WMView *view, unsigned long mask, WMEventProc *eventProc,
+                     void *clientData)
 {
     W_EventHandler *hPtr;
     WMArrayIterator iter;

WINGs/wfont_noxft.c

@@ -0,0 +1,769 @@
+
+
+#include "wconfig.h"
+
+#ifndef XFT
+
+#include "WINGsP.h"
+
+#include <wraster.h>
+#include <assert.h>
+#include <X11/Xlocale.h>
+
+
+static char *makeFontSetOfSize(char *fontset, int size);
+
+
+/* XLFD pattern matching */
+static char*
+getElementFromXLFD(const char *xlfd, int index)
+{
+    const char *p = xlfd;
+    while (*p != 0) {
+        if (*p == '-' && --index == 0) {
+            const char *end = strchr(p + 1, '-');
+            char *buf;
+            size_t len;
+            if (end == 0) end = p + strlen(p);
+            len = end - (p + 1);
+            buf = wmalloc(len);
+            memcpy(buf, p + 1, len);
+            buf[len] = 0;
+            return buf;
+        }
+        p++;
+    }
+    return strdup("*");
+}
+
+
+/* XLFD pattern matching */
+static char*
+generalizeXLFD(const char *xlfd)
+{
+    char *buf;
+    int len;
+    char *weight = getElementFromXLFD(xlfd, 3);
+    char *slant  = getElementFromXLFD(xlfd, 4);
+    char *pxlsz  = getElementFromXLFD(xlfd, 7);
+
+#define Xstrlen(A) ((A)?strlen(A):0)
+    len = Xstrlen(xlfd)+Xstrlen(weight)+Xstrlen(slant)+Xstrlen(pxlsz)*2+60;
+#undef Xstrlen
+
+    buf = wmalloc(len + 1);
+    snprintf(buf, len + 1, "%s,-*-*-%s-%s-*-*-%s-*-*-*-*-*-*-*,"
+             "-*-*-*-*-*-*-%s-*-*-*-*-*-*-*,*",
+             xlfd, weight, slant, pxlsz, pxlsz);
+
+    wfree(pxlsz);
+    wfree(slant);
+    wfree(weight);
+
+    return buf;
+}
+
+/* XLFD pattern matching */
+static XFontSet
+W_CreateFontSetWithGuess(Display *dpy, char *xlfd, char ***missing,
+                         int *nmissing, char **def_string)
+{
+    XFontSet fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string);
+
+    if (fs != NULL && *nmissing == 0) return fs;
+
+    /* for non-iso8859-1 language and iso8859-1 specification
+     (this fontset is only for pattern analysis) */
+    if (fs == NULL) {
+        if (*nmissing != 0) XFreeStringList(*missing);
+        setlocale(LC_CTYPE, "C");
+        fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string);
+        setlocale(LC_CTYPE, "");
+    }
+
+    /* make XLFD font name for pattern analysis */
+    if (fs != NULL) {
+        XFontStruct **fontstructs;
+        char **fontnames;
+        if (XFontsOfFontSet(fs, &fontstructs, &fontnames) > 0)
+            xlfd = fontnames[0];
+    }
+
+    xlfd = generalizeXLFD(xlfd);
+
+    if (*nmissing != 0) XFreeStringList(*missing);
+    if (fs != NULL) XFreeFontSet(dpy, fs);
+
+    fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string);
+
+    wfree(xlfd);
+    return fs;
+}
+
+
+static char*
+xlfdFromFontName(char *fontName)
+{
+    char *systemFont, *boldSystemFont;
+    char *font;
+    int size;
+
+    systemFont = WINGsConfiguration.systemFont;
+    boldSystemFont = WINGsConfiguration.boldSystemFont;
+
+    size = WINGsConfiguration.defaultFontSize;
+
+    if (strcmp(fontName, "SystemFont")==0) {
+        font = systemFont;
+    } else if (strncmp(fontName, "SystemFont-", 11)==0) {
+        font = systemFont;
+        if (sscanf(&fontName[11], "%i", &size)!=1) {
+            size = WINGsConfiguration.defaultFontSize;
+            wwarning(_("Invalid size specification '%s' in %s. "
+                       "Using default %d\n"), &fontName[11], fontName, size);
+        }
+    } else if (strcmp(fontName, "BoldSystemFont")==0) {
+        font = boldSystemFont;
+    } else if (strncmp(fontName, "BoldSystemFont-", 15)==0) {
+        font = boldSystemFont;
+        if (sscanf(&fontName[15], "%i", &size)!=1) {
+            size = WINGsConfiguration.defaultFontSize;
+            wwarning(_("Invalid size specification '%s' in %s. "
+                       "Using default %d\n"), &fontName[15], fontName, size);
+        }
+    } else {
+        font = NULL;
+    }
+
+    return (font!=NULL ? makeFontSetOfSize(font, size) : wstrdup(fontName));
+}
+
+
+WMFont*
+WMCreateFontSet(WMScreen *scrPtr, char *fontName)
+{
+    WMFont *font;
+    Display *display = scrPtr->display;
+    char **missing;
+    int nmissing = 0;
+    char *defaultString;
+    char *fname;
+    XFontSetExtents *extents;
+
+    fname = xlfdFromFontName(fontName);
+
+    font = WMHashGet(scrPtr->fontSetCache, fname);
+    if (font) {
+        WMRetainFont(font);
+        wfree(fname);
+        return font;
+    }
+
+    font = wmalloc(sizeof(WMFont));
+    memset(font, 0, sizeof(WMFont));
+
+    font->notFontSet = 0;
+
+    font->screen = scrPtr;
+
+    font->font.set = W_CreateFontSetWithGuess(display, fname, &missing,
+                                              &nmissing, &defaultString);
+    if (nmissing > 0 && font->font.set) {
+        int i;
+
+        wwarning(_("the following character sets are missing in %s:"), fname);
+        for (i = 0; i < nmissing; i++) {
+            wwarning(missing[i]);
+        }
+        XFreeStringList(missing);
+        if (defaultString)
+            wwarning(_("the string \"%s\" will be used in place of any characters from those sets."),
+                     defaultString);
+    }
+    if (!font->font.set) {
+        wfree(font);
+        wfree(fname);
+        return NULL;
+    }
+
+    extents = XExtentsOfFontSet(font->font.set);
+
+    font->height = extents->max_logical_extent.height;
+    font->y = font->height - (font->height + extents->max_logical_extent.y);
+
+    font->refCount = 1;
+
+    font->name = fname;
+
+    assert(WMHashInsert(scrPtr->fontSetCache, font->name, font)==NULL);
+
+    return font;
+}
+
+
+
+WMFont*
+WMCreateNormalFont(WMScreen *scrPtr, char *fontName)
+{
+    WMFont *font;
+    Display *display = scrPtr->display;
+    char *fname, *ptr;
+
+    fontName = xlfdFromFontName(fontName);
+
+    if ((ptr = strchr(fontName, ','))) {
+        fname = wmalloc(ptr - fontName + 1);
+        strncpy(fname, fontName, ptr - fontName);
+        fname[ptr - fontName] = 0;
+    } else {
+        fname = wstrdup(fontName);
+    }
+
+    wfree(fontName);
+
+    font = WMHashGet(scrPtr->fontCache, fname);
+    if (font) {
+        WMRetainFont(font);
+        wfree(fname);
+        return font;
+    }
+
+    font = wmalloc(sizeof(WMFont));
+    memset(font, 0, sizeof(WMFont));
+
+    font->notFontSet = 1;
+
+    font->screen = scrPtr;
+
+    font->font.normal = XLoadQueryFont(display, fname);
+    if (!font->font.normal) {
+        wfree(font);
+        wfree(fname);
+        return NULL;
+    }
+    font->height = font->font.normal->ascent+font->font.normal->descent;
+    font->y = font->font.normal->ascent;
+
+    font->refCount = 1;
+
+    font->name = fname;
+
+    assert(WMHashInsert(scrPtr->fontCache, font->name, font)==NULL);
+
+    return font;
+}
+
+
+WMFont*
+WMCreateFont(WMScreen *scrPtr, char *fontName)
+{
+    return WMCreateFontWithFlags(scrPtr, fontName, WFDefaultFont);
+}
+
+
+WMFont*
+WMCreateFontWithFlags(WMScreen *scrPtr, char *fontName, WMFontFlags flags)
+{
+    Bool multiByte = scrPtr->useMultiByte;
+    WMFont *font;
+
+    if (flags & WFFontSet) {
+        multiByte = True;
+    } else if (flags & WFNormalFont) {
+        multiByte = False;
+    }
+
+    } else if (multiByte) {
+        font = WMCreateFontSet(scrPtr, fontName);
+    } else {
+        font = WMCreateNormalFont(scrPtr, fontName);
+    }
+
+    return font;
+}
+
+
+WMFont*
+WMRetainFont(WMFont *font)
+{
+    wassertrv(font!=NULL, NULL);
+
+    font->refCount++;
+
+    return font;
+}
+
+
+void
+WMReleaseFont(WMFont *font)
+{
+    wassertr(font!=NULL);
+
+    font->refCount--;
+    if (font->refCount < 1) {
+        if (font->notFontSet) {
+            XFreeFont(font->screen->display, font->font.normal);
+        } else {
+            XFreeFontSet(font->screen->display, font->font.set);
+        }
+
+        if (font->name) {
+            if (font->notFontSet) {
+                WMHashRemove(font->screen->fontCache, font->name);
+            } else {
+                WMHashRemove(font->screen->fontSetCache, font->name);
+            }
+            wfree(font->name);
+        }
+        wfree(font);
+    }
+}
+
+
+Bool
+WMIsAntialiasingEnabled(WMScreen *scrPtr)
+{
+    return False;
+}
+
+
+unsigned int
+WMFontHeight(WMFont *font)
+{
+    wassertrv(font!=NULL, 0);
+
+    return font->height;
+}
+
+
+char*
+WMGetFontName(WMFont *font)
+{
+    wassertrv(font!=NULL, NULL);
+
+    return font->name;
+}
+
+
+WMFont*
+WMDefaultSystemFont(WMScreen *scrPtr)
+{
+    return WMRetainFont(scrPtr->normalFont);
+}
+
+
+WMFont*
+WMDefaultBoldSystemFont(WMScreen *scrPtr)
+{
+    return WMRetainFont(scrPtr->boldFont);
+}
+
+
+static WMFont*
+makeSystemFontOfSize(WMScreen *scrPtr, int size, Bool bold)
+{
+    WMFont *font;
+    char *fontSpec;
+
+#define WConf WINGsConfiguration
+    if (bold) {
+        fontSpec = makeFontSetOfSize(WConf.boldSystemFont, size);
+    } else {
+        fontSpec = makeFontSetOfSize(WConf.systemFont, size);
+    }
+#undef WConf
+
+    if (scrPtr->useMultiByte) {
+        font = WMCreateFontSet(scrPtr, fontSpec);
+    } else {
+        font = WMCreateNormalFont(scrPtr, fontSpec);
+    }
+
+    if (!font) {
+        if (scrPtr->useMultiByte) {
+            wwarning(_("could not load font set %s. Trying fixed."), fontSpec);
+            font = WMCreateFontSet(scrPtr, "fixed");
+            if (!font) {
+                font = WMCreateFontSet(scrPtr, "-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*");
+            }
+        } else {
+            wwarning(_("could not load font %s. Trying fixed."), fontSpec);
+            font = WMCreateNormalFont(scrPtr, "fixed");
+        }
+        if (!font) {
+            wwarning(_("could not load fixed font!"));
+            wfree(fontSpec);
+            return NULL;
+        }
+    }
+    wfree(fontSpec);
+
+    return font;
+}
+
+
+WMFont*
+WMSystemFontOfSize(WMScreen *scrPtr, int size)
+{
+    return makeSystemFontOfSize(scrPtr, size, False);
+}
+
+
+WMFont*
+WMBoldSystemFontOfSize(WMScreen *scrPtr, int size)
+{
+    return makeSystemFontOfSize(scrPtr, size, True);
+}
+
+
+XFontSet
+WMGetFontFontSet(WMFont *font)
+{
+    wassertrv(font!=NULL, NULL);
+
+    if (!font->notFontSet && !font->antialiased)
+        return font->font.set;
+
+    return NULL;
+}
+
+
+int
+WMWidthOfString(WMFont *font, char *text, int length)
+{
+    wassertrv(font!=NULL, 0);
+    wassertrv(text!=NULL, 0);
+
+    if (font->notFontSet) {
+        return XTextWidth(font->font.normal, text, length);
+    } else {
+        XRectangle rect;
+        XRectangle AIXsucks;
+
+        XmbTextExtents(font->font.set, text, length, &AIXsucks, &rect);
+
+        return rect.width;
+    }
+}
+
+
+
+void
+WMDrawString(WMScreen *scr, Drawable d, WMColor *color, WMFont *font,
+             int x, int y, char *text, int length)
+{
+    wassertr(font!=NULL);
+
+    if (font->notFontSet) {
+        XSetFont(scr->display, scr->drawStringGC, font->font.normal->fid);
+        XSetForeground(scr->display, scr->drawStringGC, W_PIXEL(color));
+        XDrawString(scr->display, d, scr->drawStringGC, x, y + font->y,
+                    text, length);
+    } else {
+        XSetForeground(scr->display, scr->drawStringGC, W_PIXEL(color));
+        XmbDrawString(scr->display, d, font->font.set, scr->drawStringGC,
+                      x, y + font->y, text, length);
+    }
+}
+
+
+void
+WMDrawImageString(WMScreen *scr, Drawable d, WMColor *color, WMColor *background,
+                  WMFont *font, int x, int y, char *text, int length)
+{
+    wassertr(font!=NULL);
+
+    if (font->notFontSet) {
+        XSetForeground(scr->display, scr->drawImStringGC, W_PIXEL(color));
+        XSetBackground(scr->display, scr->drawImStringGC, W_PIXEL(background));
+        XSetFont(scr->display, scr->drawImStringGC, font->font.normal->fid);
+        XDrawImageString(scr->display, d, scr->drawImStringGC,
+                         x, y + font->y, text, length);
+    } else {
+        XSetForeground(scr->display, scr->drawImStringGC, W_PIXEL(color));
+        XSetBackground(scr->display, scr->drawImStringGC, W_PIXEL(background));
+        XmbDrawImageString(scr->display, d, font->font.set, scr->drawImStringGC,
+                           x, y + font->y, text, length);
+    }
+}
+
+
+
+
+static char*
+makeFontSetOfSize(char *fontset, int size)
+{
+    char font[300], *f;
+    char *newfs = NULL;
+    char *ptr;
+
+    do {
+        char *tmp;
+        int end;
+
+
+        f = fontset;
+        ptr = strchr(fontset, ',');
+        if (ptr) {
+            int count = ptr-fontset;
+
+            if (count > 255) {
+                wwarning(_("font description %s is too large."), fontset);
+            } else {
+                memcpy(font, fontset, count);
+                font[count] = 0;
+                f = (char*)font;
+            }
+        }
+
+        if (newfs)
+            end = strlen(newfs);
+        else
+            end = 0;
+
+        tmp = wmalloc(end + strlen(f) + 8);
+        if (end != 0) {
+            sprintf(tmp, "%s,", newfs);
+            sprintf(tmp + end + 1, f, size);
+        } else {
+            sprintf(tmp + end, f, size);
+        }
+
+        if (newfs)
+            wfree(newfs);
+        newfs = tmp;
+
+        fontset = ptr+1;
+    } while (ptr!=NULL);
+
+    return newfs;
+}
+
+
+#define FONT_PROPS 14
+
+typedef struct {
+    char *props[FONT_PROPS];
+} W_FontAttributes;
+
+
+static void
+changeFontProp(char *buf, char *newprop, int position)
+{
+    char buf2[512];
+    char *ptr, *pptr, *rptr;
+    int count;
+
+    if (buf[0]!='-') {
+        /* // remove warning later. or maybe not */
+        wwarning(_("Invalid font specification: '%s'\n"), buf);
+        return;
+    }
+
+    ptr = pptr = rptr = buf;
+    count = 0;
+    while (*ptr && *ptr!=',') {
+        if (*ptr == '-') {
+            count++;
+            if (count-1==position+1) {
+                rptr = ptr;
+                break;
+            }
+            if (count-1==position) {
+                pptr = ptr+1;
+            }
+        }
+        ptr++;
+    }
+    if (position==FONT_PROPS-1) {
+        rptr = ptr;
+    }
+
+    *pptr = 0;
+    snprintf(buf2, 512, "%s%s%s", buf, newprop, rptr);
+    strcpy(buf, buf2);
+}
+
+
+static WMArray*
+getOptions(char *options)
+{
+    char *ptr, *ptr2, *str;
+    WMArray *result;
+    int count;
+
+    result = WMCreateArrayWithDestructor(2, (WMFreeDataProc*)wfree);
+
+    ptr = options;
+    while (1) {
+        ptr2 = strchr(ptr, ',');
+        if (!ptr2) {
+            WMAddToArray(result, wstrdup(ptr));
+            break;
+        } else {
+            count = ptr2 - ptr;
+            str = wmalloc(count+1);
+            memcpy(str, ptr, count);
+            str[count] = 0;
+            WMAddToArray(result, str);
+            ptr = ptr2 + 1;
+        }
+    }
+
+    return result;
+}
+
+
+#define WFAUnchanged (NULL)
+/* Struct for font change operations */
+typedef struct WMFontAttributes {
+    char *foundry;
+    char *family;
+    char *weight;
+    char *slant;
+    char *setWidth;
+    char *addStyle;
+    char *pixelSize;
+    char *pointSize;
+    char *resolutionX;
+    char *resolutionY;
+    char *spacing;
+    char *averageWidth;
+    char *registry;
+    char *encoding;
+} WMFontAttributes;
+
+WMFont*
+WMCopyFontWithChanges(WMScreen *scrPtr, WMFont *font,
+                      const WMFontAttributes *changes)
+{
+    int index[FONT_PROPS], count[FONT_PROPS];
+    int totalProps, i, j, carry;
+    char fname[512];
+    WMFontFlags fFlags;
+    WMBag *props;
+    WMArray *options;
+    WMFont *result;
+    char *prop;
+
+    snprintf(fname, 512, "%s", font->name);
+
+    fFlags = (font->antialiased ? WFAntialiased : WFNotAntialiased);
+    fFlags |= (font->notFontSet ? WFNormalFont : WFFontSet);
+
+    props = WMCreateBagWithDestructor(1, (WMFreeDataProc*)WMFreeArray);
+
+    totalProps = 0;
+    for (i=0; i<FONT_PROPS; i++) {
+        prop = ((W_FontAttributes*)changes)->props[i];
+        count[i] = index[i] = 0;
+        if (!prop) {
+            /* No change for this property */
+            continue;
+        } else if (strchr(prop, ',')==NULL) {
+            /* Simple option */
+            changeFontProp(fname, prop, i);
+        } else {
+            /* Option with fallback alternatives */
+            if ((changes==WFAEmphasized || changes==WFABoldEmphasized) &&
+                font->antialiased && strcmp(prop, "o,i")==0) {
+                options = getOptions("i,o");
+            } else {
+                options = getOptions(prop);
+            }
+            WMInsertInBag(props, i, options);
+            count[i] = WMGetArrayItemCount(options);
+            if (totalProps==0)
+                totalProps = 1;
+            totalProps = totalProps * count[i];
+        }
+    }
+
+    if (totalProps == 0) {
+        /* No options with fallback alternatives at all */
+        WMFreeBag(props);
+        return WMCreateFontWithFlags(scrPtr, fname, fFlags);
+    }
+
+    for (i=0; i<totalProps; i++) {
+        for (j=0; j<FONT_PROPS; j++) {
+            if (count[j]!=0) {
+                options = WMGetFromBag(props, j);
+                prop = WMGetFromArray(options, index[j]);
+                if (prop) {
+                    changeFontProp(fname, prop, j);
+                }
+            }
+        }
+        result = WMCreateFontWithFlags(scrPtr, fname, fFlags);
+        if (result) {
+            WMFreeBag(props);
+            return result;
+        }
+        for (j=FONT_PROPS-1, carry=1; j>=0; j--) {
+            if (count[j]!=0) {
+                index[j] += carry;
+                carry = (index[j]==count[j]);
+                index[j] %= count[j];
+            }
+        }
+    }
+
+    WMFreeBag(props);
+
+    return NULL;
+}
+
+// should WFANormal also set "normal" or leave it alone?
+static const WMFontAttributes W_FANormal = {
+    WFAUnchanged, WFAUnchanged, "medium,normal,regular", "r", "normal",
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
+};
+
+
+static const WMFontAttributes W_FABold = {
+    WFAUnchanged, WFAUnchanged, "bold", WFAUnchanged,
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
+};
+
+
+static const WMFontAttributes W_FANotBold = {
+    WFAUnchanged, WFAUnchanged, "medium,normal,regular", WFAUnchanged,
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
+};
+
+
+static const WMFontAttributes W_FAEmphasized = {
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, "o,i",
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
+};
+
+
+static const WMFontAttributes W_FANotEmphasized = {
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, "r",
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
+};
+
+
+static const WMFontAttributes W_FABoldEmphasized = {
+    WFAUnchanged, WFAUnchanged, "bold", "o,i",
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
+    WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
+};
+
+
+const WMFontAttributes *WFANormal         = &W_FANormal;
+const WMFontAttributes *WFABold           = &W_FABold;
+const WMFontAttributes *WFANotBold        = &W_FANotBold;
+const WMFontAttributes *WFAEmphasized     = &W_FAEmphasized;
+const WMFontAttributes *WFANotEmphasized  = &W_FANotEmphasized;
+const WMFontAttributes *WFABoldEmphasized = &W_FABoldEmphasized;
+
+
+#endif
+

WINGs/widgets.c

@@ -12,6 +12,8 @@
 #include <X11/keysym.h>
 #include <X11/cursorfont.h>
 
+#include <X11/Xlocale.h>
+
 /********** data ************/
 
 
@@ -591,6 +593,7 @@ WMCreateScreenWithRContext(Display *display, int screen, RContext *context)
         "WM_STATE"
     };
     Atom atoms[sizeof(atomNames)/sizeof(char*)];
+    char *locale;
     int i;
 
     if (!initialized) {
@@ -756,16 +759,20 @@ WMCreateScreenWithRContext(Display *display, int screen, RContext *context)
     scrPtr->stipple = stipple;
 
     scrPtr->useMultiByte = WINGsConfiguration.useMultiByte;
+    scrPtr->useMultiByte = 0;
 
-    scrPtr->useWideChar = 1;
+    locale = setlocale(LC_CTYPE, NULL);
+    //printf("LC_CTYPE=%s\n", locale);
+    if (!locale || strcmp(locale, "C")==0 || strcmp(locale, "POSIX")==0)
+        scrPtr->useWideChar = 0;
+    else
+        scrPtr->useWideChar = 1;
 
     scrPtr->antialiasedText = WINGsConfiguration.antialiasedText;
 
-    scrPtr->normalFont = WMSystemFontOfSize(scrPtr,
-                                            WINGsConfiguration.defaultFontSize);
+    scrPtr->normalFont = WMSystemFontOfSize(scrPtr, 0);
 
-    scrPtr->boldFont = WMBoldSystemFontOfSize(scrPtr,
-                                              WINGsConfiguration.defaultFontSize);
+    scrPtr->boldFont = WMBoldSystemFontOfSize(scrPtr, 0);
 
     if (!scrPtr->boldFont)
         scrPtr->boldFont = scrPtr->normalFont;

WINGs/winputmethod.c

@@ -22,7 +22,8 @@ typedef struct W_ICContext {
 
 
 
-Bool W_InitIMStuff(WMScreen *scr)
+Bool
+W_InitIMStuff(WMScreen *scr)
 {
     WMIMContext *ctx;
     
@@ -38,7 +39,8 @@ Bool W_InitIMStuff(WMScreen *scr)
 }
 
 
-void W_CloseIMStuff(WMScreen *scr)
+void
+W_CloseIMStuff(WMScreen *scr)
 {
     if (!scr->imctx) 
 	return;
@@ -51,7 +53,8 @@ void W_CloseIMStuff(WMScreen *scr)
 
 
 
-WMICContext *W_CreateIC(WMView *view)
+WMICContext*
+W_CreateIC(WMView *view)
 {
     WMScreen *scr = W_VIEW_SCREEN(view);
     WMICContext *ctx;
@@ -60,11 +63,12 @@ WMICContext *W_CreateIC(WMView *view)
     ctx->next = scr->imctx->icList;
     if (scr->imctx->icList)
 	scr->imctx->icList->prev = ctx;
-    scr->imctx = ctx;
+    //scr->imctx = ctx;
 }
 
 
-void W_DestroyIC(WMICContext *ctx)
+void
+W_DestroyIC(WMICContext *ctx)
 {
     XDestroyIC(ctx->xic);
     
@@ -72,8 +76,9 @@ void W_DestroyIC(WMICContext *ctx)
 }
 
 
-int W_LookupString(WMView *view, XKeyEvent *event,
-		   char buffer, int bufsize, KeySym ksym)
+int
+W_LookupString(WMView *view, XKeyEvent *event,
+               char buffer, int bufsize, KeySym ksym)
 {
     
 }

WINGs/wmisc.c

@@ -120,6 +120,7 @@ fitText(char *text, WMFont *font, int width, int wrap)
 		i = j;
 	}
     } else {
+        //i = strcspn(text, "\n\r");
 	while (text[i]!='\n' && text[i]!=0)
 	    i++;
     }

WINGs/wscroller.c

@@ -306,10 +306,9 @@ paintArrow(WMScroller *sPtr, Drawable d, int part)
 	    gc = scr->whiteGC;
 #endif
     }
-    
-	
+
+
     if (sPtr->flags.horizontal) {
-	    
 	/* paint button */
 #ifndef DOUBLE_BUFFER
 	XFillRectangle(scr->display, d, gc,
@@ -326,7 +325,7 @@ paintArrow(WMScroller *sPtr, Drawable d, int part)
 	XSetClipOrigin(scr->display, scr->clipGC,
 		       ofs + (BUTTON_SIZE - arrow->width) / 2, 
 		       2 + (BUTTON_SIZE - arrow->height) / 2);
-	
+
 	XCopyArea(scr->display, arrow->pixmap, d, scr->clipGC,
 		  0, 0, arrow->width, arrow->height,
 		  ofs + (BUTTON_SIZE - arrow->width) / 2,