dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1419:8827e9b14b40

Initial support for automatic window redrawing on Mac. Added support for automatic sizes for ranged widgets and image buttons.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 02 Dec 2011 23:50:01 +0000
parents	461240f946d0
children	fabf23bdc7fb

comparison

equal deleted inserted replaced

-:461240f946d0
+:8827e9b14b40
 /* Some internal prototypes */
 static void _do_resize(Box *thisbox, int x, int y);
 void _handle_resize_events(Box *thisbox);
 int _remove_userdata(UserData **root, char *varname, int all);
 int _dw_main_iteration(NSDate *date);
+/* Internal function to queue a window redraw */
+void _dw_redraw(id window)
+{
+static id lastwindow = nil;
+if(lastwindow != window && lastwindow != nil)
+{
+dw_window_redraw(lastwindow);
+}
+lastwindow = window;
+}
 SignalHandler *_get_handler(HWND window, int messageid)
 {
 SignalHandler *tmp = Root;
 { 15,   DW_SIGNAL_SWITCH_PAGE },
 { 16,   DW_SIGNAL_TREE_EXPAND },
 { 17,   DW_SIGNAL_COLUMN_CLICK }
 };
-int _event_handler(id object, NSEvent *event, int message)
+int _event_handler1(id object, NSEvent *event, int message)
 {
 SignalHandler *handler = _get_handler(object, message);
 /* NSLog(@"Event handler - type %d\n", message); */
 if(handler)
 return clickcolumnfunc(handler->window, column_num, handler->data);
 }
 }
 }
 return -1;
+}
+/* Sub function to handle redraws */
+int _event_handler(id object, NSEvent *event, int message)
+{
+int ret = _event_handler1(object, event, message);
+_dw_redraw(nil);
+return ret;
 }
 /* Subclass for the Timer type */
 @interface DWTimerHandler : NSObject { }
 -(void)runTimer:(id)sender;
 @interface DWScrollbar : NSScroller
 {
 void *userdata;
 double range;
 double visible;
+int vertical;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(float)range;
 -(float)visible;
+-(int)vertical;
+-(void)setVertical:(int)value;
 -(void)setRange:(double)input1 andVisible:(double)input2;
 -(void)scrollerChanged:(id)sender;
 @end
 @implementation DWScrollbar
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(float)range { return range; }
 -(float)visible { return visible; }
+-(int)vertical { return vertical; }
+-(void)setVertical:(int)value { vertical = value; }
 -(void)setRange:(double)input1 andVisible:(double)input2 { range = input1; visible = input2; }
 -(void)scrollerChanged:(id)sender
 {
 double max = (range - visible);
 double result = ([self doubleValue] * max);
 if([object isMemberOfClass:[ DWSpinButton class]])
 object = [object textfield];
 /* Handle all the different button types */
 if([ object isKindOfClass:[ NSButton class ] ])
 {
-nsstr = [object title];
+NSImage *image = [object image];
-switch([object buttonType])
+if(image)
 {
-case NSSwitchButton:
+/* Image button */
-case NSRadioButton:
+NSSize size = [image size];
-extrawidth = 24;
+thiswidth = (int)size.width;
-extraheight = 4;
+thisheight = (int)size.height;
-break;
+}
-default:
+else
-if([object isBordered])
+{
-{
+/* Text button */
-extrawidth = 30;
+nsstr = [object title];
-extraheight = 8;
-}
+switch([object buttonType])
-else
+{
-{
+case NSSwitchButton:
-extrawidth = 8;
+case NSRadioButton:
+extrawidth = 24;
 extraheight = 4;
-}
+break;
-break;
+default:
+if([object isBordered])
+{
+extrawidth = 30;
+extraheight = 8;
+}
+else
+{
+extrawidth = 8;
+extraheight = 4;
+}
+break;
+}
 }
 }
 /* If the control is an entryfield set width to 150 */
 else if([object isKindOfClass:[ NSTextField class ]] && [object isEditable])
 {
 thisheight = (int)[font boundingRectForFont].size.height;
 /* Spinbuttons don't need to be as wide */
 if([object isMemberOfClass:[ DWComboBox class]])
 extraheight = 4;
 }
+/* Handle the ranged widgets */
+else if([ object isMemberOfClass:[DWScrollbar class] ] ||
+[ object isMemberOfClass:[DWPercent class] ] ||
+[ object isMemberOfClass:[DWSlider class] ])
+{
+if([ object isMemberOfClass:[DWScrollbar class] ] && [object vertical])
+{
+thiswidth = 14;
+thisheight = 100;
+}
+else
+{
+thiswidth = 100;
+thisheight = 14;
+}
+}
 else if([ object isKindOfClass:[ NSControl class ] ])
 nsstr = [object stringValue];
 /* Handle static text fields */
 if([object isKindOfClass:[ NSTextField class ]] && ![object isEditable])
 /* Save the parent box so radio
 * buttons can use it later.
 */
 [button setParent:view];
 }
+/* Queue a redraw on the top-level window */
+_dw_redraw([object window]);
 /* Free the old data */
 if(thisbox->count)
 free(thisitem);
 DW_MUTEX_UNLOCK;
 {
 DWScrollbar *scrollbar;
 if(vertical)
 {
 scrollbar = [[DWScrollbar alloc] init];
+[scrollbar setVertical:YES];
 }
 else
 {
 scrollbar = [[DWScrollbar alloc] initWithFrame:NSMakeRect(0,0,100,5)];
 }
 Item *item = _box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 _control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+/* Queue a redraw on the top-level window */
+_dw_redraw([object window]);
 return DW_ERROR_NONE;
 }
 return DW_ERROR_UNKNOWN;
 }
 Item *item = _box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 _control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+/* Queue a redraw on the top-level window */
+_dw_redraw([object window]);
 }
 /*
 * Sets the text used for a given window's floating bubble help.
 * Parameters:

Mercurial > dwindows

comparison mac/dw.m @ 1419:8827e9b14b40