various table widget updates

and fixed in misc other ones
2026-01-06 13:54:12 +01:00 · 2001-01-02 14:17:26 +00:00
parent e3577222a7
commit e99511b08c
20 changed files with 988 additions and 245 deletions
--- a/WINGs/Extras/tabledelegates.c
+++ b/WINGs/Extras/tabledelegates.c
@@ -14,6 +14,13 @@ typedef struct {
 } StringData;


+typedef struct {
+    WMTableView *table;
+    GC selGc;
+} PixmapData;
+
+
+
 typedef struct {
    WMTextField *widget;
    WMTableView *table;
@@ -36,6 +43,17 @@ typedef struct {
 } EnumSelectorData;


+typedef struct {
+    WMButton *widget;
+    WMTableView *table;
+    Bool state;
+    GC gc;
+} BooleanSwitchData;
+
+
+static char *SelectionColor = "#bbbbcc";
+
+

 static void stringDraw(WMScreen *scr, Drawable d, GC gc,
 		       GC sgc, GC stgc, WMFont *font, void *data,
@@ -73,6 +91,49 @@ static void stringDraw(WMScreen *scr, Drawable d, GC gc,



+static void pixmapDraw(WMScreen *scr, Drawable d, GC gc,
+		       WMPixmap *pixmap, WMRect rect, Bool selected)
+{
+    int x, y;
+    XRectangle rects[1];
+    Display *dpy = WMScreenDisplay(scr);
+    WMSize size;
+
+    rects[0].x = rect.pos.x+1;
+    rects[0].y = rect.pos.y+1;
+    rects[0].width = rect.size.width-1;
+    rects[0].height = rect.size.height-1;
+    XSetClipRectangles(dpy, gc, 0, 0, rects, 1, YXSorted);
+    
+    if (!selected) {
+	XClearArea(dpy, d, rects[0].x, rects[0].y, 
+		   rects[0].width, rects[0].height,
+		   False);
+    
+	if (pixmap) {
+	    size = WMGetPixmapSize(pixmap);
+	    x = rect.pos.x + (rect.size.width - size.width) / 2;
+	    y = rect.pos.y + (rect.size.height - size.height) / 2;
+	    
+	    WMDrawPixmap(pixmap, d, x, y);
+	}
+    } else {
+	XFillRectangles(dpy, d, gc, rects, 1);
+    
+	if (pixmap) {
+	    size = WMGetPixmapSize(pixmap);	    
+	    x = rect.pos.x + (rect.size.width - size.width) / 2;
+	    y = rect.pos.y + (rect.size.height - size.height) / 2;
+	    
+	    WMDrawPixmap(pixmap, d, x, y);
+	}
+    }
+    
+    XSetClipMask(dpy, gc, None);
+}
+
+
+/* ---------------------------------------------------------------------- */



@@ -124,9 +185,10 @@ static void beginSECellEdit(WMTableColumnDelegate *self,
 static void endSECellEdit(WMTableColumnDelegate *self,
 			WMTableColumn *column, int row)
 {
-    StringEditorData *strdata = (StringEditorData*)self->data;    
-    WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
+    StringEditorData *strdata = (StringEditorData*)self->data;
    char *text;
+
+    WMUnmapWidget(strdata->widget);
    
    text = WMGetTextFieldText(strdata->widget);
    WMSetTableViewDataForCell(strdata->table, column, row, (void*)text);
@@ -145,8 +207,8 @@ WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView *parent)
 		   0, 0);
    data->table = parent;
    data->font = WMSystemFontOfSize(scr, 12);
-    data->selGc = WMColorGC(WMDarkGrayColor(scr));
-    data->selTextGc = WMColorGC(WMWhiteColor(scr));
+    data->selGc = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
+    data->selTextGc = WMColorGC(WMBlackColor(scr));
    data->gc = WMColorGC(WMBlackColor(scr));
    
    delegate->data = data;
@@ -168,7 +230,7 @@ static void ESCellPainter(WMTableColumnDelegate *self,
 {
    EnumSelectorData *strdata = (EnumSelectorData*)self->data;
    WMTableView *table = WMGetTableColumnTableView(column);
-    int i = WMTableViewDataForCell(table, column, row);
+    int i = (int)WMTableViewDataForCell(table, column, row);
    
    stringDraw(WMWidgetScreen(table), 
 	       WMViewXID(WMGetTableViewDocumentView(table)),
@@ -184,7 +246,7 @@ static void selectedESCellPainter(WMTableColumnDelegate *self,
 {
    EnumSelectorData *strdata = (EnumSelectorData*)self->data;
    WMTableView *table = WMGetTableColumnTableView(column);
-    int i = WMTableViewDataForCell(table, column, row);
+    int i = (int)WMTableViewDataForCell(table, column, row);
    
    stringDraw(WMWidgetScreen(table), 
 	       WMViewXID(WMGetTableViewDocumentView(table)),
@@ -206,8 +268,8 @@ static void beginESCellEdit(WMTableColumnDelegate *self,
    
    WMSetPopUpButtonSelectedItem(strdata->widget, data);
    
-    WMMoveWidget(strdata->widget, rect.pos.x, rect.pos.y-1);
-    WMResizeWidget(strdata->widget, rect.size.width, rect.size.height+2);
+    WMMoveWidget(strdata->widget, rect.pos.x, rect.pos.y);
+    WMResizeWidget(strdata->widget, rect.size.width, rect.size.height+1);

    WMMapWidget(strdata->widget);
 }
@@ -216,9 +278,10 @@ static void beginESCellEdit(WMTableColumnDelegate *self,
 static void endESCellEdit(WMTableColumnDelegate *self,
 			WMTableColumn *column, int row)
 {
-    EnumSelectorData *strdata = (EnumSelectorData*)self->data;    
-    WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
+    EnumSelectorData *strdata = (EnumSelectorData*)self->data;
    int option;
+
+    WMUnmapWidget(strdata->widget);
    
    option = WMGetPopUpButtonSelectedItem(strdata->widget);
    WMSetTableViewDataForCell(strdata->table, column, row, (void*)option);
@@ -237,8 +300,8 @@ WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView *parent)
 		   0, 0);
    data->table = parent;
    data->font = WMSystemFontOfSize(scr, 12);
-    data->selGc = WMColorGC(WMDarkGrayColor(scr));
-    data->selTextGc = WMColorGC(WMWhiteColor(scr));
+    data->selGc = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
+    data->selTextGc = WMColorGC(WMBlackColor(scr));
    data->gc = WMColorGC(WMBlackColor(scr));
    data->count = 0;
    data->options = NULL;
@@ -274,6 +337,108 @@ void WTSetEnumSelectorOptions(WMTableColumnDelegate *delegate,
 }


+
+/* ---------------------------------------------------------------------- */
+
+static void BSCellPainter(WMTableColumnDelegate *self,
+			WMTableColumn *column, int row)
+{
+    BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
+    WMTableView *table = WMGetTableColumnTableView(column);
+    int i = (int)WMTableViewDataForCell(table, column, row);
+    WMScreen *scr = WMWidgetScreen(table);
+    
+    if (i) {
+	pixmapDraw(scr, WMViewXID(WMGetTableViewDocumentView(table)),
+		   strdata->gc, WMGetSystemPixmap(scr, WSICheckMark),
+		   WMTableViewRectForCell(table, column, row), False);
+    } else {
+	pixmapDraw(scr, WMViewXID(WMGetTableViewDocumentView(table)),
+		   strdata->gc, NULL,
+		   WMTableViewRectForCell(table, column, row), False);
+    }
+}
+
+
+static void selectedBSCellPainter(WMTableColumnDelegate *self,
+				WMTableColumn *column, int row)
+{
+    BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
+    WMTableView *table = WMGetTableColumnTableView(column);
+    int i = (int)WMTableViewDataForCell(table, column, row);
+    WMScreen *scr = WMWidgetScreen(table);
+    
+    if (i) {
+	pixmapDraw(scr, WMViewXID(WMGetTableViewDocumentView(table)),
+		   strdata->gc, WMGetSystemPixmap(scr, WSICheckMark),
+		   WMTableViewRectForCell(table, column, row), True);
+    } else {
+	pixmapDraw(scr, WMViewXID(WMGetTableViewDocumentView(table)),
+		   strdata->gc, NULL,
+		   WMTableViewRectForCell(table, column, row), True);
+    }    
+}
+
+
+
+static void beginBSCellEdit(WMTableColumnDelegate *self,
+			  WMTableColumn *column, int row)
+{
+    BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;    
+    WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
+    int data = (int)WMTableViewDataForCell(strdata->table, column, row);
+
+    WMSetButtonSelected(strdata->widget, data);
+    WMMoveWidget(strdata->widget, rect.pos.x+1, rect.pos.y+1);
+    WMResizeWidget(strdata->widget, rect.size.width-1, rect.size.height-1);
+
+    WMMapWidget(strdata->widget);
+}
+
+
+static void endBSCellEdit(WMTableColumnDelegate *self,
+			  WMTableColumn *column, int row)
+{
+    BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;    
+    int value;
+    
+    value = WMGetButtonSelected(strdata->widget);
+    WMSetTableViewDataForCell(strdata->table, column, row, (void*)value);
+    WMUnmapWidget(strdata->widget);
+}
+
+
+WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView *parent)
+{
+    WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
+    WMScreen *scr = WMWidgetScreen(parent);
+    BooleanSwitchData *data = wmalloc(sizeof(BooleanSwitchData));
+    WMColor *color;
+
+    data->widget = WMCreateSwitchButton(parent);
+    W_ReparentView(WMWidgetView(data->widget), 
+		   WMGetTableViewDocumentView(parent), 
+		   0, 0);
+    WMSetButtonText(data->widget, NULL);
+    WMSetButtonImagePosition(data->widget, WIPImageOnly);
+    WMSetButtonImage(data->widget, NULL);
+    WMSetButtonAltImage(data->widget, WMGetSystemPixmap(scr, WSICheckMark));
+	
+    data->table = parent;
+    color = WMCreateNamedColor(scr, SelectionColor, False);
+    WMSetWidgetBackgroundColor(data->widget, color);    
+    data->gc = WMColorGC(color);
+    
+    delegate->data = data;
+    delegate->drawCell = BSCellPainter;
+    delegate->drawSelectedCell = selectedBSCellPainter;
+    delegate->beginCellEdit = beginBSCellEdit;
+    delegate->endCellEdit = endBSCellEdit;
+
+    return delegate;
+}
+
+
 /* ---------------------------------------------------------------------- */


@@ -315,8 +480,8 @@ WMTableColumnDelegate *WTCreateStringDelegate(WMTableView *parent)
    
    data->table = parent;
    data->font = WMSystemFontOfSize(scr, 12);
-    data->selGc = WMColorGC(WMDarkGrayColor(scr));
-    data->selTextGc = WMColorGC(WMWhiteColor(scr));
+    data->selGc = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
+    data->selTextGc = WMColorGC(WMBlackColor(scr));
    data->gc = WMColorGC(WMBlackColor(scr));
    
    delegate->data = data;
@@ -327,3 +492,134 @@ WMTableColumnDelegate *WTCreateStringDelegate(WMTableView *parent)

    return delegate;
 }
+
+
+/* ---------------------------------------------------------------------- */
+
+
+static void PCellPainter(WMTableColumnDelegate *self,
+			WMTableColumn *column, int row)
+{
+    StringData *strdata = (StringData*)self->data;
+    WMTableView *table = WMGetTableColumnTableView(column);
+    
+    pixmapDraw(WMWidgetScreen(table), 
+	       WMViewXID(WMGetTableViewDocumentView(table)),
+	       strdata->selGc,
+	       (WMPixmap*)WMTableViewDataForCell(table, column, row),
+	       WMTableViewRectForCell(table, column, row),
+	       False);
+}
+
+
+static void selectedPCellPainter(WMTableColumnDelegate *self,
+				WMTableColumn *column, int row)
+{
+    StringData *strdata = (StringData*)self->data;
+    WMTableView *table = WMGetTableColumnTableView(column);
+    
+    pixmapDraw(WMWidgetScreen(table), 
+	       WMViewXID(WMGetTableViewDocumentView(table)),
+	       strdata->selGc,
+	       (WMPixmap*)WMTableViewDataForCell(table, column, row),
+	       WMTableViewRectForCell(table, column, row),
+	       True);
+}
+
+
+WMTableColumnDelegate *WTCreatePixmapDelegate(WMTableView *table)
+{
+    WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
+    WMScreen *scr = WMWidgetScreen(table);
+    StringData *data = wmalloc(sizeof(StringData));
+    
+    data->table = table;
+    data->selGc = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
+    
+    delegate->data = data;
+    delegate->drawCell = PCellPainter;
+    delegate->drawSelectedCell = selectedPCellPainter;
+    delegate->beginCellEdit = NULL;
+    delegate->endCellEdit = NULL;
+
+    return delegate;
+}
+
+
+/* ---------------------------------------------------------------------- */
+
+
+static void drawPSCell(WMTableColumnDelegate *self,
+		       WMTableColumn *column, int row, Bool selected)
+{
+    StringData *strdata = (StringData*)self->data;
+    WMTableView *table = WMGetTableColumnTableView(column);
+    void **data;
+    WMPixmap *pix;
+    char *str;
+    WMRect rect;
+    WMSize size;
+
+    data = WMTableViewDataForCell(table, column, row);
+
+    str = (char*)data[0];    
+    pix = (WMPixmap*)data[1];
+
+    rect = WMTableViewRectForCell(table, column, row);
+    
+    if (pix) {
+	int owidth = rect.size.width;
+	
+	size = WMGetPixmapSize(pix);
+	rect.size.width = size.width;
+	
+	pixmapDraw(WMWidgetScreen(table),
+		   WMViewXID(WMGetTableViewDocumentView(table)),
+		   strdata->selGc, pix, rect, 
+		   selected);
+    
+	rect.pos.x += size.width-1;
+	rect.size.width = owidth-size.width+1;
+    }
+    
+    stringDraw(WMWidgetScreen(table), 
+	       WMViewXID(WMGetTableViewDocumentView(table)),
+	       strdata->gc, strdata->selGc, strdata->selTextGc, strdata->font,
+	       str, rect, selected);    
+}
+
+
+static void PSCellPainter(WMTableColumnDelegate *self,
+			  WMTableColumn *column, int row)
+{
+    drawPSCell(self, column, row, False);
+}
+
+
+static void selectedPSCellPainter(WMTableColumnDelegate *self,
+				  WMTableColumn *column, int row)
+{
+    drawPSCell(self, column, row, True);
+}
+
+
+WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView *parent)
+{
+    WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
+    WMScreen *scr = WMWidgetScreen(parent);
+    StringData *data = wmalloc(sizeof(StringData));
+    
+    data->table = parent;
+    data->font = WMSystemFontOfSize(scr, 12);
+    data->selGc = WMColorGC(WMCreateNamedColor(scr, SelectionColor, False));
+    data->selTextGc = WMColorGC(WMBlackColor(scr));
+    data->gc = WMColorGC(WMBlackColor(scr));
+    
+    delegate->data = data;
+    delegate->drawCell = PSCellPainter;
+    delegate->drawSelectedCell = selectedPSCellPainter;
+    delegate->beginCellEdit = NULL;
+    delegate->endCellEdit = NULL;
+
+    return delegate;
+}