dwindows: mac/dw.m annotate

annotate mac/dw.m @ 909:c092eab43ae3

Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. This is closer to the core backing store used to display images. Using this I was able to avoid using lockFocus on the images and instead set the graphics context manually allowing us to draw directly on the backing image. However NSBitmapImageRef is a more simple format and didn't work with the flipped Y axis... so... I had to perform some voodoo to get the flipping to work with the graphics context. Not sure it is 100% right.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 20 Apr 2011 14:09:00 +0000
parents	5596e3830ae3
children	329f2ca62f1b

rev	line source
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2 * Dynamic Windows:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3 * A GTK like implementation of the MacOS GUI using Cocoa
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4 *
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5 * (C) 2011 Brian Smith <brian@dbsoft.org>
721 56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	6 * (C) 2011 Mark Hessling <mark@rexx.org>
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7 *
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8 * Using garbage collection so requires 10.5 or later.
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	9 * clang -std=c99 -g -o dwtest -D__MAC__ -I. dwtest.c mac/dw.m -framework Cocoa -framework WebKit -fobjc-gc-only
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11 #import <Cocoa/Cocoa.h>
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	12 #import <WebKit/WebKit.h>
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	13 #include "dw.h"
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	14 #include <sys/utsname.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	15 #include <sys/socket.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	16 #include <sys/un.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	17 #include <sys/mman.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	18 #include <sys/time.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	19 #include <sys/stat.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	20
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	21 /* Create a define to let us know to include Snow Leopard specific features */
d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	22 #if defined(MAC_OS_X_VERSION_10_6) && ((defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) \|\| !defined(MAC_OS_X_VERSION_MIN_REQUIRED))
d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	23 #define BUILDING_FOR_SNOW_LEOPARD
d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	24 #endif
d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	25
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	26 /* Macros to protect access to thread unsafe classes */
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	27 #define DW_MUTEX_LOCK { \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	28 if(DWThread != (DWTID)-1 && pthread_self() != DWThread && pthread_self() != _dw_mutex_locked) { \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	29 dw_mutex_lock(DWThreadMutex); \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	30 _dw_mutex_locked = pthread_self(); \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	31 dw_mutex_lock(DWThreadMutex2); \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	32 [DWObj performSelectorOnMainThread:@selector(synchronizeThread:) withObject:nil waitUntilDone:NO]; \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	33 dw_mutex_lock(DWRunMutex); \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	34 _locked_by_me = TRUE; } }
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	35 #define DW_MUTEX_UNLOCK { \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	36 if(pthread_self() != DWThread && _locked_by_me == TRUE) { \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	37 dw_mutex_unlock(DWRunMutex); \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	38 dw_mutex_unlock(DWThreadMutex2); \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	39 _dw_mutex_locked = (pthread_t)-1; \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	40 dw_mutex_unlock(DWThreadMutex); \
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	41 _locked_by_me = FALSE; } }
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	42
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	43 unsigned long _colors[] =
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	44 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	45 0x00000000, /* 0 black */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	46 0x000000bb, /* 1 red */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	47 0x0000bb00, /* 2 green */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	48 0x0000aaaa, /* 3 yellow */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	49 0x00cc0000, /* 4 blue */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	50 0x00bb00bb, /* 5 magenta */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	51 0x00bbbb00, /* 6 cyan */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	52 0x00bbbbbb, /* 7 white */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	53 0x00777777, /* 8 grey */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	54 0x000000ff, /* 9 bright red */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	55 0x0000ff00, /* 10 bright green */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	56 0x0000eeee, /* 11 bright yellow */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	57 0x00ff0000, /* 12 bright blue */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	58 0x00ff00ff, /* 13 bright magenta */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	59 0x00eeee00, /* 14 bright cyan */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	60 0x00ffffff, /* 15 bright white */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	61 0xff000000 /* 16 default color */
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	62 };
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	63
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	64 unsigned long _get_color(unsigned long thiscolor)
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	65 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	66 if(thiscolor & DW_RGB_COLOR)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	67 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	68 return thiscolor & ~DW_RGB_COLOR;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	69 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	70 else if(thiscolor < 17)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	71 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	72 return _colors[thiscolor];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	73 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	74 return 0;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	75 }
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	76
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	77 /* Thread specific storage */
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	78 #if !defined(GARBAGE_COLLECT)
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	79 pthread_key_t _dw_pool_key;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	80 #endif
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	81 pthread_key_t _dw_fg_color_key;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	82 pthread_key_t _dw_bg_color_key;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	83
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	84 /* Create a default colors for a thread */
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	85 void _init_colors(void)
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	86 {
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	87 NSColor *fgcolor = [[NSColor grayColor] retain];
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	88
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	89 pthread_setspecific(_dw_fg_color_key, fgcolor);
891 3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	90 pthread_setspecific(_dw_bg_color_key, NULL);
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	91 }
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	92
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	93 typedef struct _sighandler
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	94 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	95 struct _sighandler *next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	96 ULONG message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	97 HWND window;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	98 int id;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	99 void *signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	100 void *data;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	101
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	102 } SignalHandler;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	103
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	104 SignalHandler *Root = NULL;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	105
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	106 /* Some internal prototypes */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	107 static void _do_resize(Box *thisbox, int x, int y);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	108 int _remove_userdata(UserData *root, char varname, int all);
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	109 int _dw_main_iteration(NSDate *date);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	110
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	111 SignalHandler *_get_handler(HWND window, int messageid)
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	112 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	113 SignalHandler *tmp = Root;
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	114
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	115 /* Find any callbacks for this function */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	116 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	117 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	118 if(tmp->message == messageid && window == tmp->window)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	119 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	120 return tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	121 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	122 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	123 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	124 return NULL;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	125 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	126
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	127 typedef struct
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	128 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	129 ULONG message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	130 char name[30];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	131
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	132 } SignalList;
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	133
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	134 /* List of signals */
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	135 #define SIGNALMAX 17
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	136
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	137 SignalList SignalTranslate[SIGNALMAX] = {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	138 { 1, DW_SIGNAL_CONFIGURE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	139 { 2, DW_SIGNAL_KEY_PRESS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	140 { 3, DW_SIGNAL_BUTTON_PRESS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	141 { 4, DW_SIGNAL_BUTTON_RELEASE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	142 { 5, DW_SIGNAL_MOTION_NOTIFY },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	143 { 6, DW_SIGNAL_DELETE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	144 { 7, DW_SIGNAL_EXPOSE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	145 { 8, DW_SIGNAL_CLICKED },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	146 { 9, DW_SIGNAL_ITEM_ENTER },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	147 { 10, DW_SIGNAL_ITEM_CONTEXT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	148 { 11, DW_SIGNAL_LIST_SELECT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	149 { 12, DW_SIGNAL_ITEM_SELECT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	150 { 13, DW_SIGNAL_SET_FOCUS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	151 { 14, DW_SIGNAL_VALUE_CHANGED },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	152 { 15, DW_SIGNAL_SWITCH_PAGE },
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	153 { 16, DW_SIGNAL_TREE_EXPAND },
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	154 { 17, DW_SIGNAL_COLUMN_CLICK }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	155 };
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	156
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	157 int _event_handler(id object, NSEvent *event, int message)
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	158 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	159 SignalHandler *handler = _get_handler(object, message);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	160 /* NSLog(@"Event handler - type %d\n", message); */
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	161
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	162 if(handler)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	163 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	164 switch(message)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	165 {
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	166 /* Timer event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	167 case 0:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	168 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	169 int (* API timerfunc)(void ) = (int ( API)(void *))handler->signalfunction;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	170
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	171 if(!timerfunc(handler->data))
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	172 dw_timer_disconnect(handler->id);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	173 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	174 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	175 /* Configure/Resize event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	176 case 1:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	177 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	178 int (sizefunc)(HWND, int, int, void ) = handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	179 NSSize size;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	180
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	181 if([object isKindOfClass:[NSWindow class]])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	182 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	183 NSWindow *window = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	184 size = [[window contentView] frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	185 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	186 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	187 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	188 NSView *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	189 size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	190 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	191
706 79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	192 if(size.width > 0 && size.height > 0)
79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	193 {
79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	194 return sizefunc(object, size.width, size.height, handler->data);
79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	195 }
79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	196 return 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	197 }
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	198 case 2:
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	199 {
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	200 int (keypressfunc)(HWND, char, int, int, void ) = handler->signalfunction;
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	201 NSString *nchar = [event charactersIgnoringModifiers];
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	202 int special = (int)[event modifierFlags];
724 41080d22edc8 Couple more fixes to keyhandling... committed before I finished what I was doing... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 723 diff changeset	203 unichar vk = [nchar characterAtIndex:0];
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	204 char ch = '\0';
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	205
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	206 /* Handle a valid key */
724 41080d22edc8 Couple more fixes to keyhandling... committed before I finished what I was doing... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 723 diff changeset	207 if([nchar length] == 1)
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	208 {
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	209 const char *tmp = [nchar UTF8String];
899 3fbba8b1f440 Don't pass in a partial UTF8 string in the character field during key press events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 898 diff changeset	210 if(tmp && strlen(tmp) == 1)
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	211 {
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	212 ch = tmp[0];
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	213 }
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	214 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	215
724 41080d22edc8 Couple more fixes to keyhandling... committed before I finished what I was doing... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 723 diff changeset	216 return keypressfunc(handler->window, ch, (int)vk, special, handler->data);
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	217 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	218 /* Button press and release event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	219 case 3:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	220 case 4:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	221 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	222 int (* API buttonfunc)(HWND, int, int, int, void ) = (int ( API)(HWND, int, int, int, void *))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	223 int button = (int)event;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	224 LONG x,y;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	225
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	226 dw_pointer_query_pos(&x, &y);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	227
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	228 return buttonfunc(object, (int)x, (int)y, button, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	229 }
886 d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	230 /* Motion notify event */
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	231 case 5:
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	232 {
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	233 int (* API motionfunc)(HWND, int, int, int, void ) = (int ( API)(HWND, int, int, int, void *))handler->signalfunction;
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	234 int buttonmask = (int)[NSEvent pressedMouseButtons];
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	235 NSPoint point = [NSEvent mouseLocation];
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	236
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	237 return motionfunc(object, (int)point.x, (int)point.y, buttonmask, handler->data);
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	238 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	239 /* Window close event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	240 case 6:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	241 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	242 int (* API closefunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	243 return closefunc(object, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	244 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	245 /* Window expose/draw event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	246 case 7:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	247 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	248 DWExpose exp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	249 int (* API exposefunc)(HWND, DWExpose , void ) = (int (* API)(HWND, DWExpose , void ))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	250 NSRect rect = [object frame];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	251
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	252 exp.x = rect.origin.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	253 exp.y = rect.origin.y;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	254 exp.width = rect.size.width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	255 exp.height = rect.size.height;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	256 int result = exposefunc(object, &exp, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	257 [[object window] flushWindow];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	258 return result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	259 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	260 /* Clicked event for buttons and menu items */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	261 case 8:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	262 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	263 int (* API clickfunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	264
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	265 return clickfunc(object, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	266 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	267 /* Container class selection event */
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	268 case 9:
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	269 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	270 int (containerselectfunc)(HWND, char , void *) = handler->signalfunction;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	271
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	272 return containerselectfunc(handler->window, (char *)event, handler->data);
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	273 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	274 /* Container context menu event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	275 case 10:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	276 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	277 int (* API containercontextfunc)(HWND, char , int, int, void , void ) = (int ( API)(HWND, char , int, int, void , void *))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	278 char text = (char )event;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	279 void *user = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	280 LONG x,y;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	281
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	282 dw_pointer_query_pos(&x, &y);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	283
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	284 return containercontextfunc(handler->window, text, (int)x, (int)y, handler->data, user);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	285 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	286 /* Generic selection changed event for several classes */
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	287 case 11:
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	288 case 14:
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	289 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	290 int (* API valuechangedfunc)(HWND, int, void ) = (int ( API)(HWND, int, void *))handler->signalfunction;
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	291 int selected = (int)event;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	292
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	293 return valuechangedfunc(handler->window, selected, handler->data);;
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	294 }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	295 /* Tree class selection event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	296 case 12:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	297 {
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	298 int (* API treeselectfunc)(HWND, HTREEITEM, char , void , void ) = (int ( API)(HWND, HTREEITEM, char , void , void *))handler->signalfunction;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	299 char text = (char )event;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	300 void *user = NULL;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	301 id item = nil;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	302
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	303 if([object isKindOfClass:[NSOutlineView class]])
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	304 {
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	305 item = (id)event;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	306 NSString *nstr = [item pointerAtIndex:1];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	307
727 f190b5c2ce16 Fixed 2 errors in the tree select event handler. Also removed unused experimental code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 726 diff changeset	308 if(nstr)
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	309 {
01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	310 text = strdup([nstr UTF8String]);
01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	311 }
713 2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	312 else
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	313 {
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	314 text = NULL;
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	315 }
727 f190b5c2ce16 Fixed 2 errors in the tree select event handler. Also removed unused experimental code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 726 diff changeset	316 user = [item pointerAtIndex:2];
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	317 int result = treeselectfunc(handler->window, item, text, handler->data, user);
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	318 if(text)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	319 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	320 free(text);
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	321 }
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	322 return result;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	323 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	324
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	325 return treeselectfunc(handler->window, item, text, handler->data, user);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	326 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	327 /* Set Focus event */
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	328 case 13:
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	329 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	330 int (* API setfocusfunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	331
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	332 return setfocusfunc(handler->window, handler->data);
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	333 }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	334 /* Notebook page change event */
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	335 case 15:
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	336 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	337 int (* API switchpagefunc)(HWND, unsigned long, void ) = (int ( API)(HWND, unsigned long, void *))handler->signalfunction;
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	338 int pageid = (int)event;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	339
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	340 return switchpagefunc(handler->window, pageid, handler->data);
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	341 }
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	342 case 16:
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	343 {
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	344 int (* API treeexpandfunc)(HWND, HTREEITEM, void ) = (int ( API)(HWND, HTREEITEM, void *))handler->signalfunction;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	345
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	346 return treeexpandfunc(handler->window, (HTREEITEM)event, handler->data);
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	347 }
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	348 case 17:
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	349 {
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	350 int (clickcolumnfunc)(HWND, int, void ) = handler->signalfunction;
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	351 int column_num = (int)event;
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	352
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	353 return clickcolumnfunc(handler->window, column_num, handler->data);
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	354 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	355 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	356 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	357 return -1;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	358 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	359
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	360 /* Subclass for the Timer type */
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	361 @interface DWTimerHandler : NSObject { }
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	362 -(void)runTimer:(id)sender;
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	363 @end
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	364
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	365 @implementation DWTimerHandler
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	366 -(void)runTimer:(id)sender { _event_handler(sender, nil, 0); }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	367 @end
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	368
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	369 NSApplication *DWApp;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	370 NSMenu *DWMainMenu;
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	371 NSFont *DWDefaultFont;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	372 DWTimerHandler *DWHandler;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	373 #if !defined(GARBAGE_COLLECT)
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	374 NSAutoreleasePool *pool;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	375 #endif
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	376 HWND _DWLastDrawable;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	377 HMTX DWRunMutex;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	378 HMTX DWThreadMutex;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	379 HMTX DWThreadMutex2;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	380 DWTID DWThread = (DWTID)-1;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	381 DWTID _dw_mutex_locked = (DWTID)-1;
754 0d0dc78c589d Clang complains about the types I used for the OS version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 753 diff changeset	382 SInt32 DWOSMajor, DWOSMinor, DWOSBuild;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	383
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	384 /* Used for doing bitblts from the main thread */
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	385 typedef struct _bitbltinfo
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	386 {
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	387 id src;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	388 id dest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	389 int xdest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	390 int ydest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	391 int width;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	392 int height;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	393 int xsrc;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	394 int ysrc;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	395 } DWBitBlt;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	396
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	397 /* Subclass for a test object type */
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	398 @interface DWObject : NSObject {}
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	399 -(void)uselessThread:(id)sender;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	400 -(void)synchronizeThread:(id)param;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	401 -(void)doBitBlt:(id)param;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	402 -(void)doFlush:(id)param;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	403 @end
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	404
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	405 @implementation DWObject
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	406 -(void)uselessThread:(id)sender { /* Thread only to initialize threading */ }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	407 -(void)synchronizeThread:(id)param
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	408 {
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	409 pthread_mutex_unlock(DWRunMutex);
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	410 pthread_mutex_lock(DWThreadMutex2);
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	411 pthread_mutex_unlock(DWThreadMutex2);
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	412 pthread_mutex_lock(DWRunMutex);
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	413 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	414 -(void)doBitBlt:(id)param
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	415 {
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	416 NSValue bi = (NSValue )param;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	417 DWBitBlt bltinfo = (DWBitBlt )[bi pointerValue];
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	418 id bltdest = bltinfo->dest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	419 id bltsrc = bltinfo->src;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	420
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	421 if([bltdest isMemberOfClass:[NSBitmapImageRep class]])
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	422 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	423 [NSGraphicsContext saveGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	424 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	425 graphicsContextWithBitmapImageRep:bltdest]];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	426 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	427 graphicsContextWithGraphicsPort:[[NSGraphicsContext currentContext] graphicsPort] flipped:YES]];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	428 [[NSDictionary alloc] initWithObjectsAndKeys:bltdest, NSGraphicsContextDestinationAttributeName, nil];
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	429 }
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	430 else
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	431 {
747 a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	432 if([bltdest lockFocusIfCanDraw] == NO)
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	433 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	434 return;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	435 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	436 _DWLastDrawable = bltinfo->dest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	437 }
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	438 if([bltsrc isMemberOfClass:[NSBitmapImageRep class]])
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	439 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	440 NSImage image = [[NSImage alloc] initWithCGImage:[(NSBitmapImageRep )bltsrc CGImage] size:NSZeroSize];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	441 // make a new transform:
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	442 NSAffineTransform *t = [NSAffineTransform transform];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	443
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	444 // by scaling Y negatively, we effectively flip the image:
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	445 [t scaleXBy:1.0 yBy:-1.0];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	446
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	447 // but we also have to translate it back by its height:
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	448 [t translateXBy:0.0 yBy:-bltinfo->height];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	449
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	450 // apply the transform:
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	451 [t concat];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	452 [image drawAtPoint:NSMakePoint(bltinfo->xdest, bltinfo->ydest) fromRect:NSMakeRect(bltinfo->xsrc, bltinfo->ysrc, bltinfo->width, bltinfo->height)
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	453 operation:NSCompositeCopy fraction:1.0];
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	454 [bltsrc release];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	455 [image release];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	456 }
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	457 if([bltdest isMemberOfClass:[NSBitmapImageRep class]])
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	458 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	459 [NSGraphicsContext restoreGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	460 }
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	461 else
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	462 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	463 [bltdest unlockFocus];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	464 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	465 free(bltinfo);
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	466 }
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	467 -(void)doFlush:(id)param
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	468 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	469 if(_DWLastDrawable)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	470 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	471 id object = _DWLastDrawable;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	472 NSWindow *window = [object window];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	473 [window flushWindow];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	474 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	475 }
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	476 -(void)doWindowFunc:(id)param
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	477 {
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	478 NSValue v = (NSValue )param;
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	479 void params = (void )[v pointerValue];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	480 void (* windowfunc)(void *);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	481
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	482 if(params)
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	483 {
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	484 windowfunc = params[0];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	485 if(windowfunc)
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	486 {
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	487 windowfunc(params[1]);
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	488 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	489 }
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	490 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	491 @end
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	492
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	493 DWObject *DWObj;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	494
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	495 /* So basically to implement our event handlers...
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	496 * it looks like we are going to have to subclass
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	497 * basically everything. Was hoping to add methods
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	498 * to the superclasses but it looks like you can
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	499 * only add methods and no variables, which isn't
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	500 * going to work. -Brian
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	501 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	502
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	503 /* Subclass for a box type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	504 @interface DWBox : NSView
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	505 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	506 Box *box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	507 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	508 NSColor *bgcolor;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	509 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	510 -(id)init;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	511 -(void)dealloc;
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	512 -(Box *)box;
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	513 -(id)contentView;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	514 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	515 -(void)setUserdata:(void *)input;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	516 -(void)drawRect:(NSRect)rect;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	517 -(BOOL)isFlipped;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	518 -(void)mouseDown:(NSEvent *)theEvent;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	519 -(void)mouseUp:(NSEvent *)theEvent;
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	520 -(NSMenu )menuForEvent:(NSEvent )theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	521 -(void)rightMouseUp:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	522 -(void)otherMouseDown:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	523 -(void)otherMouseUp:(NSEvent *)theEvent;
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	524 -(void)keyDown:(NSEvent *)theEvent;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	525 -(void)setColor:(unsigned long)input;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	526 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	527
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	528 @implementation DWBox
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	529 -(id)init
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	530 {
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	531 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	532
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	533 if (self)
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	534 {
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	535 box = calloc(1, sizeof(Box));
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	536 }
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	537 return self;
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	538 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	539 -(void)dealloc
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	540 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	541 UserData *root = userdata;
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	542 free(box);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	543 _remove_userdata(&root, NULL, TRUE);
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	544 [super dealloc];
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	545 }
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	546 -(Box *)box { return box; }
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	547 -(id)contentView { return self; }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	548 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	549 -(void)setUserdata:(void *)input { userdata = input; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	550 -(void)drawRect:(NSRect)rect
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	551 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	552 if(bgcolor)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	553 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	554 [bgcolor set];
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	555 NSRectFill([self bounds]);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	556 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	557 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	558 -(BOOL)isFlipped { return YES; }
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	559 -(void)mouseDown:(NSEvent )theEvent { _event_handler(self, (void )1, 3); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	560 -(void)mouseUp:(NSEvent )theEvent { _event_handler(self, (void )1, 4); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	561 -(NSMenu )menuForEvent:(NSEvent )theEvent { _event_handler(self, (void *)2, 3); return nil; }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	562 -(void)rightMouseUp:(NSEvent )theEvent { _event_handler(self, (void )2, 4); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	563 -(void)otherMouseDown:(NSEvent )theEvent { _event_handler(self, (void )3, 3); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	564 -(void)otherMouseUp:(NSEvent )theEvent { _event_handler(self, (void )3, 4); }
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	565 -(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	566 -(void)setColor:(unsigned long)input
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	567 {
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	568 id orig = bgcolor;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	569
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	570 if(input == _colors[DW_CLR_DEFAULT])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	571 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	572 bgcolor = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	573 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	574 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	575 {
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	576 bgcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(input)/255.0 green: DW_GREEN_VALUE(input)/255.0 blue: DW_BLUE_VALUE(input)/255.0 alpha: 1] retain];
812 f8bfb19090f9 dw_window_set_color() now affects boxes immediately (no longer on the next window refresh). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 811 diff changeset	577 [bgcolor set];
f8bfb19090f9 dw_window_set_color() now affects boxes immediately (no longer on the next window refresh). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 811 diff changeset	578 NSRectFill([self bounds]);
f8bfb19090f9 dw_window_set_color() now affects boxes immediately (no longer on the next window refresh). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 811 diff changeset	579 [self setNeedsDisplay:YES];
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	580 }
f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	581 [orig release];
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	582 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	583 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	584
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	585 /* Subclass for a group box type */
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	586 @interface DWGroupBox : NSBox
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	587 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	588 void *userdata;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	589 NSColor *bgcolor;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	590 }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	591 -(Box *)box;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	592 -(void *)userdata;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	593 -(void)setUserdata:(void *)input;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	594 @end
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	595
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	596 @implementation DWGroupBox
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	597 -(Box *)box { return [[self contentView] box]; }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	598 -(void *)userdata { return userdata; }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	599 -(void)setUserdata:(void *)input { userdata = input; }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	600 @end
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	601
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	602 @interface DWWindow : NSWindow
898 bf2ca780f62d One more try at window key handling... since I can't seem to trap keyDown events in most places that get focus... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 895 diff changeset	603 -(void)sendEvent:(NSEvent *)theEvent;
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	604 -(void)keyDown:(NSEvent *)theEvent;
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	605 @end
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	606
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	607 @implementation DWWindow
898 bf2ca780f62d One more try at window key handling... since I can't seem to trap keyDown events in most places that get focus... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 895 diff changeset	608 -(void)sendEvent:(NSEvent *)theEvent { if([theEvent type] == NSKeyDown) { _event_handler(self, theEvent, 2); } [super sendEvent:theEvent]; }
bf2ca780f62d One more try at window key handling... since I can't seem to trap keyDown events in most places that get focus... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 895 diff changeset	609 -(void)keyDown:(NSEvent *)theEvent { }
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	610 @end
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	611
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	612 /* Subclass for a top-level window */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	613 @interface DWView : DWBox
854 d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	614 #ifdef BUILDING_FOR_SNOW_LEOPARD
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	615 <NSWindowDelegate>
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	616 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	617 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	618 NSMenu *windowmenu;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	619 }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	620 -(BOOL)windowShouldClose:(id)sender;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	621 -(void)setMenu:(NSMenu *)input;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	622 -(void)windowDidBecomeMain:(id)sender;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	623 -(void)menuHandler:(id)sender;
886 d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	624 -(void)mouseMoved:(NSEvent *)theEvent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	625 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	626
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	627 @implementation DWView
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	628 -(BOOL)windowShouldClose:(id)sender
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	629 {
854 d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	630 if(_event_handler(sender, nil, 6) == FALSE)
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	631 return YES;
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	632 return NO;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	633 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	634 - (void)viewDidMoveToWindow
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	635 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	636 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:NSWindowDidResizeNotification object:[self window]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	637 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:NSWindowDidBecomeMainNotification object:[self window]];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	638 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	639 - (void)dealloc
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	640 {
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	641 if(windowmenu)
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	642 {
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	643 [windowmenu release];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	644 }
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	645 [[NSNotificationCenter defaultCenter] removeObserver:self];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	646 [super dealloc];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	647 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	648 - (void)windowResized:(NSNotification *)notification;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	649 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	650 NSSize size = [self frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	651 _do_resize(box, size.width, size.height);
902 5596e3830ae3 Temporary workaround to a maximize resize issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 899 diff changeset	652 _do_resize(box, size.width, size.height);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	653 _event_handler([self window], nil, 1);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	654 }
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	655 -(void)windowDidBecomeMain:(id)sender
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	656 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	657 if(windowmenu)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	658 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	659 [DWApp setMainMenu:windowmenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	660 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	661 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	662 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	663 [DWApp setMainMenu:DWMainMenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	664 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	665 _event_handler(self, nil, 13);
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	666 }
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	667 -(void)setMenu:(NSMenu *)input { windowmenu = input; [windowmenu retain]; }
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	668 -(void)menuHandler:(id)sender { _event_handler(sender, nil, 8); }
886 d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	669 -(void)mouseMoved:(NSEvent *)theEvent { _event_handler(self, theEvent, 5); }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	670 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	671
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	672 /* Subclass for a button type */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	673 @interface DWButton : NSButton
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	674 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	675 void *userdata;
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	676 NSButtonType buttonType;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	677 DWBox *parent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	678 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	679 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	680 -(void)setUserdata:(void *)input;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	681 -(void)buttonClicked:(id)sender;
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	682 -(void)setButtonType:(NSButtonType)input;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	683 -(NSButtonType)buttonType;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	684 -(void)setParent:(DWBox *)input;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	685 -(DWBox *)parent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	686 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	687
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	688 @implementation DWButton
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	689 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	690 -(void)setUserdata:(void *)input { userdata = input; }
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	691 -(void)buttonClicked:(id)sender
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	692 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	693 _event_handler(self, nil, 8);
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	694 if([self buttonType] == NSRadioButton)
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	695 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	696 DWBox *viewbox = [self parent];
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	697 Box *thisbox = [viewbox box];
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	698 int z;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	699
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	700 for(z=0;z<thisbox->count;z++)
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	701 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	702 if(thisbox->items[z].type != TYPEBOX)
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	703 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	704 id object = thisbox->items[z].hwnd;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	705
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	706 if([object isMemberOfClass:[DWButton class]])
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	707 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	708 DWButton *button = object;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	709
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	710 if(button != self && [button buttonType] == NSRadioButton)
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	711 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	712 [button setState:NSOffState];
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	713 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	714 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	715 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	716 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	717 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	718 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	719 -(void)setButtonType:(NSButtonType)input { buttonType = input; [super setButtonType:input]; }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	720 -(NSButtonType)buttonType { return buttonType; }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	721 -(void)setParent:(DWBox *)input { parent = input; }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	722 -(DWBox *)parent { return parent; }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	723 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	724 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	725
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	726 /* Subclass for a progress type */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	727 @interface DWPercent : NSProgressIndicator
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	728 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	729 void *userdata;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	730 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	731 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	732 -(void)setUserdata:(void *)input;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	733 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	734
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	735 @implementation DWPercent
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	736 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	737 -(void)setUserdata:(void *)input { userdata = input; }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	738 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	739 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	740
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	741 /* Subclass for a scrollbox type */
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	742 @interface DWScrollBox : NSScrollView
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	743 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	744 void *userdata;
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	745 id box;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	746 }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	747 -(void *)userdata;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	748 -(void)setUserdata:(void *)input;
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	749 -(void)setBox:(void *)input;
2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	750 -(id)box;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	751 @end
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	752
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	753 @implementation DWScrollBox
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	754 -(void *)userdata { return userdata; }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	755 -(void)setUserdata:(void *)input { userdata = input; }
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	756 -(void)setBox:(void *)input { box = input; }
2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	757 -(id)box { return box; }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	758 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	759 @end
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	760
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	761 /* Subclass for a textfield that supports vertical centering */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	762 @interface DWTextFieldCell : NSTextFieldCell
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	763 {
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	764 BOOL vcenter;
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	765 }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	766 -(NSRect)drawingRectForBounds:(NSRect)theRect;
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	767 -(void)setVCenter:(BOOL)input;
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	768 @end
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	769
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	770 @implementation DWTextFieldCell
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	771 -(NSRect)drawingRectForBounds:(NSRect)theRect
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	772 {
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	773 /* Get the parent's idea of where we should draw */
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	774 NSRect newRect = [super drawingRectForBounds:theRect];
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	775
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	776 /* If we are being vertically centered */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	777 if(vcenter)
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	778 {
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	779 /* Get our ideal size for current text */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	780 NSSize textSize = [self cellSizeForBounds:theRect];
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	781
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	782 /* Center that in the proposed rect */
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	783 float heightDelta = newRect.size.height - textSize.height;
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	784 if (heightDelta > 0)
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	785 {
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	786 newRect.size.height -= heightDelta;
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	787 newRect.origin.y += (heightDelta / 2);
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	788 }
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	789 }
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	790
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	791 return newRect;
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	792 }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	793 -(void)setVCenter:(BOOL)input { vcenter = input; }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	794 @end
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	795
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	796 @interface DWEntryFieldFormatter : NSFormatter
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	797 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	798 int maxLength;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	799 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	800 - (void)setMaximumLength:(int)len;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	801 - (int)maximumLength;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	802 @end
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	803
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	804 /* This formatter subclass will allow us to limit
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	805 * the text length in an entryfield.
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	806 */
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	807 @implementation DWEntryFieldFormatter
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	808 -(id)init
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	809 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	810 [super init];
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	811 maxLength = INT_MAX;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	812 return self;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	813 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	814 -(void)setMaximumLength:(int)len { maxLength = len; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	815 -(int)maximumLength { return maxLength; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	816 -(NSString )stringForObjectValue:(id)object { return (NSString )object; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	817 -(BOOL)getObjectValue:(id )object forString:(NSString )string errorDescription:(NSString *)error { object = string; return YES; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	818 -(BOOL)isPartialStringValid:(NSString **)partialStringPtr
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	819 proposedSelectedRange:(NSRangePointer)proposedSelRangePtr
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	820 originalString:(NSString *)origString
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	821 originalSelectedRange:(NSRange)origSelRange
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	822 errorDescription:(NSString **)error
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	823 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	824 if([*partialStringPtr length] > maxLength)
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	825 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	826 return NO;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	827 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	828 return YES;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	829 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	830 -(NSAttributedString )attributedStringForObjectValue:(id)anObject withDefaultAttributes:(NSDictionary )attributes { return nil; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	831 @end
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	832
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	833 /* Subclass for a entryfield type */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	834 @interface DWEntryField : NSTextField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	835 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	836 void *userdata;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	837 id clickDefault;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	838 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	839 -(void *)userdata;
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	840 -(void)setUserdata:(void *)input;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	841 -(void)setClickDefault:(id)input;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	842 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	843
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	844 @implementation DWEntryField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	845 -(void *)userdata { return userdata; }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	846 -(void)setUserdata:(void *)input { userdata = input; }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	847 -(void)setClickDefault:(id)input { clickDefault = input; }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	848 -(void)keyUp:(NSEvent *)theEvent
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	849 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	850 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	851 if(clickDefault && vk == VK_RETURN)
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	852 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	853 [[self window] makeFirstResponder:clickDefault];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	854 } else
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	855 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	856 [super keyUp:theEvent];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	857 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	858 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	859 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	860 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	861
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	862 /* Subclass for a entryfield password type */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	863 @interface DWEntryFieldPassword : NSSecureTextField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	864 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	865 void *userdata;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	866 id clickDefault;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	867 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	868 -(void *)userdata;
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	869 -(void)setUserdata:(void *)input;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	870 -(void)setClickDefault:(id)input;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	871 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	872
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	873 @implementation DWEntryFieldPassword
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	874 -(void *)userdata { return userdata; }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	875 -(void)setUserdata:(void *)input { userdata = input; }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	876 -(void)setClickDefault:(id)input { clickDefault = input; }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	877 -(void)keyUp:(NSEvent *)theEvent
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	878 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	879 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	880 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	881 [[self window] makeFirstResponder:clickDefault];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	882 } else
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	883 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	884 [super keyUp:theEvent];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	885 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	886 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	887 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	888 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	889
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	890 /* Subclass for a Notebook control type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	891 @interface DWNotebook : NSTabView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	892 #ifdef BUILDING_FOR_SNOW_LEOPARD
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	893 <NSTabViewDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	894 #endif
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	895 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	896 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	897 int pageid;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	898 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	899 -(void *)userdata;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	900 -(void)setUserdata:(void *)input;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	901 -(int)pageid;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	902 -(void)setPageid:(int)input;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	903 -(void)tabView:(NSTabView )notebook didSelectTabViewItem:(NSTabViewItem )notepage;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	904 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	905
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	906 /* Subclass for a Notebook page type */
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	907 @interface DWNotebookPage : NSTabViewItem
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	908 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	909 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	910 int pageid;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	911 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	912 -(void *)userdata;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	913 -(void)setUserdata:(void *)input;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	914 -(int)pageid;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	915 -(void)setPageid:(int)input;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	916 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	917
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	918 @implementation DWNotebook
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	919 -(void *)userdata { return userdata; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	920 -(void)setUserdata:(void *)input { userdata = input; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	921 -(int)pageid { return pageid; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	922 -(void)setPageid:(int)input { pageid = input; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	923 -(void)tabView:(NSTabView )notebook didSelectTabViewItem:(NSTabViewItem )notepage
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	924 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	925 id object = [notepage view];
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	926 DWNotebookPage page = (DWNotebookPage )notepage;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	927
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	928 if([object isMemberOfClass:[DWBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	929 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	930 DWBox *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	931 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	932 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	933 _do_resize(box, size.width, size.height);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	934 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	935 _event_handler(self, (void *)[page pageid], 15);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	936 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	937 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	938 @end
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	939
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	940 @implementation DWNotebookPage
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	941 -(void *)userdata { return userdata; }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	942 -(void)setUserdata:(void *)input { userdata = input; }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	943 -(int)pageid { return pageid; }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	944 -(void)setPageid:(int)input { pageid = input; }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	945 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	946 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	947
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	948 /* Subclass for a color chooser type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	949 @interface DWColorChoose : NSColorPanel
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	950 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	951 DWDialog *dialog;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	952 NSColor *pickedcolor;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	953 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	954 -(void)changeColor:(id)sender;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	955 -(void)setDialog:(DWDialog *)input;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	956 -(DWDialog *)dialog;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	957 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	958
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	959 @implementation DWColorChoose
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	960 -(void)changeColor:(id)sender { pickedcolor = [self color]; }
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	961 -(BOOL)windowShouldClose:(id)window { DWDialog *d = dialog; dialog = nil; dw_dialog_dismiss(d, pickedcolor); [window orderOut:nil]; return NO; }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	962 -(void)setDialog:(DWDialog *)input { dialog = input; }
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	963 -(DWDialog *)dialog { return dialog; }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	964 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	965
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	966 /* Subclass for a splitbar type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	967 @interface DWSplitBar : NSSplitView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	968 #ifdef BUILDING_FOR_SNOW_LEOPARD
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	969 <NSSplitViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	970 #endif
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	971 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	972 void *userdata;
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	973 float percent;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	974 }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	975 -(void)splitViewDidResizeSubviews:(NSNotification *)aNotification;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	976 -(void *)userdata;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	977 -(void)setUserdata:(void *)input;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	978 -(float)percent;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	979 -(void)setPercent:(float)input;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	980 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	981
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	982 @implementation DWSplitBar
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	983 -(void)splitViewDidResizeSubviews:(NSNotification *)aNotification
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	984 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	985 NSArray *views = [self subviews];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	986 id object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	987
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	988 for(object in views)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	989 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	990 if([object isMemberOfClass:[DWBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	991 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	992 DWBox *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	993 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	994 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	995 _do_resize(box, size.width, size.height);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	996 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	997 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	998 }
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	999 -(void *)userdata { return userdata; }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	1000 -(void)setUserdata:(void *)input { userdata = input; }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	1001 -(float)percent { return percent; }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	1002 -(void)setPercent:(float)input { percent = input; }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1003 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1004 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1005
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1006 /* Subclass for a slider type */
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1007 @interface DWSlider : NSSlider
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1008 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1009 void *userdata;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1010 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1011 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1012 -(void)setUserdata:(void *)input;
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	1013 -(void)sliderChanged:(id)sender;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1014 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1015
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1016 @implementation DWSlider
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1017 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1018 -(void)setUserdata:(void *)input { userdata = input; }
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1019 -(void)sliderChanged:(id)sender { _event_handler(self, (void *)[self integerValue], 14); }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1020 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1021 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1022
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1023 /* Subclass for a slider type */
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1024 @interface DWScrollbar : NSScroller
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1025 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1026 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1027 float range;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1028 float visible;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1029 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1030 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1031 -(void)setUserdata:(void *)input;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1032 -(float)range;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1033 -(float)visible;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1034 -(void)setRange:(float)input1 andVisible:(float)input2;
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1035 -(void)scrollerChanged:(id)sender;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1036 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1037
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1038 @implementation DWScrollbar
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1039 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1040 -(void)setUserdata:(void *)input { userdata = input; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1041 -(float)range { return range; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1042 -(float)visible { return visible; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1043 -(void)setRange:(float)input1 andVisible:(float)input2 { range = input1; visible = input2; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1044 -(void)scrollerChanged:(id)sender
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1045 {
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1046 double proportion = [self knobProportion];
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	1047 int page = (int)(proportion * range);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1048 int max = (int)(range - page);
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	1049 int result = (int)([self doubleValue] * max);
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1050 int newpos = result;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1051
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1052 switch ([sender hitPart])
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1053 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1054
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1055 case NSScrollerDecrementLine:
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1056 if(newpos > 0)
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1057 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1058 newpos--;
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1059 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1060 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1061
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1062 case NSScrollerIncrementLine:
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	1063 if(newpos < max)
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1064 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1065 newpos++;
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1066 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1067 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1068
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1069 case NSScrollerDecrementPage:
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1070 newpos -= page;
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1071 if(newpos < 0)
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1072 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1073 newpos = 0;
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1074 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1075 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1076
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1077 case NSScrollerIncrementPage:
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1078 newpos += page;
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	1079 if(newpos > max)
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1080 {
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	1081 newpos = max;
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1082 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1083 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1084
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1085 default:
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	1086 ; /* do nothing */
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1087 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1088 if(newpos != result)
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1089 {
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	1090 double newposd = (double)newpos/max;
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1091 [self setDoubleValue:newposd];
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1092 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1093 _event_handler(self, (void *)newpos, 14);
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1094 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1095 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1096 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1097
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1098 /* Subclass for a render area type */
850 1a7c8d210b18 Changed the Render widget superclass from NSView to NSControl to allow it to function more like a normal control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 844 diff changeset	1099 @interface DWRender : NSControl
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1100 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1101 void *userdata;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	1102 NSFont *font;
851 5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	1103 NSSize size;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1104 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1105 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1106 -(void)setUserdata:(void *)input;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	1107 -(void)setFont:(NSFont *)input;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	1108 -(NSFont *)font;
851 5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	1109 -(void)setSize:(NSSize)input;
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	1110 -(NSSize)size;
660 2784e7ee8bcb Fixes for pixmaps and drawing to the screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 659 diff changeset	1111 -(void)mouseDown:(NSEvent *)theEvent;
2784e7ee8bcb Fixes for pixmaps and drawing to the screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 659 diff changeset	1112 -(void)mouseUp:(NSEvent *)theEvent;
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1113 -(NSMenu )menuForEvent:(NSEvent )theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1114 -(void)rightMouseUp:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1115 -(void)otherMouseDown:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1116 -(void)otherMouseUp:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1117 -(void)drawRect:(NSRect)rect;
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	1118 -(void)keyDown:(NSEvent *)theEvent;
664 ba3af8eb56f1 Fixed drawing of rects and points. Fonts now properly draw in color. Updated property list. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 662 diff changeset	1119 -(BOOL)isFlipped;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1120 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1121
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1122 @implementation DWRender
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1123 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1124 -(void)setUserdata:(void *)input { userdata = input; }
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	1125 -(void)setFont:(NSFont *)input { [font release]; font = input; [font retain]; }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	1126 -(NSFont *)font { return font; }
851 5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	1127 -(void)setSize:(NSSize)input { size = input; }
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	1128 -(NSSize)size { return size; }
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1129 -(void)mouseDown:(NSEvent )theEvent { _event_handler(self, (void )1, 3); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1130 -(void)mouseUp:(NSEvent )theEvent { _event_handler(self, (void )1, 4); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1131 -(NSMenu )menuForEvent:(NSEvent )theEvent { _event_handler(self, (void *)2, 3); return nil; }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1132 -(void)rightMouseUp:(NSEvent )theEvent { _event_handler(self, (void )2, 4); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1133 -(void)otherMouseDown:(NSEvent )theEvent { _event_handler(self, (void )3, 3); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1134 -(void)otherMouseUp:(NSEvent )theEvent { _event_handler(self, (void )3, 4); }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1135 -(void)drawRect:(NSRect)rect { _event_handler(self, nil, 7); }
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	1136 -(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); }
664 ba3af8eb56f1 Fixed drawing of rects and points. Fonts now properly draw in color. Updated property list. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 662 diff changeset	1137 -(BOOL)isFlipped { return NO; }
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	1138 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [font release]; [super dealloc]; }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1139 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1140
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1141 /* Subclass for a MLE type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1142 @interface DWMLE : NSTextView
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1143 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1144 void *userdata;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1145 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1146 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1147 -(void)setUserdata:(void *)input;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1148 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1149
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1150 @implementation DWMLE
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1151 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1152 -(void)setUserdata:(void *)input { userdata = input; }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1153 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1154 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1155
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1156 /* Subclass for a Container/List type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1157 @interface DWContainer : NSTableView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	1158 #ifdef BUILDING_FOR_SNOW_LEOPARD
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1159 <NSTableViewDataSource,NSTableViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1160 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1161 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1162 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1163 NSMutableArray *tvcols;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1164 NSMutableArray *data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1165 NSMutableArray *types;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1166 NSPointerArray *titles;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1167 NSColor *fgcolor;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1168 int lastAddPoint, lastQueryPoint;
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	1169 id scrollview;
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1170 int filesystem;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1171 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1172 -(NSInteger)numberOfRowsInTableView:(NSTableView *)aTable;
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1173 -(id)tableView:(NSTableView )aTable objectValueForTableColumn:(NSTableColumn )aCol row:(NSInteger)aRow;
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1174 -(BOOL)tableView:(NSTableView )aTableView shouldEditTableColumn:(NSTableColumn )aTableColumn row:(int)rowIndex;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1175 -(void *)userdata;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1176 -(void)setUserdata:(void *)input;
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1177 -(void)setFilesystem:(int)input;
831 168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	1178 -(int)filesystem;
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	1179 -(id)scrollview;
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	1180 -(void)setScrollview:(id)input;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1181 -(void)addColumn:(NSTableColumn *)input andType:(int)type;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	1182 -(NSTableColumn *)getColumn:(int)col;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1183 -(int)addRow:(NSArray *)input;
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1184 -(int)addRows:(int)number;
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1185 -(void)tableView:(NSTableView )tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn )tableColumn row:(NSInteger)row;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1186 -(void)editCell:(id)input at:(int)row and:(int)col;
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	1187 -(void)removeRow:(int)row;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1188 -(void)setRow:(int)row title:(void *)input;
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1189 -(void *)getRowTitle:(int)row;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	1190 -(id)getRow:(int)row and:(int)col;
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	1191 -(int)cellType:(int)col;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1192 -(int)lastAddPoint;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	1193 -(int)lastQueryPoint;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	1194 -(void)setLastQueryPoint:(int)input;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1195 -(void)clear;
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1196 -(void)setup;
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1197 -(void)optimize;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1198 -(void)setForegroundColor:(NSColor *)input;
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1199 -(void)doubleClicked:(id)sender;
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1200 -(void)keyUp:(NSEvent *)theEvent;
867 139acecd6ca0 Guess I wanted to trap didClickTableColumn instead of mouseDownInHeaderOfTableColumn to avoid spurious events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 866 diff changeset	1201 -(void)tableView:(NSTableView )tableView didClickTableColumn:(NSTableColumn )tableColumn;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1202 -(void)selectionChanged:(id)sender;
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1203 -(NSMenu )menuForEvent:(NSEvent )event;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1204 @end
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1205
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1206 @implementation DWContainer
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1207 -(NSInteger)numberOfRowsInTableView:(NSTableView *)aTable
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1208 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1209 if(tvcols && data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1210 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1211 int cols = (int)[tvcols count];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1212 if(cols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1213 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1214 return [data count] / cols;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1215 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1216 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1217 return 0;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1218 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1219 -(id)tableView:(NSTableView )aTable objectValueForTableColumn:(NSTableColumn )aCol row:(NSInteger)aRow
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1220 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1221 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1222 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1223 int z, col = -1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1224 int count = (int)[tvcols count];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1225
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1226 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1227 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1228 if([tvcols objectAtIndex:z] == aCol)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1229 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1230 col = z;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1231 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1232 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1233 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1234 if(col != -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1235 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1236 int index = (int)(aRow * count) + col;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1237 id this = [data objectAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1238 return ([this isKindOfClass:[NSNull class]]) ? nil : this;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1239 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1240 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1241 return nil;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1242 }
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1243 -(BOOL)tableView:(NSTableView )aTableView shouldEditTableColumn:(NSTableColumn )aTableColumn row:(int)rowIndex { return NO; }
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1244 -(void *)userdata { return userdata; }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1245 -(void)setUserdata:(void *)input { userdata = input; }
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1246 -(void)setFilesystem:(int)input { filesystem = input; }
831 168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	1247 -(int)filesystem { return filesystem; }
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1248 -(id)scrollview { return scrollview; }
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1249 -(void)setScrollview:(id)input { scrollview = input; }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1250 -(void)addColumn:(NSTableColumn *)input andType:(int)type { if(tvcols) { [tvcols addObject:input]; [types addObject:[NSNumber numberWithInt:type]]; } }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	1251 -(NSTableColumn *)getColumn:(int)col { if(tvcols) { return [tvcols objectAtIndex:col]; } return nil; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1252 -(int)insertRow:(NSArray *)input at:(int)index
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1253 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1254 if(data)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1255 {
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1256 unsigned long start = [tvcols count] * index;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1257 NSIndexSet *set = [[NSIndexSet alloc] initWithIndexesInRange:NSMakeRange(start, start + [tvcols count])];
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1258 if(index < lastAddPoint)
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1259 {
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1260 lastAddPoint++;
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1261 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1262 [data insertObjects:input atIndexes:set];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1263 [titles insertPointer:NULL atIndex:index];
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1264 [set release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1265 return (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1266 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1267 return 0;
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1268 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1269 -(int)addRow:(NSArray *)input
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1270 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1271 if(data)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1272 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1273 lastAddPoint = (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1274 [data addObjectsFromArray:input];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1275 [titles addPointer:NULL];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1276 return (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1277 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1278 return 0;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	1279 }
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1280 -(int)addRows:(int)number
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1281 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1282 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1283 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1284 int count = (int)(number * [tvcols count]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1285 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1286
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1287 lastAddPoint = (int)[titles count];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1288
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1289 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1290 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1291 [data addObject:[NSNull null]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1292 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1293 for(z=0;z<number;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1294 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1295 [titles addPointer:NULL];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1296 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1297 return (int)[titles count];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1298 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1299 return 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1300 }
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1301 -(void)tableView:(NSTableView )tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn )tableColumn row:(NSInteger)row
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1302 {
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1303 if([cell isMemberOfClass:[NSBrowserCell class]])
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1304 {
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1305 int index = (int)(row * [tvcols count]);
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1306 NSBrowserCell *browsercell = [data objectAtIndex:index];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1307 NSImage *img = [browsercell image];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1308 [(NSBrowserCell*)cell setImage:img];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1309 }
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1310 }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1311 -(void)editCell:(id)input at:(int)row and:(int)col
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1312 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1313 if(tvcols && input)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1314 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1315 int index = (int)(row * [tvcols count]) + col;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1316 [data replaceObjectAtIndex:index withObject:input];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1317 }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1318 }
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	1319 -(void)removeRow:(int)row
d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	1320 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1321 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1322 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1323 int z, start, end;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1324 int count = (int)[tvcols count];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1325
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1326 start = count * row;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1327 end = start + count;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1328
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1329 for(z=start;z<end;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1330 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1331 [data removeObjectAtIndex:z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1332 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1333 [titles removePointerAtIndex:row];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1334 if(lastAddPoint > 0 && lastAddPoint < row)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1335 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1336 lastAddPoint--;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1337 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1338 }
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	1339 }
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1340 -(void)setRow:(int)row title:(void *)input { if(titles && input) { [titles replacePointerAtIndex:row withPointer:input]; } }
683 7385011c3327 Fixed a minor issue causing crashes when right clicking on an empty container. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 682 diff changeset	1341 -(void *)getRowTitle:(int)row { if(titles && row > -1) { return [titles pointerAtIndex:row]; } return NULL; }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	1342 -(id)getRow:(int)row and:(int)col { if(data) { int index = (int)(row * [tvcols count]) + col; return [data objectAtIndex:index]; } return nil; }
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	1343 -(int)cellType:(int)col { return [[types objectAtIndex:col] intValue]; }
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1344 -(int)lastAddPoint { return lastAddPoint; }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	1345 -(int)lastQueryPoint { return lastQueryPoint; }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	1346 -(void)setLastQueryPoint:(int)input { lastQueryPoint = input; }
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1347 -(void)clear { if(data) { [data removeAllObjects]; while([titles count]) { [titles removePointerAtIndex:0]; } } lastAddPoint = 0; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1348 -(void)setup
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1349 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1350 tvcols = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1351 data = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1352 types = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1353 titles = [[NSPointerArray pointerArrayWithWeakObjects] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1354 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(selectionChanged:) name:NSTableViewSelectionDidChangeNotification object:self];
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1355 }
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1356 -(void)optimize
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1357 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1358 if(tvcols)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1359 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1360 int z;
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1361 int colcount = (int)[tvcols count];
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1362 int rowcount = (int)[self numberOfRowsInTableView:self];
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1363
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1364 for(z=0;z<colcount;z++)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1365 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1366 NSTableColumn *column = [tvcols objectAtIndex:z];
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1367 if([column resizingMask] != NSTableColumnNoResizing)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1368 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1369 if(rowcount > 0)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1370 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1371 int x;
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1372 int width = 0;
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1373
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1374 for(x=0;x<rowcount;x++)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1375 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1376 NSCell *cell = [self preparedCellAtColumn:z row:x];
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1377 int thiswidth = [cell cellSize].width;
866 ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1378
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1379 /* Check the image inside the cell to get its width */
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1380 if([cell isMemberOfClass:[NSImageCell class]])
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1381 {
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1382 int index = (int)(x * [tvcols count]) + z;
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1383 NSImage *image = [data objectAtIndex:index];
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1384 if([image isMemberOfClass:[NSImage class]])
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1385 {
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1386 thiswidth = [image size].width;
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1387 }
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1388 }
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1389
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1390 if(thiswidth > width)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1391 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1392 width = thiswidth;
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1393 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1394 }
866 ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1395 /* If the image is missing default the optimized width to 16. */
864 ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1396 if(!width && [[types objectAtIndex:z] intValue] & DW_CFA_BITMAPORICON)
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1397 {
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1398 width = 16;
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1399 }
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1400 /* Sanity check... don't set the width to 0 */
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1401 if(width)
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1402 {
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1403 [column setWidth:width];
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	1404 }
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1405 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1406 else
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1407 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1408 [column sizeToFit];
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1409 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1410 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1411 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1412 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	1413 }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1414 -(void)setForegroundColor:(NSColor *)input
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1415 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1416 int z, count = (int)[tvcols count];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1417
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1418 fgcolor = input;
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1419 [fgcolor retain];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1420
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1421 for(z=0;z<count;z++)
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1422 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1423 NSTableColumn *tableColumn = [tvcols objectAtIndex:z];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1424 NSTextFieldCell *cell = [tableColumn dataCell];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1425 [cell setTextColor:fgcolor];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1426 }
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1427 }
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1428 -(void)doubleClicked:(id)sender
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1429 {
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1430 /* Handler for container class */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1431 _event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 9);
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1432 }
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1433 -(void)keyUp:(NSEvent *)theEvent
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1434 {
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1435 if([[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1436 {
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1437 _event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 9);
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1438 }
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1439 [super keyUp:theEvent];
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1440 }
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1441
867 139acecd6ca0 Guess I wanted to trap didClickTableColumn instead of mouseDownInHeaderOfTableColumn to avoid spurious events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 866 diff changeset	1442 -(void)tableView:(NSTableView )tableView didClickTableColumn:(NSTableColumn )tableColumn
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1443 {
7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1444 NSUInteger index = [tvcols indexOfObject:tableColumn];
7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1445
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	1446 /* Handler for column click class */
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1447 _event_handler(self, (NSEvent *)index, 17);
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	1448 }
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1449 -(void)selectionChanged:(id)sender
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1450 {
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1451 /* Handler for container class */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1452 _event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 12);
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1453 /* Handler for listbox class */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1454 _event_handler(self, (NSEvent *)(int)[self selectedRow], 11);
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1455 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1456 -(NSMenu )menuForEvent:(NSEvent )event
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1457 {
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1458 int row;
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1459 NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1460 row = (int)[self rowAtPoint:where];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1461 _event_handler(self, (NSEvent *)[self getRowTitle:row], 10);
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1462 return nil;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1463 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1464 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1465 @end
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1466
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1467 /* Dive into the tree showing all nodes */
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1468 void _free_tree_recurse(NSMutableArray node, NSPointerArray item)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1469 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1470 if(node)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1471 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1472 int count = (int)[node count];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1473 int z;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1474
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1475 for(z=0;z<count;z++)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1476 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1477 NSPointerArray *pnt = [node objectAtIndex:z];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1478 NSMutableArray children = (NSMutableArray )[pnt pointerAtIndex:3];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1479
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1480 if(children)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1481 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1482 if(item == pnt)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1483 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1484 _free_tree_recurse(children, NULL);
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1485 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1486 else
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1487 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1488 _free_tree_recurse(children, item);
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1489 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1490 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1491 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1492 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1493 if(!item)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1494 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1495 [node release];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1496 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1497 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1498
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1499 /* Subclass for a Tree type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1500 @interface DWTree : NSOutlineView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	1501 #ifdef BUILDING_FOR_SNOW_LEOPARD
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1502 <NSOutlineViewDataSource,NSOutlineViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1503 #endif
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1504 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1505 void *userdata;
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1506 NSTableColumn *treecol;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1507 NSMutableArray *data;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1508 /* Each data item consists of a linked lists of tree item data.
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1509 * NSImage , NSString , Item Data , NSMutableArray of Children
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1510 */
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1511 id scrollview;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1512 NSColor *fgcolor;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1513 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1514 -(id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1515 -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1516 -(int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1517 -(id)outlineView:(NSOutlineView )outlineView objectValueForTableColumn:(NSTableColumn )tableColumn byItem:(id)item;
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1518 -(void)outlineView:(NSOutlineView )outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn )tableColumn item:(id)item;
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1519 -(BOOL)outlineView:(NSOutlineView )outlineView shouldEditTableColumn:(NSTableColumn )tableColumn item:(id)item;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1520 -(void)addTree:(NSPointerArray )item and:(NSPointerArray )parent;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1521 -(void *)userdata;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1522 -(void)setUserdata:(void *)input;
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	1523 -(void)treeSelectionChanged:(id)sender;
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1524 -(void)treeItemExpanded:(NSNotification *)notification;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1525 -(NSScrollView *)scrollview;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1526 -(void)setScrollview:(NSScrollView *)input;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1527 -(void)deleteNode:(NSPointerArray *)item;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1528 -(void)setForegroundColor:(NSColor *)input;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1529 -(void)clear;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1530 @end
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1531
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1532 @implementation DWTree
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1533 -(id)init
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1534 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1535 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1536
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1537 if (self)
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1538 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1539 treecol = [[NSTableColumn alloc] init];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1540 NSBrowserCell *browsercell = [[[NSBrowserCell alloc] init] autorelease];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1541 [browsercell setLeaf:YES];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1542 [treecol setDataCell:browsercell];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1543 [self addTableColumn:treecol];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1544 [self setOutlineTableColumn:treecol];
743 4462bc7de1e3 Possible fix for container (and possibly tree) controls picking up combobox events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 742 diff changeset	1545 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(treeSelectionChanged:) name:NSOutlineViewSelectionDidChangeNotification object:self];
4462bc7de1e3 Possible fix for container (and possibly tree) controls picking up combobox events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 742 diff changeset	1546 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(treeItemExpanded:) name:NSOutlineViewItemDidExpandNotification object:self];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1547 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1548 return self;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1549 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1550 -(id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1551 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1552 if(item)
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1553 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1554 NSMutableArray *array = [item pointerAtIndex:3];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1555 return array ? [array objectAtIndex:index] : nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1556 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1557 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1558 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1559 return [data objectAtIndex:index];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1560 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1561 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1562 -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1563 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1564 return [self outlineView:outlineView numberOfChildrenOfItem:item] != 0;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1565 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1566 -(int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1567 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1568 if(item)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1569 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1570 if([item isKindOfClass:[NSPointerArray class]])
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1571 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1572 NSMutableArray *array = [item pointerAtIndex:3];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1573 return array ? (int)[array count] : 0;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1574 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1575 else
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1576 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1577 return 0;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1578 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1579 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1580 else
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1581 {
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1582 return data ? (int)[data count] : 0;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1583 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1584 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1585 -(id)outlineView:(NSOutlineView )outlineView objectValueForTableColumn:(NSTableColumn )tableColumn byItem:(id)item
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1586 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1587 if(item)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1588 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1589 if([item isKindOfClass:[NSPointerArray class]])
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1590 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1591 NSPointerArray this = (NSPointerArray )item;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1592 return [this pointerAtIndex:1];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1593 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1594 else
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1595 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1596 return nil;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1597 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1598 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1599 return @"List Root";
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1600 }
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1601 -(void)outlineView:(NSOutlineView )outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn )tableColumn item:(id)item
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1602 {
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1603 if([cell isMemberOfClass:[NSBrowserCell class]])
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1604 {
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1605 NSPointerArray this = (NSPointerArray )item;
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1606 NSImage *img = [this pointerAtIndex:0];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1607 [(NSBrowserCell*)cell setImage:img];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1608 }
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1609 }
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1610 -(BOOL)outlineView:(NSOutlineView )outlineView shouldEditTableColumn:(NSTableColumn )tableColumn item:(id)item { return NO; }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1611 -(void)addTree:(NSPointerArray )item and:(NSPointerArray )parent;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1612 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1613 NSMutableArray *children = data;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1614 if(parent)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1615 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1616 children = [parent pointerAtIndex:3];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1617 if(!children)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1618 {
692 bd909322f40d Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 691 diff changeset	1619 children = [[[NSMutableArray alloc] init] retain];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1620 [parent replacePointerAtIndex:3 withPointer:children];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1621 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1622 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1623 else
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1624 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1625 if(!data)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1626 {
692 bd909322f40d Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 691 diff changeset	1627 children = data = [[[NSMutableArray alloc] init] retain];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1628 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1629 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1630 [children addObject:item];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1631 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1632 -(void *)userdata { return userdata; }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1633 -(void)setUserdata:(void *)input { userdata = input; }
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	1634 -(void)treeSelectionChanged:(id)sender
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	1635 {
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1636 /* Handler for tree class */
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	1637 id item = [self itemAtRow:[self selectedRow]];
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	1638
713 2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	1639 if(item)
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	1640 {
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	1641 _event_handler(self, (void *)item, 12);
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	1642 }
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1643 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1644 -(void)treeItemExpanded:(NSNotification *)notification
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1645 {
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1646 id item = [[notification userInfo ] objectForKey: @"NSObject"];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1647
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1648 if(item)
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1649 {
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1650 _event_handler(self, (void *)item, 16);
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1651 }
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1652 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1653 -(NSMenu )menuForEvent:(NSEvent )event
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1654 {
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1655 int row;
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1656 NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1657 row = (int)[self rowAtPoint:where];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1658 id item = [self itemAtRow:row];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1659 NSString *nstr = [item pointerAtIndex:1];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1660 _event_handler(self, (NSEvent *)[nstr UTF8String], 10);
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1661 return nil;
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	1662 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1663 -(NSScrollView *)scrollview { return scrollview; }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1664 -(void)setScrollview:(NSScrollView *)input { scrollview = input; }
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1665 -(void)deleteNode:(NSPointerArray *)item { _free_tree_recurse(data, item); }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1666 -(void)setForegroundColor:(NSColor *)input
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1667 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1668 NSTextFieldCell *cell = [treecol dataCell];
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1669 fgcolor = input;
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1670 [fgcolor retain];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1671 [cell setTextColor:fgcolor];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1672 }
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1673 -(void)clear { NSMutableArray *toclear = data; data = nil; _free_tree_recurse(toclear, NULL); [self reloadData]; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1674 -(void)dealloc
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1675 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1676 UserData *root = userdata;
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1677 _remove_userdata(&root, NULL, TRUE);
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1678 _free_tree_recurse(data, NULL);
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	1679 [treecol release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1680 [super dealloc];
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	1681 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1682 @end
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1683
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1684 /* Subclass for a Calendar type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1685 @interface DWCalendar : NSDatePicker
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1686 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1687 void *userdata;
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1688 }
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1689 -(void *)userdata;
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1690 -(void)setUserdata:(void *)input;
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1691 @end
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1692
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1693 @implementation DWCalendar
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1694 -(void *)userdata { return userdata; }
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1695 -(void)setUserdata:(void *)input { userdata = input; }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1696 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1697 @end
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1698
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1699 /* Subclass for a Combobox type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1700 @interface DWComboBox : NSComboBox
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	1701 #ifdef BUILDING_FOR_SNOW_LEOPARD
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1702 <NSComboBoxDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1703 #endif
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1704 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1705 void *userdata;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1706 id clickDefault;
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1707 }
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1708 -(void *)userdata;
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1709 -(void)setUserdata:(void *)input;
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1710 -(void)comboBoxSelectionDidChange:(NSNotification *)not;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1711 -(void)setClickDefault:(id)input;
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1712 @end
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1713
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1714 @implementation DWComboBox
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1715 -(void *)userdata { return userdata; }
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1716 -(void)setUserdata:(void *)input { userdata = input; }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1717 -(void)comboBoxSelectionDidChange:(NSNotification )not { _event_handler(self, (void )[self indexOfSelectedItem], 11); }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1718 -(void)setClickDefault:(id)input { clickDefault = input; }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1719 -(void)keyUp:(NSEvent *)theEvent
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1720 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1721 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1722 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1723 [[self window] makeFirstResponder:clickDefault];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1724 } else
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1725 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1726 [super keyUp:theEvent];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1727 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1728 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1729 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1730 @end
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1731
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1732 /* Subclass for a stepper component of the spinbutton type */
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1733 /* This is a bad way of doing this... but I can't get the other methods to work */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1734 @interface DWStepper : NSStepper
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1735 {
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1736 id textfield;
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1737 id parent;
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1738 }
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1739 -(void)setTextfield:(id)input;
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1740 -(id)textfield;
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1741 -(void)setParent:(id)input;
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1742 -(id)parent;
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1743 -(void)mouseDown:(NSEvent *)event;
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1744 -(void)mouseUp:(NSEvent *)event;
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1745 @end
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1746
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1747 @implementation DWStepper
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1748 -(void)setTextfield:(id)input { textfield = input; }
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1749 -(id)textfield { return textfield; }
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1750 -(void)setParent:(id)input { parent = input; }
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1751 -(id)parent { return parent; }
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1752 -(void)mouseDown:(NSEvent *)event
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1753 {
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1754 [super mouseDown:event];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1755 if([[NSApp currentEvent] type] == NSLeftMouseUp)
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1756 {
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1757 [textfield takeIntValueFrom:self];
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1758 _event_handler(parent, (void *)[self integerValue], 14);
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1759 }
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1760 }
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1761 -(void)mouseUp:(NSEvent *)event
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1762 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1763 [textfield takeIntValueFrom:self];
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1764 _event_handler(parent, (void *)[self integerValue], 14);
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1765 }
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1766 @end
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1767
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1768 /* Subclass for a Spinbutton type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1769 @interface DWSpinButton : NSView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	1770 #ifdef BUILDING_FOR_SNOW_LEOPARD
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1771 <NSTextFieldDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1772 #endif
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1773 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1774 void *userdata;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1775 NSTextField *textfield;
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1776 DWStepper *stepper;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1777 id clickDefault;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1778 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1779 -(id)init;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1780 -(void *)userdata;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1781 -(void)setUserdata:(void *)input;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1782 -(NSTextField *)textfield;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1783 -(NSStepper *)stepper;
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1784 -(void)controlTextDidChange:(NSNotification *)aNotification;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1785 -(void)setClickDefault:(id)input;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1786 @end
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1787
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1788 @implementation DWSpinButton
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1789 -(id)init
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1790 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1791 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1792
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1793 if(self)
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1794 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1795 textfield = [[NSTextField alloc] init];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1796 [self addSubview:textfield];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1797 stepper = [[DWStepper alloc] init];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1798 [self addSubview:stepper];
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1799 [stepper setParent:self];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1800 [stepper setTextfield:textfield];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1801 [textfield takeIntValueFrom:stepper];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1802 [textfield setDelegate:self];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1803 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1804 return self;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1805 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1806 -(void *)userdata { return userdata; }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1807 -(void)setUserdata:(void *)input { userdata = input; }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1808 -(NSTextField *)textfield { return textfield; }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1809 -(NSStepper *)stepper { return stepper; }
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1810 -(void)controlTextDidChange:(NSNotification *)aNotification
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1811 {
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1812 [stepper takeIntValueFrom:textfield];
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1813 [textfield takeIntValueFrom:stepper];
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	1814 _event_handler(self, (void *)[stepper integerValue], 14);
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	1815 }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1816 -(void)setClickDefault:(id)input { clickDefault = input; }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1817 -(void)keyUp:(NSEvent *)theEvent
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1818 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1819 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1820 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1821 [[self window] makeFirstResponder:clickDefault];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1822 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1823 else
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1824 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1825 [super keyUp:theEvent];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1826 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1827 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1828 -(void)performClick:(id)sender { [textfield performClick:sender]; }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1829 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1830 @end
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1831
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1832 /* Subclass for a MDI type
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1833 * This is just a box for display purposes... but it is a
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1834 * unique class so it can be identified when creating windows.
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1835 */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1836 @interface DWMDI : DWBox {}
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1837 @end
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1838
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1839 @implementation DWMDI
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1840 @end
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1841
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1842 /* This function adds a signal handler callback into the linked list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1843 */
688 b52f1d4a60dd Fixes for timers not working properly. Includes commented out test container code for threadsafety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 687 diff changeset	1844 void _new_signal(ULONG message, HWND window, int msgid, void signalfunction, void data)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1845 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1846 SignalHandler *new = malloc(sizeof(SignalHandler));
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1847
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1848 new->message = message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1849 new->window = window;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1850 new->id = msgid;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1851 new->signalfunction = signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1852 new->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1853 new->next = NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1854
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1855 if (!Root)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1856 Root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1857 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1858 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1859 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1860 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1861 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1862 if(tmp->message == message &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1863 tmp->window == window &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1864 tmp->id == msgid &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1865 tmp->signalfunction == signalfunction)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1866 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1867 tmp->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1868 free(new);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1869 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1870 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1871 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1872 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1873 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1874 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1875 prev->next = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1876 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1877 Root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1878 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1879 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1880
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1881 /* Finds the message number for a given signal name */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1882 ULONG _findsigmessage(char *signame)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1883 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1884 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1885
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1886 for(z=0;z<SIGNALMAX;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1887 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1888 if(strcasecmp(signame, SignalTranslate[z].name) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1889 return SignalTranslate[z].message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1890 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1891 return 0L;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1892 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1893
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1894 unsigned long _foreground = 0xAAAAAA, _background = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1895
806 16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1896 /* Default border is 5.0 according to the documentation */
16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1897 #define _DW_GROUPBOX_BORDER 5
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	1898
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1899 /* This function calculates how much space the widgets and boxes require
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1900 * and does expansion as necessary.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1901 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1902 static int _resize_box(Box thisbox, int depth, int x, int y, int usedx, int usedy,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1903 int pass, int usedpadx, int usedpady)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1904 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1905 int z, currentx = 0, currenty = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1906 int uymax = 0, uxmax = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1907 int upymax = 0, upxmax = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1908 /* Used for the SIZEEXPAND */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1909 int nux = usedx, nuy = usedy;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1910 int nupx = usedpadx, nupy = usedpady;
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1911 int thispadx = thisbox->pad * 2;
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1912 int thispady = thisbox->pad * 2;
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1913
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1914 /* Handle special groupbox case */
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1915 if(thisbox->grouphwnd)
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1916 {
806 16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1917 DWGroupBox *groupbox = thisbox->grouphwnd;
16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1918 NSRect titleRect;
16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1919
16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1920 /* Get the title size for a more accurate groupbox padding size */
16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1921 titleRect = [groupbox titleRect];
16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1922 thisbox->grouppadx = _DW_GROUPBOX_BORDER * 2;
16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	1923 thisbox->grouppady = (_DW_GROUPBOX_BORDER * 2) + titleRect.size.height;
799 3aa5d0777af2 So after looking at the Windows code... I realized it worked differently than I was thinking... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 798 diff changeset	1924
3aa5d0777af2 So after looking at the Windows code... I realized it worked differently than I was thinking... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 798 diff changeset	1925 (*usedx) += thisbox->grouppadx;
3aa5d0777af2 So after looking at the Windows code... I realized it worked differently than I was thinking... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 798 diff changeset	1926 (*usedpadx) += thisbox->grouppadx;
3aa5d0777af2 So after looking at the Windows code... I realized it worked differently than I was thinking... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 798 diff changeset	1927 (*usedy) += thisbox->grouppady;
3aa5d0777af2 So after looking at the Windows code... I realized it worked differently than I was thinking... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 798 diff changeset	1928 (*usedpady) += thisbox->grouppady;
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1929 }
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1930
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1931 (*usedx) += thispadx;
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1932 (*usedy) += thispady;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1933
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1934 for(z=0;z<thisbox->count;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1935 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1936 if(thisbox->items[z].type == TYPEBOX)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1937 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1938 int initialx, initialy;
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	1939 id box = thisbox->items[z].hwnd;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1940 Box *tmp = [box box];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1941
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1942 initialx = x - (*usedx);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1943 initialy = y - (*usedy);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1944
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1945 if(tmp)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1946 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1947 int newx, newy;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1948 int nux = usedx, nuy = usedy;
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1949 int tmppadx = tmp->pad*2;
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1950 int tmppady = tmp->pad*2;
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	1951 int upx, upy;
3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	1952
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1953 upx = *usedpadx + tmppadx;
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	1954 upy = *usedpady + tmppady;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1955
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1956 /* On the second pass we know how big the box needs to be and how
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1957 * much space we have, so we can calculate a ratio for the new box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1958 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1959 if(pass == 2)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1960 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1961 int deep = *depth + 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1962
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1963 _resize_box(tmp, &deep, x, y, &nux, &nuy, 1, &upx, &upy);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1964
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1965 tmp->upx = upx - *usedpadx;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1966 tmp->upy = upy - *usedpady;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1967
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1968 newx = x - nux;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1969 newy = y - nuy;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1970
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1971 tmp->width = thisbox->items[z].width = initialx - newx;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1972 tmp->height = thisbox->items[z].height = initialy - newy;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1973
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1974 tmp->parentxratio = thisbox->xratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1975 tmp->parentyratio = thisbox->yratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1976
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1977 tmp->parentpad = tmp->pad;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1978
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1979 /* Just in case */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1980 tmp->xratio = thisbox->xratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1981 tmp->yratio = thisbox->yratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1982
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1983 if(thisbox->type == DW_VERT)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1984 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1985 if((thisbox->items[z].width-((thisbox->items[z].pad2)+(tmp->pad2)))!=0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1986 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-((thisbox->items[z].pad2)+(tmp->pad2))))/((float)(thisbox->items[z].width-((thisbox->items[z].pad2)+(tmp->pad2))));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1987 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1988 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1989 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1990 if((thisbox->items[z].width-tmp->upx)!=0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1991 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-tmp->upx))/((float)(thisbox->items[z].width-tmp->upx));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1992 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1993 if(thisbox->type == DW_HORZ)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1994 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1995 if((thisbox->items[z].height-((thisbox->items[z].pad2)+(tmp->pad2)))!=0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1996 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-((thisbox->items[z].pad2)+(tmp->pad2))))/((float)(thisbox->items[z].height-((thisbox->items[z].pad2)+(tmp->pad2))));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1997 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1998 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1999 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2000 if((thisbox->items[z].height-tmp->upy)!=0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2001 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-tmp->upy))/((float)(thisbox->items[z].height-tmp->upy));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2002 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2003
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2004 nux = usedx; nuy = usedy;
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2005 upx = usedpadx + tmppadx; upy = usedpady + tmppady;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2006 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2007
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2008 (*depth)++;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2009
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2010 _resize_box(tmp, depth, x, y, &nux, &nuy, pass, &upx, &upy);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2011
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2012 (*depth)--;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2013
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2014 newx = x - nux;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2015 newy = y - nuy;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2016
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2017 tmp->minwidth = thisbox->items[z].width = initialx - newx;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2018 tmp->minheight = thisbox->items[z].height = initialy - newy;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2019 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2020 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2021
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2022 if(pass > 1 && *depth > 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2023 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2024 if(thisbox->type == DW_VERT)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2025 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2026 if((thisbox->minwidth-((thisbox->items[z].pad2)+(thisbox->parentpad2))) == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2027 thisbox->items[z].xratio = 1.0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2028 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2029 thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-((thisbox->items[z].pad2)+(thisbox->parentpad2))))/((float)(thisbox->minwidth-((thisbox->items[z].pad2)+(thisbox->parentpad2))));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2030 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2031 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2032 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2033 if(thisbox->minwidth-thisbox->upx == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2034 thisbox->items[z].xratio = 1.0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2035 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2036 thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2037 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2038
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2039 if(thisbox->type == DW_HORZ)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2040 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2041 if((thisbox->minheight-((thisbox->items[z].pad2)+(thisbox->parentpad2))) == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2042 thisbox->items[z].yratio = 1.0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2043 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2044 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-((thisbox->items[z].pad2)+(thisbox->parentpad2))))/((float)(thisbox->minheight-((thisbox->items[z].pad2)+(thisbox->parentpad2))));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2045 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2046 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2047 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2048 if(thisbox->minheight-thisbox->upy == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2049 thisbox->items[z].yratio = 1.0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2050 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2051 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2052 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2053
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2054 if(thisbox->items[z].type == TYPEBOX)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2055 {
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	2056 id box = thisbox->items[z].hwnd;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2057 Box *tmp = [box box];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2058
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2059 if(tmp)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2060 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2061 tmp->parentxratio = thisbox->items[z].xratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2062 tmp->parentyratio = thisbox->items[z].yratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2063 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2064 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2065 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2066 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2067 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2068 thisbox->items[z].xratio = thisbox->xratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2069 thisbox->items[z].yratio = thisbox->yratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2070 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2071
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2072 if(thisbox->type == DW_VERT)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2073 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2074 if((thisbox->items[z].width + (thisbox->items[z].pad*2)) > uxmax)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2075 uxmax = (thisbox->items[z].width + (thisbox->items[z].pad*2));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2076 if(thisbox->items[z].hsize != SIZEEXPAND)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2077 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2078 if(((thisbox->items[z].pad*2) + thisbox->items[z].width) > upxmax)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2079 upxmax = (thisbox->items[z].pad*2) + thisbox->items[z].width;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2080 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2081 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2082 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2083 if(thisbox->items[z].pad*2 > upxmax)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2084 upxmax = thisbox->items[z].pad*2;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2085 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2086 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2087 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2088 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2089 if(thisbox->items[z].width == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2090 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2091 /* figure out how much space this item requires */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2092 /* thisbox->items[z].width = */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2093 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2094 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2095 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2096 (usedx) += thisbox->items[z].width + (thisbox->items[z].pad2);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2097 if(thisbox->items[z].hsize != SIZEEXPAND)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2098 (usedpadx) += (thisbox->items[z].pad2) + thisbox->items[z].width;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2099 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2100 (usedpadx) += thisbox->items[z].pad2;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2101 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2102 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2103 if(thisbox->type == DW_HORZ)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2104 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2105 if((thisbox->items[z].height + (thisbox->items[z].pad*2)) > uymax)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2106 uymax = (thisbox->items[z].height + (thisbox->items[z].pad*2));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2107 if(thisbox->items[z].vsize != SIZEEXPAND)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2108 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2109 if(((thisbox->items[z].pad*2) + thisbox->items[z].height) > upymax)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2110 upymax = (thisbox->items[z].pad*2) + thisbox->items[z].height;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2111 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2112 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2113 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2114 if(thisbox->items[z].pad*2 > upymax)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2115 upymax = thisbox->items[z].pad*2;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2116 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2117 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2118 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2119 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2120 if(thisbox->items[z].height == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2121 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2122 /* figure out how much space this item requires */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2123 /* thisbox->items[z].height = */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2124 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2125 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2126 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2127 (usedy) += thisbox->items[z].height + (thisbox->items[z].pad2);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2128 if(thisbox->items[z].vsize != SIZEEXPAND)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2129 (usedpady) += (thisbox->items[z].pad2) + thisbox->items[z].height;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2130 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2131 (usedpady) += thisbox->items[z].pad2;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2132 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2133 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2134 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2135
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2136 (*usedx) += uxmax;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2137 (*usedy) += uymax;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2138 (*usedpadx) += upxmax;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2139 (*usedpady) += upymax;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2140
799 3aa5d0777af2 So after looking at the Windows code... I realized it worked differently than I was thinking... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 798 diff changeset	2141 currentx += thisbox->pad;
3aa5d0777af2 So after looking at the Windows code... I realized it worked differently than I was thinking... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 798 diff changeset	2142 currenty += thisbox->pad;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2143
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2144 /* The second pass is for expansion and actual placement. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2145 if(pass > 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2146 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2147 /* Any SIZEEXPAND items should be set to uxmax/uymax */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2148 for(z=0;z<thisbox->count;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2149 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2150 if(thisbox->items[z].hsize == SIZEEXPAND && thisbox->type == DW_VERT)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2151 thisbox->items[z].width = uxmax-(thisbox->items[z].pad*2);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2152 if(thisbox->items[z].vsize == SIZEEXPAND && thisbox->type == DW_HORZ)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2153 thisbox->items[z].height = uymax-(thisbox->items[z].pad*2);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2154 /* Run this code segment again to finalize the sized after setting uxmax/uymax values. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2155 if(thisbox->items[z].type == TYPEBOX)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2156 {
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	2157 id box = thisbox->items[z].hwnd;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2158 Box *tmp = [box box];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2159
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2160 if(tmp)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2161 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2162 if(*depth > 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2163 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2164 float calcval;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2165
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2166 if(thisbox->type == DW_VERT)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2167 {
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2168 calcval = (float)(tmp->minwidth-((thisbox->items[z].pad*2)+thispadx));
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2169 if(calcval == 0.0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2170 tmp->xratio = thisbox->xratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2171 else
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2172 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-((thisbox->items[z].pad*2)+thispadx)))/calcval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2173 tmp->width = thisbox->items[z].width;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2174 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2175 if(thisbox->type == DW_HORZ)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2176 {
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2177 calcval = (float)(tmp->minheight-((thisbox->items[z].pad*2)+thispady));
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2178 if(calcval == 0.0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2179 tmp->yratio = thisbox->yratio;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2180 else
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2181 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-((thisbox->items[z].pad*2)+thispady)))/calcval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2182 tmp->height = thisbox->items[z].height;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2183 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2184 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2185
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2186 (*depth)++;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2187
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2188 _resize_box(tmp, depth, x, y, &nux, &nuy, 3, &nupx, &nupy);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2189
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2190 (*depth)--;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2191
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2192 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2193 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2194 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2195
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2196 for(z=0;z<(thisbox->count);z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2197 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2198 int height = thisbox->items[z].height;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2199 int width = thisbox->items[z].width;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2200 int pad = thisbox->items[z].pad;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2201 NSView *handle = thisbox->items[z].hwnd;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2202 NSPoint point;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2203 NSSize size;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2204 int vectorx, vectory;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2205
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2206 /* When upxmax != pad2 then ratios are incorrect. /
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2207 vectorx = (int)((width*thisbox->items[z].xratio)-width);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2208 vectory = (int)((height*thisbox->items[z].yratio)-height);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2209
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2210 if(width > 0 && height > 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2211 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2212 /* This is a hack to fix rounding of the sizing */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2213 if(*depth == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2214 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2215 vectorx++;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2216 vectory++;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2217 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2218
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2219 /* If this item isn't going to expand... reset the vectors to 0 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2220 if(thisbox->items[z].vsize != SIZEEXPAND)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2221 vectory = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2222 if(thisbox->items[z].hsize != SIZEEXPAND)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2223 vectorx = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2224
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2225 point.x = currentx + pad;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2226 point.y = currenty + pad;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2227 size.width = width + vectorx;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2228 size.height = height + vectory;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2229 [handle setFrameOrigin:point];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2230 [handle setFrameSize:size];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2231
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2232 /* Special handling for notebook controls */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2233 if([handle isMemberOfClass:[DWNotebook class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2234 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2235 DWNotebook notebook = (DWNotebook )handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2236 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	2237 id view = [notepage view];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2238
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2239 if(view != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2240 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2241 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2242 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2243 _do_resize(box, size.width, size.height);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2244 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2245 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2246 /* Handle laying out scrollviews... if required space is less
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2247 * than available space, then expand. Otherwise use required space.
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2248 */
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2249 else if([handle isMemberOfClass:[DWScrollBox class]])
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2250 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2251 int usedx = 0, usedy = 0, usedpadx = 0, usedpady = 0, depth = 0;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2252 DWScrollBox scrollbox = (DWScrollBox )handle;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2253 DWBox *contentbox = [scrollbox documentView];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2254 Box *thisbox = [contentbox box];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2255 NSSize contentsize = [scrollbox contentSize];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2256
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2257 /* Get the required space for the box */
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2258 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 1, &usedpadx, &usedpady);
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2259
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2260 if(contentsize.width < usedx)
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2261 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2262 contentsize.width = usedx;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2263 }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2264 if(contentsize.height < usedy)
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2265 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2266 contentsize.height = usedy;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2267 }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2268 [contentbox setFrameSize:contentsize];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2269
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2270 /* Layout the content of the scrollbox */
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2271 _do_resize(thisbox, contentsize.width, contentsize.height);
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2272 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2273 /* Special handling for spinbutton controls */
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2274 else if([handle isMemberOfClass:[DWSpinButton class]])
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2275 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2276 DWSpinButton spinbutton = (DWSpinButton )handle;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2277 NSTextField *textfield = [spinbutton textfield];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2278 NSStepper *stepper = [spinbutton stepper];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2279 [textfield setFrameOrigin:NSMakePoint(0,0)];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2280 [textfield setFrameSize:NSMakeSize(size.width-20,size.height)];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2281 [stepper setFrameOrigin:NSMakePoint(size.width-20,0)];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2282 [stepper setFrameSize:NSMakeSize(20,size.height)];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2283 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2284 else if([handle isMemberOfClass:[DWRender class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2285 {
851 5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2286 DWRender render = (DWRender )handle;
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2287 NSSize oldsize = [render size];
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2288 NSSize newsize = [render frame].size;
873 fe7a8dc9392c Dynamically set the video memory backing location, only if there is a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 872 diff changeset	2289 NSWindow *window = [render window];
fe7a8dc9392c Dynamically set the video memory backing location, only if there is a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 872 diff changeset	2290
fe7a8dc9392c Dynamically set the video memory backing location, only if there is a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 872 diff changeset	2291 if([window preferredBackingLocation] != NSWindowBackingLocationVideoMemory)
fe7a8dc9392c Dynamically set the video memory backing location, only if there is a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 872 diff changeset	2292 {
fe7a8dc9392c Dynamically set the video memory backing location, only if there is a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 872 diff changeset	2293 [window setPreferredBackingLocation:NSWindowBackingLocationVideoMemory];
fe7a8dc9392c Dynamically set the video memory backing location, only if there is a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 872 diff changeset	2294 }
851 5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2295
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2296 /* Eliminate duplicate configure requests */
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2297 if(oldsize.width != newsize.width \|\| oldsize.height != newsize.height)
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2298 {
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2299 [render setSize:newsize];
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2300 _event_handler(handle, nil, 1);
5b663261b76c Added code to prevent configure events from being sent with the same size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 850 diff changeset	2301 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2302 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2303 else if([handle isMemberOfClass:[DWSplitBar class]] && size.width > 20 && size.height > 20)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2304 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2305 DWSplitBar split = (DWSplitBar )handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2306 float percent = [split percent];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2307
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2308 if(percent > 0)
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2309 {
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2310 dw_splitbar_set(handle, percent);
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2311 [split setPercent:0];
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2312 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2313 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2314
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2315 if(thisbox->type == DW_HORZ)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2316 currentx += width + vectorx + (pad * 2);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2317 if(thisbox->type == DW_VERT)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2318 currenty += height + vectory + (pad * 2);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2319 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2320 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2321 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2322 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2323 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2324
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2325 static void _do_resize(Box *thisbox, int x, int y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2326 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2327 if(x != 0 && y != 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2328 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2329 if(thisbox)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2330 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2331 int usedx = 0, usedy = 0, usedpadx = 0, usedpady = 0, depth = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2332
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2333 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 1, &usedpadx, &usedpady);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2334
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2335 if(usedx-usedpadx == 0 \|\| usedy-usedpady == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2336 return;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2337
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2338 thisbox->xratio = ((float)(x-usedpadx))/((float)(usedx-usedpadx));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2339 thisbox->yratio = ((float)(y-usedpady))/((float)(usedy-usedpady));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2340
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2341 usedx = usedy = usedpadx = usedpady = depth = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2342
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2343 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 2, &usedpadx, &usedpady);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2344 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2345 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2346 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2347
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2348 NSMenu *_generate_main_menu()
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2349 {
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2350 NSString *applicationName = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2351
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2352 /* This only works on 10.6 so we have a backup method */
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	2353 #ifdef BUILDING_FOR_SNOW_LEOPARD
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2354 applicationName = [[NSRunningApplication currentApplication] localizedName];
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2355 #endif
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2356 if(applicationName == nil)
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2357 {
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2358 applicationName = [[NSProcessInfo processInfo] processName];
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2359 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2360
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2361 /* Create the main menu */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2362 NSMenu * mainMenu = [[[NSMenu alloc] initWithTitle:@"MainMenu"] autorelease];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2363
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2364 NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2365 NSMenu * menu = [[[NSMenu alloc] initWithTitle:@"Apple"] autorelease];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2366
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2367 [DWApp performSelector:@selector(setAppleMenu:) withObject:menu];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2368
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2369 /* Setup the Application menu */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2370 NSMenuItem * item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"About", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2371 action:@selector(orderFrontStandardAboutPanel:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2372 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2373 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2374
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2375 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2376
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2377 item = [menu addItemWithTitle:NSLocalizedString(@"Services", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2378 action:NULL
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2379 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2380 NSMenu * servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2381 [menu setSubmenu:servicesMenu forItem:item];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2382 [DWApp setServicesMenu:servicesMenu];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2383
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2384 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2385
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2386 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Hide", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2387 action:@selector(hide:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2388 keyEquivalent:@"h"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2389 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2390
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2391 item = [menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2392 action:@selector(hideOtherApplications:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2393 keyEquivalent:@"h"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2394 [item setKeyEquivalentModifierMask:NSCommandKeyMask \| NSAlternateKeyMask];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2395 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2396
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2397 item = [menu addItemWithTitle:NSLocalizedString(@"Show All", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2398 action:@selector(unhideAllApplications:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2399 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2400 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2401
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2402 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2403
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2404 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Quit", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2405 action:@selector(terminate:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2406 keyEquivalent:@"q"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2407 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2408
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2409 [mainMenu setSubmenu:menu forItem:mitem];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2410
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2411 return mainMenu;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2412 }
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2413
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2414 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2415 * Runs a message loop for Dynamic Windows.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2416 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2417 void API dw_main(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2418 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2419 dw_mutex_lock(DWRunMutex);
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2420 DWThread = dw_thread_id();
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2421 [DWApp run];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2422 DWThread = (DWTID)-1;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2423 dw_mutex_unlock(DWRunMutex);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2424 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2425
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2426 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2427 * Runs a message loop for Dynamic Windows, for a period of milliseconds.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2428 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2429 * milliseconds: Number of milliseconds to run the loop for.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2430 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2431 void API dw_main_sleep(int milliseconds)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2432 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2433 DWTID curr = pthread_self();
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2434
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2435 if(DWThread == (DWTID)-1 \|\| DWThread == curr)
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2436 {
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2437 DWTID orig = DWThread;
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2438 NSDate *until = [NSDate dateWithTimeIntervalSinceNow:(milliseconds/1000.0)];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2439
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2440 if(orig == (DWTID)-1)
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2441 {
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2442 dw_mutex_lock(DWRunMutex);
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2443 DWThread = curr;
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2444 }
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2445 /* Process any pending events */
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2446 while(_dw_main_iteration(until))
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2447 {
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2448 /* Just loop */
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2449 }
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2450 if(orig == (DWTID)-1)
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2451 {
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2452 DWThread = orig;
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2453 dw_mutex_unlock(DWRunMutex);
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2454 }
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2455 }
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2456 else
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2457 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2458 usleep(milliseconds * 1000);
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2459 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2460 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2461
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2462 /* Internal version that doesn't lock the run mutex */
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2463 int _dw_main_iteration(NSDate *date)
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2464 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2465 NSEvent *event = [DWApp nextEventMatchingMask:NSAnyEventMask
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2466 untilDate:date
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2467 inMode:NSDefaultRunLoopMode
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2468 dequeue:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2469 if(event)
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2470 {
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2471 [DWApp sendEvent:event];
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2472 [DWApp updateWindows];
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2473 return 1;
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2474 }
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	2475 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2476 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2477
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2478 /*
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2479 * Processes a single message iteration and returns.
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2480 */
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2481 void API dw_main_iteration(void)
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2482 {
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2483 DWTID curr = pthread_self();
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2484
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2485 if(DWThread == (DWTID)-1)
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2486 {
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2487 dw_mutex_lock(DWRunMutex);
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2488 DWThread = curr;
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2489 _dw_main_iteration([NSDate distantPast]);
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2490 DWThread = (DWTID)-1;
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2491 dw_mutex_unlock(DWRunMutex);
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2492 }
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2493 else if(DWThread == curr)
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2494 {
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2495 _dw_main_iteration([NSDate distantPast]);
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	2496 }
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2497 }
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2498
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2499 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2500 * Cleanly terminates a DW session, should be signal handler safe.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2501 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2502 * exitcode: Exit code reported to the operating system.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2503 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2504 void API dw_exit(int exitcode)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2505 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2506 exit(exitcode);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2507 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2508
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2509 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2510 * Free's memory allocated by dynamic windows.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2511 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2512 * ptr: Pointer to dynamic windows allocated
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2513 * memory to be free()'d.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2514 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2515 void API dw_free(void *ptr)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2516 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2517 free(ptr);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2518 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2519
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2520 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2521 * Returns a pointer to a static buffer which containes the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2522 * current user directory. Or the root directory (C:\ on
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2523 * OS/2 and Windows).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2524 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2525 char *dw_user_dir(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2526 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2527 static char _user_dir[1024] = "";
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2528
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2529 if(!_user_dir[0])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2530 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2531 char *home = getenv("HOME");
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2532
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2533 if(home)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2534 strcpy(_user_dir, home);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2535 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2536 strcpy(_user_dir, "/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2537 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2538 return _user_dir;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2539 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2540
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2541 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2542 * Displays a Message Box with given text and title..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2543 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2544 * title: The title of the message box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2545 * flags: flags to indicate buttons and icon
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2546 * format: printf style format string.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2547 * ...: Additional variables for use in the format.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2548 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2549 int API dw_messagebox(char title, int flags, char format, ...)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2550 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2551 int iResponse;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2552 NSString *button1 = @"OK";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2553 NSString *button2 = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2554 NSString *button3 = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2555 va_list args;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2556 char outbuf[1000];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2557
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2558 va_start(args, format);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2559 vsprintf(outbuf, format, args);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2560 va_end(args);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2561
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2562 if(flags & DW_MB_OKCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2563 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2564 button2 = @"Cancel";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2565 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2566 else if(flags & DW_MB_YESNO)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2567 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2568 button1 = @"Yes";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2569 button2 = @"No";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2570 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2571 else if(flags & DW_MB_YESNOCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2572 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2573 button1 = @"Yes";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2574 button2 = @"No";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2575 button3 = @"Cancel";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2576 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2577
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2578 if(flags & DW_MB_ERROR)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2579 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2580 iResponse = (int)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2581 NSRunCriticalAlertPanel([ NSString stringWithUTF8String:title ],
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2582 [ NSString stringWithUTF8String:outbuf ],
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2583 button1, button2, button3); }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2584 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2585 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2586 iResponse = (int)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2587 NSRunAlertPanel([ NSString stringWithUTF8String:title ],
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2588 [ NSString stringWithUTF8String:outbuf ],
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2589 button1, button2, button3);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2590 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2591
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2592 switch(iResponse)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2593 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2594 case NSAlertDefaultReturn: /* user pressed OK */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2595 if(flags & DW_MB_YESNO \|\| flags & DW_MB_YESNOCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2596 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2597 return DW_MB_RETURN_YES;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2598 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2599 return DW_MB_RETURN_OK;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2600 case NSAlertAlternateReturn: /* user pressed Cancel */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2601 if(flags & DW_MB_OKCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2602 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2603 return DW_MB_RETURN_CANCEL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2604 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2605 return DW_MB_RETURN_NO;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2606 case NSAlertOtherReturn: /* user pressed the third button */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2607 return DW_MB_RETURN_CANCEL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2608 case NSAlertErrorReturn: /* an error occurred */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2609 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2610 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2611 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2612 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2613
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2614 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2615 * Opens a file dialog and queries user selection.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2616 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2617 * title: Title bar text for dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2618 * defpath: The default path of the open dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2619 * ext: Default file extention.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2620 * flags: DW_FILE_OPEN or DW_FILE_SAVE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2621 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2622 * NULL on error. A malloced buffer containing
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2623 * the file path on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2624 *
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2625 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2626 char * API dw_file_browse(char title, char defpath, char *ext, int flags)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2627 {
825 8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2628 if(flags == DW_FILE_OPEN \|\| flags == DW_DIRECTORY_OPEN)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2629 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2630 /* Create the File Open Dialog class. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2631 NSOpenPanel* openDlg = [NSOpenPanel openPanel];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2632
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2633 /* Enable the selection of files in the dialog. */
825 8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2634 if(flags == DW_FILE_OPEN)
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2635 {
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2636 [openDlg setCanChooseFiles:YES];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2637 [openDlg setCanChooseDirectories:NO];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2638 }
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2639 else
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2640 {
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2641 [openDlg setCanChooseFiles:NO];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2642 [openDlg setCanChooseDirectories:YES];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2643 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2644
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2645 /* Disable multiple selection */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2646 [openDlg setAllowsMultipleSelection:NO];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2647
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2648 /* Display the dialog. If the OK button was pressed,
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2649 * process the files.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2650 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2651 if([openDlg runModal] == NSOKButton)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2652 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2653 /* Get an array containing the full filenames of all
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2654 * files and directories selected.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2655 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2656 NSArray* files = [openDlg filenames];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2657 NSString* fileName = [files objectAtIndex:0];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2658 return strdup([ fileName UTF8String ]);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2659 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2660 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2661 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2662 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2663 /* Create the File Save Dialog class. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2664 NSSavePanel* saveDlg = [NSSavePanel savePanel];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2665
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2666 /* Enable the creation of directories in the dialog. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2667 [saveDlg setCanCreateDirectories:YES];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2668
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2669 /* Display the dialog. If the OK button was pressed,
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2670 * process the files.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2671 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2672 if([saveDlg runModal] == NSFileHandlingPanelOKButton)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2673 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2674 /* Get an array containing the full filenames of all
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2675 * files and directories selected.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2676 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2677 NSString* fileName = [saveDlg filename];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2678 return strdup([ fileName UTF8String ]);
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2679 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2680 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2681
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2682 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2683 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2684
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2685 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2686 * Gets the contents of the default clipboard as text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2687 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2688 * None.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2689 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2690 * Pointer to an allocated string of text or NULL if clipboard empty or contents could not
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2691 * be converted to text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2692 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2693 char *dw_clipboard_get_text()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2694 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2695 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2696 NSString *str = [pasteboard stringForType:NSStringPboardType];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2697 if(str != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2698 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2699 return strdup([ str UTF8String ]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2700 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2701 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2702 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2703
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2704 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2705 * Sets the contents of the default clipboard to the supplied text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2706 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2707 * Text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2708 */
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	2709 void dw_clipboard_set_text( char *str, int len)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	2710 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2711 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2712
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2713 /* Only in Snow Leopard */
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2714 if(DWOSMinor > 5)
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2715 {
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2716 [pasteboard clearContents];
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2717 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2718
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2719 [pasteboard setString:[ NSString stringWithUTF8String:str ] forType:NSStringPboardType];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2720 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2721
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2722
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2723 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2724 * Allocates and initializes a dialog struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2725 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2726 * data: User defined data to be passed to functions.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2727 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2728 DWDialog * API dw_dialog_new(void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2729 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2730 DWDialog *tmp = malloc(sizeof(DWDialog));
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2731
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2732 if(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2733 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2734 tmp->eve = dw_event_new();
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2735 dw_event_reset(tmp->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2736 tmp->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2737 tmp->done = FALSE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2738 tmp->result = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2739 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2740 return tmp;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2741 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2742
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2743 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2744 * Accepts a dialog struct and returns the given data to the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2745 * initial called of dw_dialog_wait().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2746 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2747 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2748 * result: Data to be returned by dw_dialog_wait().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2749 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2750 int API dw_dialog_dismiss(DWDialog dialog, void result)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2751 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2752 dialog->result = result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2753 dw_event_post(dialog->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2754 dialog->done = TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2755 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2756 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2757
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2758 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2759 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2760 * called by a signal handler with the given dialog struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2761 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2762 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2763 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2764 void * API dw_dialog_wait(DWDialog *dialog)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2765 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2766 void *tmp;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2767
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2768 while(!dialog->done)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2769 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2770 _dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2771 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2772 dw_event_close(&dialog->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2773 tmp = dialog->result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2774 free(dialog);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2775 return tmp;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2776 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2777
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2778 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2779 * Create a new Box to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2780 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2781 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2782 * pad: Number of pixels to pad around the box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2783 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2784 HWND API dw_box_new(int type, int pad)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2785 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2786 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2787 DW_MUTEX_LOCK;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2788 DWBox *view = [[DWBox alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2789 Box *newbox = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2790 memset(newbox, 0, sizeof(Box));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2791 newbox->pad = pad;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2792 newbox->type = type;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2793 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2794 return view;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2795 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2796
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2797 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2798 * Create a new Group Box to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2799 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2800 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2801 * pad: Number of pixels to pad around the box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2802 * title: Text to be displayined in the group outline.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2803 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2804 HWND API dw_groupbox_new(int type, int pad, char *title)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2805 {
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	2806 NSBox *groupbox = [[DWGroupBox alloc] init];
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	2807 DWBox *thisbox = dw_box_new(type, pad);
3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	2808 Box *box = [thisbox box];
806 16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	2809
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	2810 [groupbox setBorderType:NSBezelBorder];
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	2811 [groupbox setTitle:[NSString stringWithUTF8String:title]];
806 16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	2812 box->grouphwnd = groupbox;
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	2813 [groupbox setContentView:thisbox];
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	2814 return groupbox;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2815 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2816
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2817 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2818 * Create a new scrollable Box to be packed.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2819 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2820 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2821 * pad: Number of pixels to pad around the box.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2822 */
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	2823 HWND API dw_scrollbox_new( int type, int pad )
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2824 {
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2825 DWScrollBox *scrollbox = [[DWScrollBox alloc] init];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2826 DWBox *box = dw_box_new(type, pad);
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	2827 DWBox *tmpbox = dw_box_new(DW_VERT, 0);
2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	2828 dw_box_pack_start(tmpbox, box, 1, 1, TRUE, TRUE, 0);
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2829 [scrollbox setHasVerticalScroller:YES];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2830 [scrollbox setHasHorizontalScroller:YES];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2831 [scrollbox setBorderType:NSNoBorder];
838 8e0405435d0a Minor scrollbox fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 837 diff changeset	2832 [scrollbox setDrawsBackground:NO];
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	2833 [scrollbox setBox:box];
2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	2834 [scrollbox setDocumentView:tmpbox];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2835 return scrollbox;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2836 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2837
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2838 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2839 * Returns the position of the scrollbar in the scrollbox
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2840 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2841 * handle: Handle to the scrollbox to be queried.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2842 * orient: The vertical or horizontal scrollbar.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2843 */
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	2844 int API dw_scrollbox_get_pos(HWND handle, int orient)
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2845 {
844 5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2846 DWScrollBox *scrollbox = handle;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2847 NSView *view = [scrollbox documentView];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2848 NSSize contentsize = [scrollbox contentSize];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2849 NSScroller *scrollbar;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2850 int range = 0;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2851 int val = 0;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2852 if(orient == DW_VERT)
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2853 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2854 scrollbar = [scrollbox verticalScroller];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2855 range = [view bounds].size.height - contentsize.height;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2856 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2857 else
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2858 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2859 scrollbar = [scrollbox horizontalScroller];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2860 range = [view bounds].size.width - contentsize.width;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2861 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2862 if(range > 0)
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2863 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2864 val = [scrollbar floatValue] * range;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2865 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2866 return val;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2867 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2868
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2869 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2870 * Gets the range for the scrollbar in the scrollbox.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2871 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2872 * handle: Handle to the scrollbox to be queried.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2873 * orient: The vertical or horizontal scrollbar.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2874 */
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2875 int API dw_scrollbox_get_range(HWND handle, int orient)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2876 {
844 5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2877 DWScrollBox *scrollbox = handle;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2878 NSView *view = [scrollbox documentView];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2879 int range = 0;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2880 if(orient == DW_VERT)
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2881 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2882 range = [view bounds].size.height;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2883 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2884 else
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2885 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2886 range = [view bounds].size.width;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2887 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2888 return range;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	2889 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2890
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2891 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2892 * Pack windows (widgets) into a box from the end (or bottom).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2893 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2894 * box: Window handle of the box to be packed into.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2895 * item: Window handle of the item to be back.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2896 * width: Width in pixels of the item or -1 to be self determined.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2897 * height: Height in pixels of the item or -1 to be self determined.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2898 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2899 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2900 * pad: Number of pixels of padding around the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2901 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2902 void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2903 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2904 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2905 DW_MUTEX_LOCK;
838 8e0405435d0a Minor scrollbox fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 837 diff changeset	2906 id object = box;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2907 DWBox *view = box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2908 DWBox *this = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2909 Box *thisbox;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2910 int z;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2911 Item tmpitem, thisitem;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2912
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2913 /* Query the objects */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2914 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2915 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2916 NSWindow *window = box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2917 view = [window contentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2918 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2919 else if([ object isMemberOfClass:[ DWScrollBox class ] ])
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2920 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2921 DWScrollBox *scrollbox = box;
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	2922 view = [scrollbox box];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2923 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2924
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2925 thisbox = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2926 thisitem = thisbox->items;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2927 object = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2928
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2929 /* Query the objects */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2930 if([ object isKindOfClass:[ DWContainer class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2931 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2932 DWContainer *cont = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2933 this = item = [cont scrollview];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2934 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2935 else if([ object isKindOfClass:[ DWTree class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2936 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2937 DWTree *tree = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2938 this = item = [tree scrollview];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2939 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2940
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2941 /* Duplicate the existing data */
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	2942 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	2943
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	2944 for(z=0;z<thisbox->count;z++)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2945 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2946 tmpitem[z+1] = thisitem[z];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2947 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2948
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2949 /* Sanity checks */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2950 if(vsize && !height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2951 height = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2952 if(hsize && !width)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2953 width = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2954
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2955 /* Fill in the item data appropriately */
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	2956 if([object isKindOfClass:[DWBox class]] \|\| [object isMemberOfClass:[DWGroupBox class]])
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2957 tmpitem[0].type = TYPEBOX;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2958 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2959 tmpitem[0].type = TYPEITEM;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2960
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2961 tmpitem[0].hwnd = item;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2962 tmpitem[0].origwidth = tmpitem[0].width = width;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2963 tmpitem[0].origheight = tmpitem[0].height = height;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2964 tmpitem[0].pad = pad;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2965 if(hsize)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2966 tmpitem[0].hsize = SIZEEXPAND;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2967 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2968 tmpitem[0].hsize = SIZESTATIC;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2969
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2970 if(vsize)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2971 tmpitem[0].vsize = SIZEEXPAND;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2972 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2973 tmpitem[0].vsize = SIZESTATIC;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2974
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	2975 thisbox->items = tmpitem;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2976
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2977 /* Update the item count */
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	2978 thisbox->count++;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2979
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2980 /* Add the item to the box */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2981 [view addSubview:this];
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2982 /* If we are packing a button... */
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2983 if([this isMemberOfClass:[DWButton class]])
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2984 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2985 DWButton button = (DWButton )this;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2986
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2987 /* Save the parent box so radio
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2988 * buttons can use it later.
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2989 */
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2990 [button setParent:view];
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	2991 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2992
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2993 /* Free the old data */
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	2994 if(thisbox->count)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2995 free(thisitem);
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2996 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2997 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2998
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2999 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3000 * Pack windows (widgets) into a box from the start (or top).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3001 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3002 * box: Window handle of the box to be packed into.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3003 * item: Window handle of the item to be back.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3004 * width: Width in pixels of the item or -1 to be self determined.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3005 * height: Height in pixels of the item or -1 to be self determined.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3006 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3007 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3008 * pad: Number of pixels of padding around the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3009 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3010 void API dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3011 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3012 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3013 DW_MUTEX_LOCK;
838 8e0405435d0a Minor scrollbox fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 837 diff changeset	3014 id object = box;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3015 DWBox *view = box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3016 DWBox *this = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3017 Box *thisbox;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3018 int z;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3019 Item tmpitem, thisitem;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3020
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3021 /* Query the objects */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3022 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3023 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3024 NSWindow *window = box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3025 view = [window contentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3026 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3027 else if([ object isMemberOfClass:[ DWScrollBox class ] ])
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3028 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3029 DWScrollBox *scrollbox = box;
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	3030 view = [scrollbox box];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3031 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3032
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3033 thisbox = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3034 thisitem = thisbox->items;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3035 object = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3036
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3037 /* Query the objects */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3038 if([ object isKindOfClass:[ DWContainer class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3039 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3040 DWContainer *cont = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3041 this = item = [cont scrollview];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3042 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3043 else if([ object isKindOfClass:[ DWTree class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3044 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3045 DWTree *tree = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3046 this = item = [tree scrollview];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3047 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3048
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3049 /* Duplicate the existing data */
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3050 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3051
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3052 for(z=0;z<thisbox->count;z++)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3053 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3054 tmpitem[z] = thisitem[z];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3055 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3056
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3057 /* Sanity checks */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3058 if(vsize && !height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3059 height = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3060 if(hsize && !width)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3061 width = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3062
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3063 /* Fill in the item data appropriately */
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	3064 if([object isKindOfClass:[DWBox class]] \|\| [object isMemberOfClass:[DWGroupBox class]])
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3065 tmpitem[thisbox->count].type = TYPEBOX;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3066 else
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3067 tmpitem[thisbox->count].type = TYPEITEM;
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3068
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3069 tmpitem[thisbox->count].hwnd = item;
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3070 tmpitem[thisbox->count].origwidth = tmpitem[thisbox->count].width = width;
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3071 tmpitem[thisbox->count].origheight = tmpitem[thisbox->count].height = height;
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3072 tmpitem[thisbox->count].pad = pad;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3073 if(hsize)
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3074 tmpitem[thisbox->count].hsize = SIZEEXPAND;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3075 else
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3076 tmpitem[thisbox->count].hsize = SIZESTATIC;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3077
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3078 if(vsize)
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3079 tmpitem[thisbox->count].vsize = SIZEEXPAND;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3080 else
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3081 tmpitem[thisbox->count].vsize = SIZESTATIC;
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3082
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3083 thisbox->items = tmpitem;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3084
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3085 /* Update the item count */
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3086 thisbox->count++;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3087
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3088 /* Add the item to the box */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3089 [view addSubview:this];
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3090 /* If we are packing a button... */
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3091 if([this isMemberOfClass:[DWButton class]])
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3092 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3093 DWButton button = (DWButton )this;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3094
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3095 /* Save the parent box so radio
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3096 * buttons can use it later.
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3097 */
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3098 [button setParent:view];
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	3099 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3100
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3101 /* Free the old data */
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3102 if(thisbox->count)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3103 free(thisitem);
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3104 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3105 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3106
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3107 HWND _button_new(char *text, ULONG cid)
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3108 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3109 DWButton *button = [[DWButton alloc] init];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3110 if(text && *text)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3111 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3112 [button setTitle:[ NSString stringWithUTF8String:text ]];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3113 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3114 [button setTarget:button];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3115 [button setAction:@selector(buttonClicked:)];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3116 [button setTag:cid];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3117 [button setButtonType:NSMomentaryPushInButton];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3118 [button setBezelStyle:NSThickerSquareBezelStyle];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3119 if(DWDefaultFont)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3120 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3121 [[button cell] setFont:DWDefaultFont];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3122 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3123 return button;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3124 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3125
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3126 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3127 * Create a new button window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3128 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3129 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3130 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3131 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3132 HWND API dw_button_new(char *text, ULONG cid)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3133 {
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3134 DWButton *button = _button_new(text, cid);
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3135 [button setButtonType:NSMomentaryPushInButton];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3136 [button setBezelStyle:NSRoundedBezelStyle];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3137 [button setImagePosition:NSNoImage];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3138 [button setAlignment:NSCenterTextAlignment];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3139 [[button cell] setControlTint:NSBlueControlTint];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3140 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3141 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3142
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3143 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3144 * Create a new Entryfield window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3145 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3146 * text: The default text to be in the entryfield widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3147 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3148 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3149 HWND API dw_entryfield_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3150 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3151 DWEntryField *entry = [[DWEntryField alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3152 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3153 [entry setTag:cid];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3154 return entry;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3155 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3156
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3157 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3158 * Create a new Entryfield (password) window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3159 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3160 * text: The default text to be in the entryfield widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3161 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3162 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3163 HWND API dw_entryfield_password_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3164 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3165 DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3166 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3167 [entry setTag:cid];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3168 return entry;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3169 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3170
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3171 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3172 * Sets the entryfield character limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3173 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3174 * handle: Handle to the spinbutton to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3175 * limit: Number of characters the entryfield will take.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3176 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3177 void API dw_entryfield_set_limit(HWND handle, ULONG limit)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3178 {
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	3179 DWEntryField *entry = handle;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	3180 DWEntryFieldFormatter *formatter = [[DWEntryFieldFormatter alloc] init];
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	3181
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	3182 [formatter setMaximumLength:(int)limit];
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	3183 [[entry cell] setFormatter:formatter];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3184 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3185
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3186 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3187 * Create a new bitmap button window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3188 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3189 * text: Bubble help text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3190 * id: An ID of a bitmap in the resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3191 */
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3192 HWND API dw_bitmapbutton_new(char *text, ULONG resid)
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3193 {
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3194 NSBundle *bundle = [NSBundle mainBundle];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3195 NSString *respath = [bundle resourcePath];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3196 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3197 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3198 DWButton *button = _button_new("", resid);
748 f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3199 if(image)
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3200 {
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3201 [button setImage:image];
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3202 }
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3203 [button setToolTip:[NSString stringWithUTF8String:text]];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3204 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3205 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3206 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3207
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3208 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3209 * Create a new bitmap button window (widget) to be packed from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3210 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3211 * text: Bubble help text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3212 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3213 * filename: Name of the file, omit extention to have
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3214 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3215 * (BMP on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3216 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3217 HWND API dw_bitmapbutton_new_from_file(char text, unsigned long cid, char filename)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3218 {
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	3219 NSString *nstr = [ NSString stringWithUTF8String:filename ];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	3220 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	3221 if(!image)
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	3222 {
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	3223 nstr = [nstr stringByAppendingString:@".png"];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	3224 image = [[NSImage alloc] initWithContentsOfFile:nstr];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	3225 }
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3226 DWButton *button = _button_new("", cid);
748 f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3227 if(image)
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3228 {
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3229 [button setImage:image];
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3230 }
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3231 [button setToolTip:[NSString stringWithUTF8String:text]];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3232 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3233 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3234 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3235
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3236 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3237 * Create a new bitmap button window (widget) to be packed from data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3238 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3239 * text: Bubble help text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3240 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3241 * data: The contents of the image
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3242 * (BMP or ICO on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3243 * len: length of str
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3244 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3245 HWND API dw_bitmapbutton_new_from_data(char text, unsigned long cid, char data, int len)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3246 {
760 2fb17622a455 Possible fix for exception in dw_bitmapbutton_new_from_data() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 755 diff changeset	3247 NSData *thisdata = [NSData dataWithBytes:data length:len];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3248 NSImage *image = [[NSImage alloc] initWithData:thisdata];
9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3249 DWButton *button = _button_new("", cid);
748 f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3250 if(image)
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3251 {
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3252 [button setImage:image];
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3253 }
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	3254 [button setToolTip:[NSString stringWithUTF8String:text]];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3255 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3256 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3257 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3258
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3259 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3260 * Create a new spinbutton window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3261 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3262 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3263 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3264 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3265 HWND API dw_spinbutton_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3266 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3267 DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3268 NSStepper *stepper = [spinbutton stepper];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3269 [stepper setIncrement:1];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3270 [stepper setTag:cid];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3271 return spinbutton;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3272 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3273
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3274 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3275 * Sets the spinbutton value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3276 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3277 * handle: Handle to the spinbutton to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3278 * position: Current value of the spinbutton.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3279 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3280 void API dw_spinbutton_set_pos(HWND handle, long position)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3281 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3282 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3283 NSStepper *stepper = [spinbutton stepper];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3284 NSTextField *textfield = [spinbutton textfield];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3285 [stepper setIntValue:(int)position];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3286 [textfield takeIntValueFrom:stepper];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3287 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3288
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3289 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3290 * Sets the spinbutton limits.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3291 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3292 * handle: Handle to the spinbutton to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3293 * upper: Upper limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3294 * lower: Lower limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3295 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3296 void API dw_spinbutton_set_limits(HWND handle, long upper, long lower)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3297 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3298 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3299 NSStepper *stepper = [spinbutton stepper];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3300 [stepper setMinValue:(double)lower];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3301 [stepper setMaxValue:(double)upper];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3302 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3303
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3304 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3305 * Returns the current value of the spinbutton.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3306 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3307 * handle: Handle to the spinbutton to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3308 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3309 long API dw_spinbutton_get_pos(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3310 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3311 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3312 NSStepper *stepper = [spinbutton stepper];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3313 return (long)[stepper integerValue];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3314 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3315
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3316 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3317 * Create a new radiobutton window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3318 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3319 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3320 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3321 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3322 HWND API dw_radiobutton_new(char *text, ULONG cid)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3323 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3324 DWButton *button = _button_new(text, cid);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3325 [button setButtonType:NSRadioButton];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3326 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3327 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3328
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3329 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3330 * Create a new slider window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3331 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3332 * vertical: TRUE or FALSE if slider is vertical.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3333 * increments: Number of increments available.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3334 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3335 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3336 HWND API dw_slider_new(int vertical, int increments, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3337 {
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3338 DWSlider *slider = [[DWSlider alloc] init];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3339 [slider setMaxValue:(double)increments];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3340 [slider setMinValue:0];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3341 [slider setContinuous:YES];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3342 [slider setTarget:slider];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3343 [slider setAction:@selector(sliderChanged:)];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3344 [slider setTag:cid];
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3345 return slider;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3346 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3347
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3348 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3349 * Returns the position of the slider.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3350 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3351 * handle: Handle to the slider to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3352 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3353 unsigned int API dw_slider_get_pos(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3354 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3355 DWSlider *slider = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3356 double val = [slider doubleValue];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3357 return (int)val;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3358 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3359
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3360 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3361 * Sets the slider position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3362 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3363 * handle: Handle to the slider to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3364 * position: Position of the slider withing the range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3365 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3366 void API dw_slider_set_pos(HWND handle, unsigned int position)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3367 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3368 DWSlider *slider = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3369 [slider setDoubleValue:(double)position];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3370 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3371
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3372 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3373 * Create a new scrollbar window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3374 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3375 * vertical: TRUE or FALSE if scrollbar is vertical.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3376 * increments: Number of increments available.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3377 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3378 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3379 HWND API dw_scrollbar_new(int vertical, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3380 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3381 DWScrollbar *scrollbar;
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3382 if(vertical)
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3383 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3384 scrollbar = [[DWScrollbar alloc] init];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3385 }
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3386 else
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3387 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3388 scrollbar = [[DWScrollbar alloc] initWithFrame:NSMakeRect(0,0,100,5)];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3389 }
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3390 [scrollbar setArrowsPosition:NSScrollerArrowsDefaultSetting];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3391 [scrollbar setTarget:scrollbar];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3392 [scrollbar setAction:@selector(changed:)];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3393 [scrollbar setRange:0.0 andVisible:0.0];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3394 [scrollbar setKnobProportion:1.0];
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3395 [scrollbar setTarget:scrollbar];
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3396 [scrollbar setAction:@selector(scrollerChanged:)];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3397 [scrollbar setTag:cid];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3398 [scrollbar setEnabled:YES];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3399 return scrollbar;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3400 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3401
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3402 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3403 * Returns the position of the scrollbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3404 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3405 * handle: Handle to the scrollbar to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3406 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3407 unsigned int API dw_scrollbar_get_pos(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3408 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3409 DWScrollbar *scrollbar = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3410 float range = [scrollbar range];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3411 float fresult = [scrollbar doubleValue] * range;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3412 return (int)fresult;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3413 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3414
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3415 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3416 * Sets the scrollbar position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3417 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3418 * handle: Handle to the scrollbar to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3419 * position: Position of the scrollbar withing the range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3420 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3421 void API dw_scrollbar_set_pos(HWND handle, unsigned int position)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3422 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3423 DWScrollbar *scrollbar = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3424 double range = (double)[scrollbar range];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3425 double newpos = (double)position/range;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3426 [scrollbar setDoubleValue:newpos];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3427 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3428
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3429 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3430 * Sets the scrollbar range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3431 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3432 * handle: Handle to the scrollbar to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3433 * range: Maximum range value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3434 * visible: Visible area relative to the range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3435 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3436 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3437 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3438 DWScrollbar *scrollbar = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3439 float knob = (float)visible/(float)range;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3440 [scrollbar setRange:(float)range andVisible:(float)visible];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3441 [scrollbar setKnobProportion:knob];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3442 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3443
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3444 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3445 * Create a new percent bar window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3446 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3447 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3448 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3449 HWND API dw_percent_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3450 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3451 DWPercent *percent = [[DWPercent alloc] init];
714 cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	3452 [percent setStyle:NSProgressIndicatorBarStyle];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3453 [percent setBezeled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3454 [percent setMaxValue:100];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3455 [percent setMinValue:0];
714 cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	3456 [percent incrementBy:1];
cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	3457 [percent setIndeterminate:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3458 /[percent setTag:cid]; Why doesn't this work? /
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3459 return percent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3460 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3461
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3462 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3463 * Sets the percent bar position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3464 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3465 * handle: Handle to the percent bar to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3466 * position: Position of the percent bar withing the range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3467 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3468 void API dw_percent_set_pos(HWND handle, unsigned int position)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3469 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3470 DWPercent *percent = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3471 [percent setDoubleValue:(double)position];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3472 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3473
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3474 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3475 * Create a new checkbox window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3476 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3477 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3478 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3479 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3480 HWND API dw_checkbox_new(char *text, ULONG cid)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3481 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3482 DWButton *button = _button_new(text, cid);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3483 [button setButtonType:NSSwitchButton];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3484 [button setBezelStyle:NSRegularSquareBezelStyle];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3485 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3486 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3487
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3488 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3489 * Returns the state of the checkbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3490 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3491 * handle: Handle to the checkbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3492 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3493 int API dw_checkbox_get(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3494 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3495 DWButton *button = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3496 if([button state])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3497 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3498 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3499 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3500 return FALSE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3501 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3502
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3503 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3504 * Sets the state of the checkbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3505 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3506 * handle: Handle to the checkbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3507 * value: TRUE for checked, FALSE for unchecked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3508 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3509 void API dw_checkbox_set(HWND handle, int value)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3510 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3511 DWButton *button = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3512 if(value)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3513 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3514 [button setState:NSOnState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3515 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3516 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3517 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3518 [button setState:NSOffState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3519 }
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3520
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3521 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3522
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	3523 /* Common code for containers and listboxes */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3524 HWND _cont_new(ULONG cid, int multi)
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	3525 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3526 NSScrollView *scrollview = [[NSScrollView alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3527 DWContainer *cont = [[DWContainer alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3528
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3529 [cont setScrollview:scrollview];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3530 [scrollview setBorderType:NSBezelBorder];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3531 [scrollview setHasVerticalScroller:YES];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3532 [scrollview setAutohidesScrollers:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3533
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3534 if(multi)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3535 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3536 [cont setAllowsMultipleSelection:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3537 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3538 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3539 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3540 [cont setAllowsMultipleSelection:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3541 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3542 [cont setDataSource:cont];
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	3543 [cont setDelegate:cont];
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3544 [scrollview setDocumentView:cont];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3545 [cont setTag:cid];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3546 [scrollview release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3547 return cont;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	3548 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	3549
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3550 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3551 * Create a new listbox window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3552 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3553 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3554 * multi: Multiple select TRUE or FALSE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3555 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3556 HWND API dw_listbox_new(ULONG cid, int multi)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3557 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3558 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3559 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3560 DWContainer *cont = _cont_new(cid, multi);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3561 [cont setHeaderView:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3562 int type = DW_CFA_STRING;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3563 [cont setup];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3564 NSTableColumn *column = [[NSTableColumn alloc] init];
795 f23cad02cfb3 Make listbox, container and tree cells uneditable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 794 diff changeset	3565 [column setEditable:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3566 [cont addTableColumn:column];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3567 [cont addColumn:column andType:type];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3568 [column release];
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3569 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3570 return cont;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3571 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3572
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3573 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3574 * Appends the specified text to the listbox's (or combobox) entry list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3575 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3576 * handle: Handle to the listbox to be appended to.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3577 * text: Text to append into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3578 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3579 void API dw_listbox_append(HWND handle, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3580 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3581 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3582 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3583 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3584
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3585 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3586 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3587 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3588
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3589 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3590 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3591 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3592 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3593 DWContainer *cont = handle;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3594 NSString *nstr = [ NSString stringWithUTF8String:text ];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3595 NSArray *newrow = [NSArray arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3596
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3597 [cont addRow:newrow];
688 b52f1d4a60dd Fixes for timers not working properly. Includes commented out test container code for threadsafety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 687 diff changeset	3598 /*[cont performSelectorOnMainThread:@selector(addRow:)
b52f1d4a60dd Fixes for timers not working properly. Includes commented out test container code for threadsafety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 687 diff changeset	3599 withObject:newrow
b52f1d4a60dd Fixes for timers not working properly. Includes commented out test container code for threadsafety. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 687 diff changeset	3600 waitUntilDone:YES];*/
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3601 [cont reloadData];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	3602 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3603 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3604 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3605 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3606
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3607 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3608 * Inserts the specified text into the listbox's (or combobox) entry list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3609 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3610 * handle: Handle to the listbox to be inserted into.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3611 * text: Text to insert into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3612 * pos: 0-based position to insert text
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3613 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3614 void API dw_listbox_insert(HWND handle, char *text, int pos)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3615 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3616 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3617 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3618 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3619
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3620 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3621 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3622 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3623
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3624 [combo insertItemWithObjectValue:[ NSString stringWithUTF8String:text ] atIndex:pos];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3625 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3626 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3627 {
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3628 DWContainer *cont = handle;
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3629 NSString *nstr = [ NSString stringWithUTF8String:text ];
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3630 NSArray *newrow = [NSArray arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3631
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3632 [cont insertRow:newrow at:pos];
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3633 [cont reloadData];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	3634 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3635 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3636 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3637 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3638
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3639 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3640 * Appends the specified text items to the listbox's (or combobox) entry list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3641 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3642 * handle: Handle to the listbox to be appended to.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3643 * text: Text strings to append into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3644 * count: Number of text strings to append
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3645 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3646 void API dw_listbox_list_append(HWND handle, char **text, int count)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3647 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3648 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3649 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3650 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3651
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3652 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3653 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3654 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3655 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3656
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3657 for(z=0;z<count;z++)
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3658 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3659 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text[z] ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3660 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3661 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3662 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3663 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3664 DWContainer *cont = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3665 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3666
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3667 for(z=0;z<count;z++)
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3668 {
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3669 NSString *nstr = [ NSString stringWithUTF8String:text[z] ];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3670 NSArray *newrow = [[NSArray alloc] arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3671
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3672 [cont addRow:newrow];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3673 }
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3674 [cont reloadData];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	3675 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3676 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3677 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3678 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3679
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3680 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3681 * Clears the listbox's (or combobox) list of all entries.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3682 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3683 * handle: Handle to the listbox to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3684 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3685 void API dw_listbox_clear(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3686 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3687 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3688 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3689 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3690
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3691 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3692 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3693 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3694
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3695 [combo removeAllItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3696 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3697 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3698 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3699 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3700
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3701 [cont clear];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3702 [cont reloadData];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	3703 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3704 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3705 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3706 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3707
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3708 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3709 * Returns the listbox's item count.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3710 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3711 * handle: Handle to the listbox to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3712 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3713 int API dw_listbox_count(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3714 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3715 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3716
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3717 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3718 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3719 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3720
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3721 return (int)[combo numberOfItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3722 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3723 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3724 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3725 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3726 DW_MUTEX_LOCK;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3727 DWContainer *cont = handle;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3728 int result = (int)[cont numberOfRowsInTableView:cont];
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3729 DW_MUTEX_UNLOCK;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3730 return result;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3731 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3732 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3733 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3734
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3735 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3736 * Sets the topmost item in the viewport.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3737 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3738 * handle: Handle to the listbox to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3739 * top: Index to the top item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3740 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3741 void API dw_listbox_set_top(HWND handle, int top)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3742 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3743 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3744 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3745 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3746
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3747 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3748 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3749 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3750
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3751 [combo scrollItemAtIndexToTop:top];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3752 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3753 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3754 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3755 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3756
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3757 [cont scrollRowToVisible:top];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3758 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3759 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3760 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3761
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3762 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3763 * Copies the given index item's text into buffer.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3764 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3765 * handle: Handle to the listbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3766 * index: Index into the list to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3767 * buffer: Buffer where text will be copied.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3768 * length: Length of the buffer (including NULL).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3769 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3770 void API dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3771 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3772 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3773 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3774 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3775
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3776 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3777 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3778 DWComboBox *combo = handle;
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3779 int count = (int)[combo numberOfItems];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3780
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3781 if(index > count)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3782 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3783 *buffer = '\0';
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3784 }
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3785 else
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3786 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3787 NSString *nstr = [combo itemObjectValueAtIndex:index];
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3788 strncpy(buffer, [ nstr UTF8String ], length - 1);
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3789 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3790 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3791 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3792 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3793 DWContainer *cont = handle;
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3794 int count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3795
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3796 if(index > count)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3797 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3798 *buffer = '\0';
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3799 }
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3800 else
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3801 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3802 NSString *nstr = [cont getRow:index and:0];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3803
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3804 strncpy(buffer, [ nstr UTF8String ], length - 1);
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3805 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3806 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3807 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3808 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3809
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3810 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3811 * Sets the text of a given listbox entry.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3812 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3813 * handle: Handle to the listbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3814 * index: Index into the list to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3815 * buffer: Buffer where text will be copied.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3816 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3817 void API dw_listbox_set_text(HWND handle, unsigned int index, char *buffer)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3818 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3819 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3820 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3821 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3822
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3823 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3824 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3825 DWComboBox *combo = handle;
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3826 int count = (int)[combo numberOfItems];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3827
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3828 if(index <= count)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3829 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3830 [combo removeItemAtIndex:index];
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3831 [combo insertItemWithObjectValue:[ NSString stringWithUTF8String:buffer ] atIndex:index];
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3832 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3833 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3834 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3835 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3836 DWContainer *cont = handle;
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3837 int count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3838
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3839 if(index <= count)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3840 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3841 NSString *nstr = [ NSString stringWithUTF8String:buffer ];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3842
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3843 [cont editCell:nstr at:index and:0];
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3844 [cont reloadData];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	3845 [cont setNeedsDisplay:YES];
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	3846 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3847 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3848 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3849 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3850
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3851 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3852 * Returns the index to the item in the list currently selected.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3853 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3854 * handle: Handle to the listbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3855 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3856 unsigned int API dw_listbox_selected(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3857 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3858 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3859
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3860 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3861 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3862 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3863 return (int)[combo indexOfSelectedItem];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3864 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3865 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3866 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3867 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3868 DW_MUTEX_LOCK;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3869 DWContainer *cont = handle;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3870 int result = (int)[cont selectedRow];
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3871 DW_MUTEX_UNLOCK;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3872 return result;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3873 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3874 return -1;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3875 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3876
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3877 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3878 * Returns the index to the current selected item or -1 when done.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3879 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3880 * handle: Handle to the listbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3881 * where: Either the previous return or -1 to restart.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3882 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883 int API dw_listbox_selected_multi(HWND handle, int where)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3885 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3886 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3887 id object = handle;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3888 int retval = -1;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3889
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3890 if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3891 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3892 DWContainer *cont = handle;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3893 NSIndexSet *selected = [cont selectedRowIndexes];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3894 NSUInteger result = [selected indexGreaterThanIndex:where];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3895
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3896 if(result != NSNotFound)
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3897 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3898 retval = (int)result;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3899 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3900 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3901 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3902 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3903 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3904
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3905 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3906 * Sets the selection state of a given index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3907 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3908 * handle: Handle to the listbox to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3909 * index: Item index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3910 * state: TRUE if selected FALSE if unselected.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3911 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3912 void API dw_listbox_select(HWND handle, int index, int state)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3913 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3914 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3915 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3916 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3917
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3918 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3919 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3920 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3921 if(state)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3922 [combo selectItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3923 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3924 [combo deselectItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3925 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3926 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3927 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3928 DWContainer *cont = handle;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3929 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)index];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3930
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3931 [cont selectRowIndexes:selected byExtendingSelection:YES];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3932 [selected release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3933 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3934 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3935 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3936
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3937 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3938 * Deletes the item with given index from the list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3939 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3940 * handle: Handle to the listbox to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3941 * index: Item index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3942 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3943 void API dw_listbox_delete(HWND handle, int index)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3944 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3945 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3946 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3947 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3948
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3949 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3950 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3951 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3952
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3953 [combo removeItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3954 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3955 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3956 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3957 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3958
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3959 [cont removeRow:index];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3960 [cont reloadData];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	3961 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3962 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3963 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3964 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3965
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3966 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3967 * Create a new Combobox window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3968 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3969 * text: The default text to be in the combpbox widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3970 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3971 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3972 HWND API dw_combobox_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3973 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3974 DWComboBox *combo = [[DWComboBox alloc] init];
804 5b4a831af8fa Fix for dw_combobox_new() not setting the default text in the entryfield. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 803 diff changeset	3975 [combo setStringValue:[NSString stringWithUTF8String:text]];
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	3976 [combo setDelegate:combo];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3977 [combo setTag:cid];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3978 return combo;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3979 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3980
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3981 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3982 * Create a new Multiline Editbox window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3983 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3984 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3985 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3986 HWND API dw_mle_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3987 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3988 DWMLE *mle = [[DWMLE alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3989 NSScrollView *scrollview = [[NSScrollView alloc] init];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3990
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	3991 [scrollview setBorderType:NSBezelBorder];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	3992 [scrollview setHasVerticalScroller:YES];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	3993 [scrollview setAutohidesScrollers:YES];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	3994 [scrollview setAutoresizingMask:NSViewWidthSizable\|NSViewHeightSizable];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	3995 [scrollview setDocumentView:mle];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	3996 [mle setAutoresizingMask:NSViewWidthSizable];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3997 /* [mle setTag:cid]; Why doesn't this work? */
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3998 [mle release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3999 return scrollview;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4000 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4001
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4002 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4003 * Adds text to an MLE box and returns the current point.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4004 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4005 * handle: Handle to the MLE to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4006 * buffer: Text buffer to be imported.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4007 * startpoint: Point to start entering text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4008 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4009 unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4010 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4011 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4012 DWMLE *mle = [sv documentView];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4013 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4014 NSString *nstr = [NSString stringWithUTF8String:buffer];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4015 NSMutableString *ms = [ts mutableString];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4016 [ms insertString:nstr atIndex:(startpoint+1)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4017 return (unsigned int)strlen(buffer) + startpoint;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4018 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4019
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4020 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4021 * Grabs text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4022 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4023 * handle: Handle to the MLE to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4024 * buffer: Text buffer to be exported.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4025 * startpoint: Point to start grabbing text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4026 * length: Amount of text to be grabbed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4028 void API dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4029 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4030 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4031 DWMLE *mle = [sv documentView];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4032 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4033 NSMutableString *ms = [ts mutableString];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4034 strncpy(buffer, [ms UTF8String], length);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4035 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4036
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4037 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4038 * Obtains information about an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4039 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4040 * handle: Handle to the MLE to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4041 * bytes: A pointer to a variable to return the total bytes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4042 * lines: A pointer to a variable to return the number of lines.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4043 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4044 void API dw_mle_get_size(HWND handle, unsigned long bytes, unsigned long lines)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4045 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4046 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4047 DWMLE *mle = [sv documentView];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4048 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4049 NSMutableString *ms = [ts mutableString];
807 f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4050 NSUInteger numberOfLines, index, stringLength = [ms length];
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4051
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4052 for(index=0, numberOfLines=0; index < stringLength; numberOfLines++)
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4053 index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]);
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4054
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4055 *bytes = stringLength;
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4056 *lines = numberOfLines;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4057 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4058
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4059 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4060 * Deletes text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4061 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4062 * handle: Handle to the MLE to be deleted from.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4063 * startpoint: Point to start deleting text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4064 * length: Amount of text to be deleted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4065 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4066 void API dw_mle_delete(HWND handle, int startpoint, int length)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4067 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4068 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4069 DWMLE *mle = [sv documentView];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4070 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4071 NSMutableString *ms = [ts mutableString];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4072 [ms deleteCharactersInRange:NSMakeRange(startpoint+1, length)];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4073 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4074
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4075 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4076 * Clears all text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4077 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4078 * handle: Handle to the MLE to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4079 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4080 void API dw_mle_clear(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4081 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4082 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4083 DWMLE *mle = [sv documentView];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4084 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4085 NSMutableString *ms = [ts mutableString];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4086 NSUInteger length = [ms length];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4087 [ms deleteCharactersInRange:NSMakeRange(0, length)];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4088 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4089
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4090 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4091 * Sets the visible line of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4092 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4093 * handle: Handle to the MLE to be positioned.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4094 * line: Line to be visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4095 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4096 void API dw_mle_set_visible(HWND handle, int line)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4097 {
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4098 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4099 DWMLE *mle = [sv documentView];
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4100 NSTextStorage *ts = [mle textStorage];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4101 NSMutableString *ms = [ts mutableString];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4102 NSUInteger numberOfLines, index, stringLength = [ms length];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4103
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4104 for(index=0, numberOfLines=0; index < stringLength && numberOfLines < line; numberOfLines++)
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4105 index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]);
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4106
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4107 if(line == numberOfLines)
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4108 {
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4109 [mle scrollRangeToVisible:[ms lineRangeForRange:NSMakeRange(index, 0)]];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4110 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4111 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4112
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4113 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4114 * Sets the editablity of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4115 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4116 * handle: Handle to the MLE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4117 * state: TRUE if it can be edited, FALSE for readonly.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4118 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4119 void API dw_mle_set_editable(HWND handle, int state)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4120 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4121 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4122 DWMLE *mle = [sv documentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4123 if(state)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4124 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4125 [mle setEditable:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4126 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4127 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4128 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4129 [mle setEditable:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4130 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4131 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4132
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4133 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4134 * Sets the word wrap state of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4135 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4136 * handle: Handle to the MLE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4137 * state: TRUE if it wraps, FALSE if it doesn't.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4138 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4139 void API dw_mle_set_word_wrap(HWND handle, int state)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4140 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4141 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4142 DWMLE *mle = [sv documentView];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4143 if(state)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4144 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4145 [mle setHorizontallyResizable:NO];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4146 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4147 else
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4148 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4149 [mle setHorizontallyResizable:YES];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4150 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4151 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4152
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4153 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4154 * Sets the current cursor position of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4155 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4156 * handle: Handle to the MLE to be positioned.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4157 * point: Point to position cursor.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4158 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4159 void API dw_mle_set_cursor(HWND handle, int point)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4160 {
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	4161 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4162 DWMLE *mle = [sv documentView];
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	4163 [mle setSelectedRange: NSMakeRange(point,point)];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4164 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4165
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4166 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4167 * Finds text in an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4168 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4169 * handle: Handle to the MLE to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 * text: Text to search for.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4171 * point: Start point of search.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4172 * flags: Search specific flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4173 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4174 int API dw_mle_search(HWND handle, char *text, int point, unsigned long flags)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4175 {
888 cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4176 NSScrollView *sv = handle;
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4177 DWMLE *mle = [sv documentView];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4178 NSTextStorage *ts = [mle textStorage];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4179 NSMutableString *ms = [ts mutableString];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4180 NSString *searchForMe = [NSString stringWithUTF8String:text];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4181 NSRange searchRange = NSMakeRange(point, [ms length] - point);
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4182 NSRange range = NSMakeRange(NSNotFound, 0);
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4183 NSUInteger options = flags ? flags : NSCaseInsensitiveSearch;
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4184
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4185 if(ms)
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4186 {
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4187 range = [ms rangeOfString:searchForMe options:options range:searchRange];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4188 }
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4189
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4190 if(range.location != NSNotFound)
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4191 {
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4192 return -1;
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4193 }
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4194 return (int)range.location;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4195 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4196
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4197 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4198 * Stops redrawing of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4199 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200 * handle: Handle to the MLE to freeze.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4201 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4202 void API dw_mle_freeze(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4203 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4204 /* Don't think this is necessary */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4205 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4206
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4207 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4208 * Resumes redrawing of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4209 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4210 * handle: Handle to the MLE to thaw.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4211 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4212 void API dw_mle_thaw(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4213 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4214 /* Don't think this is necessary */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4215 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4216
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4217 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4218 * Create a new status text window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4219 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4220 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4221 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4222 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4223 HWND API dw_status_text_new(char *text, ULONG cid)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4224 {
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4225 NSTextField *textfield = dw_text_new(text, cid);
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4226 [textfield setBordered:YES];
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4227 if(DWOSMinor > 5)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4228 {
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4229 [textfield setBezeled:YES];
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4230 [textfield setBezelStyle:NSTextFieldSquareBezel];
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4231 }
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4232 [textfield setBackgroundColor:[NSColor clearColor]];
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	4233 [textfield setDrawsBackground:NO];
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4234 return textfield;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4235 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4236
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4237 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4238 * Create a new static text window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4239 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4240 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4241 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4242 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4243 HWND API dw_text_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4244 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4245 NSTextField *textfield = [[NSTextField alloc] init];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4246 [textfield setEditable:NO];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4247 [textfield setSelectable:NO];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4248 [textfield setBordered:NO];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4249 [textfield setDrawsBackground:NO];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4250 [textfield setStringValue:[ NSString stringWithUTF8String:text ]];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4251 [textfield setTag:cid];
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4252 if(DWDefaultFont)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4253 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4254 [[textfield cell] setFont:DWDefaultFont];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4255 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4256 return textfield;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4257 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4258
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4259 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4260 * Creates a rendering context widget (window) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4261 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4262 * id: An id to be used with dw_window_from_id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4263 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4264 * A handle to the widget or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4265 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4266 HWND API dw_render_new(unsigned long cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4268 DWRender *render = [[DWRender alloc] init];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4269 /* [render setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4270 return render;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4271 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4272
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4273 /* Sets the current foreground drawing color.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4274 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4275 * red: red value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4276 * green: green value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4277 * blue: blue value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4278 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 void API dw_color_foreground_set(unsigned long value)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4280 {
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4281 NSColor *oldcolor = pthread_getspecific(_dw_fg_color_key);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4282 NSColor *newcolor;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4283
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4284 _foreground = _get_color(value);
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4285
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4286 newcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green:
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4287 DW_GREEN_VALUE(_foreground)/255.0 blue:
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4288 DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] retain];
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4289 pthread_setspecific(_dw_fg_color_key, newcolor);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4290 [oldcolor release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4291 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4292
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4293 /* Sets the current background drawing color.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4294 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4295 * red: red value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4296 * green: green value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4297 * blue: blue value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4298 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4299 void API dw_color_background_set(unsigned long value)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4300 {
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4301 NSColor *oldcolor = pthread_getspecific(_dw_bg_color_key);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4302 NSColor *newcolor;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4303
891 3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4304 if(value == DW_CLR_DEFAULT)
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4305 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4306 pthread_setspecific(_dw_bg_color_key, NULL);
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4307 }
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4308 else
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4309 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4310 _background = _get_color(value);
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4311
891 3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4312 newcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(_background)/255.0 green:
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4313 DW_GREEN_VALUE(_background)/255.0 blue:
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4314 DW_BLUE_VALUE(_background)/255.0 alpha: 1] retain];
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4315 pthread_setspecific(_dw_bg_color_key, newcolor);
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4316 }
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4317 [oldcolor release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4319
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4320 /* Allows the user to choose a color using the system's color chooser dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4321 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4322 * value: current color
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4323 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4324 * The selected color or the current color if cancelled.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4326 unsigned long API dw_color_choose(unsigned long value)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4327 {
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4328 NSColor *color = [[NSColor colorWithDeviceRed: DW_RED_VALUE(value)/255.0 green: DW_GREEN_VALUE(value)/255.0 blue: DW_BLUE_VALUE(value)/255.0 alpha: 1] retain];
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4329 /* Create the Color Chooser Dialog class. */
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4330 static DWColorChoose *colorDlg = nil;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4331 DWDialog *dialog;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4332
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4333 if(colorDlg)
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4334 {
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4335 dialog = [colorDlg dialog];
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4336 /* If someone is already waiting just return */
8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4337 if(dialog)
8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4338 {
8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4339 return value;
8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4340 }
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4341 }
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4342 else
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4343 {
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4344 colorDlg = (DWColorChoose *)[DWColorChoose sharedColorPanel];
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4345 /* Set defaults for the dialog. */
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4346 [colorDlg setContinuous:NO];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4347 [colorDlg setTarget:colorDlg];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4348 [colorDlg setAction:@selector(changeColor:)];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4349 }
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4350
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4351 dialog = dw_dialog_new(colorDlg);
690 b93f5cdab37d Fixes to the color picker... it actually shows the picker now but it still needs more work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 689 diff changeset	4352 [colorDlg setColor:color];
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4353 [colorDlg setDialog:dialog];
690 b93f5cdab37d Fixes to the color picker... it actually shows the picker now but it still needs more work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 689 diff changeset	4354 [colorDlg makeKeyAndOrderFront:nil];
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4355
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4356 /* Wait for them to pick a color */
690 b93f5cdab37d Fixes to the color picker... it actually shows the picker now but it still needs more work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 689 diff changeset	4357 color = (NSColor *)dw_dialog_wait(dialog);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4358
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4359 /* Figure out the value of what they returned */
734 668a88a0b930 Fixed a minor 64/32 bit issue and fixed my having blue and red values reversed in the color table. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 733 diff changeset	4360 CGFloat red, green, blue;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4361 [color getRed:&red green:&green blue:&blue alpha:NULL];
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4362 value = DW_RGB((int)(red * 255), (int)(green 255), (int)(blue 255));
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4363 return value;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4364 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4365
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4366 /* Draw a point on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4367 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4368 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4369 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4370 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4371 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4372 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4373 void API dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4374 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4375 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4376 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4377 id image = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4378 if(pixmap)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4379 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4380 image = (id)pixmap->image;
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4381 [NSGraphicsContext saveGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4382 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4383 graphicsContextWithBitmapImageRep:image]];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4384 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4385 graphicsContextWithGraphicsPort:[[NSGraphicsContext currentContext] graphicsPort] flipped:YES]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4386 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4387 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4388 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4389 if([image lockFocusIfCanDraw] == NO)
747 a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4390 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4391 DW_MUTEX_UNLOCK;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4392 return;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4393 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4394 _DWLastDrawable = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4395 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4396 NSBezierPath* aPath = [NSBezierPath bezierPath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4397 [aPath setLineWidth: 0.5];
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4398 NSColor *color = pthread_getspecific(_dw_fg_color_key);
665 e6bec2290f3f Fixing warnings with Xcode 4 and switched to manual releasing in the draw functions to stop leaking. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 664 diff changeset	4399 [color set];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4400
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4401 [aPath moveToPoint:NSMakePoint(x, y)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4402 [aPath stroke];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4403 if(pixmap)
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4404 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4405 [NSGraphicsContext restoreGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4406 }
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4407 else
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4408 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4409 [image unlockFocus];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4410 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4411 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4412 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4413
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4414 /* Draw a line on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4415 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4416 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4417 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4418 * x1: First X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4419 * y1: First Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4420 * x2: Second X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4421 * y2: Second Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4422 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4423 void API dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4424 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4425 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4426 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4427 id image = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4428 if(pixmap)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4429 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4430 image = (id)pixmap->image;
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4431 [NSGraphicsContext saveGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4432 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4433 graphicsContextWithBitmapImageRep:image]];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4434 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4435 graphicsContextWithGraphicsPort:[[NSGraphicsContext currentContext] graphicsPort] flipped:YES]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4436 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4437 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4438 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4439 if([image lockFocusIfCanDraw] == NO)
747 a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4440 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4441 DW_MUTEX_UNLOCK;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4442 return;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4443 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4444 _DWLastDrawable = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4445 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4446 NSBezierPath* aPath = [NSBezierPath bezierPath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4447 [aPath setLineWidth: 0.5];
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4448 NSColor *color = pthread_getspecific(_dw_fg_color_key);
665 e6bec2290f3f Fixing warnings with Xcode 4 and switched to manual releasing in the draw functions to stop leaking. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 664 diff changeset	4449 [color set];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4450
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4451 [aPath moveToPoint:NSMakePoint(x1, y1)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4452 [aPath lineToPoint:NSMakePoint(x2, y2)];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4453 [aPath stroke];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4454
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4455 if(pixmap)
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4456 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4457 [NSGraphicsContext restoreGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4458 }
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4459 else
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4460 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4461 [image unlockFocus];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4462 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4463 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4464 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4465
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4466 /* Draw text on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4467 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4468 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4469 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4470 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4471 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4472 * text: Text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4473 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4474 void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4475 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4476 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4477 DW_MUTEX_LOCK;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4478 id image = handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4479 NSString *nstr = [ NSString stringWithUTF8String:text ];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4480 if(image)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4481 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4482 if([image isMemberOfClass:[DWRender class]])
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4483 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4484 DWRender *render = handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4485 NSFont *font = [render font];
747 a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4486 if([image lockFocusIfCanDraw] == NO)
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4487 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4488 DW_MUTEX_UNLOCK;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4489 return;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4490 }
891 3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4491 NSColor *fgcolor = pthread_getspecific(_dw_fg_color_key);
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4492 NSColor *bgcolor = pthread_getspecific(_dw_bg_color_key);
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4493 NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:fgcolor, NSForegroundColorAttributeName, nil];
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4494 if(bgcolor)
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4495 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4496 [dict setValue:bgcolor forKey:NSBackgroundColorAttributeName];
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4497 }
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4498 if(font)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4499 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4500 [dict setValue:font forKey:NSFontAttributeName];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4501 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4502 [nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4503 [image unlockFocus];
827 dc094750d284 Fixed leak in dw_draw_text() not releasing the dictionary which was also pulling the NSColor along. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 826 diff changeset	4504 [dict release];
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4505 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4506 _DWLastDrawable = handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4507 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4508 if(pixmap)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4509 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4510 NSFont *font = nil;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4511 DWRender *render = pixmap->handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4512 if([render isMemberOfClass:[DWRender class]])
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4513 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4514 font = [render font];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4515 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4516 image = (id)pixmap->image;
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4517 [NSGraphicsContext saveGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4518 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4519 graphicsContextWithBitmapImageRep:image]];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4520 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4521 graphicsContextWithGraphicsPort:[[NSGraphicsContext currentContext] graphicsPort] flipped:YES]];
891 3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4522 NSColor *fgcolor = pthread_getspecific(_dw_fg_color_key);
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4523 NSColor *bgcolor = pthread_getspecific(_dw_bg_color_key);
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4524 NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:fgcolor, NSForegroundColorAttributeName, nil];
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4525 if(bgcolor)
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4526 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4527 [dict setValue:bgcolor forKey:NSBackgroundColorAttributeName];
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4528 }
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4529 if(font)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4530 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4531 [dict setValue:font forKey:NSFontAttributeName];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4532 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4533 [nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4534 [NSGraphicsContext restoreGraphicsState];
827 dc094750d284 Fixed leak in dw_draw_text() not releasing the dictionary which was also pulling the NSColor along. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 826 diff changeset	4535 [dict release];
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4536 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4537 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4538 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4539
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4540 /* Query the width and height of a text string.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4541 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4542 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4543 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4544 * text: Text to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4545 * width: Pointer to a variable to be filled in with the width.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4546 * height Pointer to a variable to be filled in with the height.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4547 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4548 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char text, int width, int *height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4549 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4550 id object = handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4551 NSString *nstr = [NSString stringWithUTF8String:text];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4552 if(pixmap)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4553 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4554 object = pixmap->handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4555 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4556 NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
828 14c9f4a8839e Attempt to get dw_font_text_extents_get() on controls besides the render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 827 diff changeset	4557 if([object isMemberOfClass:[DWRender class]] \|\| [object isKindOfClass:[NSControl class]])
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4558 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4559 NSFont *font = [object font];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4560
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4561 if(font)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4562 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4563 [dict setValue:font forKey:NSFontAttributeName];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4564 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4565 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4566 NSSize size = [nstr sizeWithAttributes:dict];
665 e6bec2290f3f Fixing warnings with Xcode 4 and switched to manual releasing in the draw functions to stop leaking. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 664 diff changeset	4567 [dict release];
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4568 if(width)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4569 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4570 *width = size.width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4571 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4572 if(height)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4573 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4574 *height = size.height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	4575 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4576 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4577
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4578 /* Draw a polygon on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4579 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4580 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4581 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4582 * fill: Fill box TRUE or FALSE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4583 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4584 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4585 * width: Width of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4586 * height: Height of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4587 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4588 void API dw_draw_polygon( HWND handle, HPIXMAP pixmap, int fill, int npoints, int x, int y )
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4589 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4590 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4591 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4592 id image = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4593 int z;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4594 if(pixmap)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4595 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4596 image = (id)pixmap->image;
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4597 [NSGraphicsContext saveGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4598 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4599 graphicsContextWithBitmapImageRep:image]];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4600 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4601 graphicsContextWithGraphicsPort:[[NSGraphicsContext currentContext] graphicsPort] flipped:YES]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4602 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4603 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4604 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4605 if([image lockFocusIfCanDraw] == NO)
747 a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4606 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4607 DW_MUTEX_UNLOCK;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4608 return;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4609 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4610 _DWLastDrawable = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4611 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4612 NSBezierPath* aPath = [NSBezierPath bezierPath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4613 [aPath setLineWidth: 0.5];
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4614 NSColor *color = pthread_getspecific(_dw_fg_color_key);
665 e6bec2290f3f Fixing warnings with Xcode 4 and switched to manual releasing in the draw functions to stop leaking. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 664 diff changeset	4615 [color set];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4616
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4617 [aPath moveToPoint:NSMakePoint(x, y)];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4618 for(z=1;z<npoints;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4619 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4620 [aPath lineToPoint:NSMakePoint(x[z], y[z])];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4621 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4622 [aPath closePath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4623 if(fill)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4624 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4625 [aPath fill];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4626 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4627 [aPath stroke];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4628 if(pixmap)
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4629 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4630 [NSGraphicsContext restoreGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4631 }
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4632 else
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4633 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4634 [image unlockFocus];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4635 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4636 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4637 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4638
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4639 /* Draw a rectangle on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4640 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4641 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4642 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4643 * fill: Fill box TRUE or FALSE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4644 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4645 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4646 * width: Width of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4647 * height: Height of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4648 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4649 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4650 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4651 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4652 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4653 id image = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4654 if(pixmap)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4655 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4656 image = (id)pixmap->image;
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4657 [NSGraphicsContext saveGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4658 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4659 graphicsContextWithBitmapImageRep:image]];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4660 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4661 graphicsContextWithGraphicsPort:[[NSGraphicsContext currentContext] graphicsPort] flipped:YES]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4662 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4663 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4664 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4665 if([image lockFocusIfCanDraw] == NO)
747 a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4666 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4667 DW_MUTEX_UNLOCK;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4668 return;
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4669 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4670 _DWLastDrawable = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4671 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4672 NSBezierPath* aPath = [NSBezierPath bezierPath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4673 [aPath setLineWidth: 0.5];
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	4674 NSColor *color = pthread_getspecific(_dw_fg_color_key);
665 e6bec2290f3f Fixing warnings with Xcode 4 and switched to manual releasing in the draw functions to stop leaking. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 664 diff changeset	4675 [color set];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4676
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4677 [aPath moveToPoint:NSMakePoint(x, y)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4678 [aPath lineToPoint:NSMakePoint(x, y + height)];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4679 [aPath lineToPoint:NSMakePoint(x + width, y + height)];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4680 [aPath lineToPoint:NSMakePoint(x + width, y)];
664 ba3af8eb56f1 Fixed drawing of rects and points. Fonts now properly draw in color. Updated property list. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 662 diff changeset	4681 [aPath closePath];
767 9b0c22b58447 Don't fill a rectangle unless requested to mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 766 diff changeset	4682 if(fill)
9b0c22b58447 Don't fill a rectangle unless requested to mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 766 diff changeset	4683 [aPath fill];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4684 [aPath stroke];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4685 if(pixmap)
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4686 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4687 [NSGraphicsContext restoreGraphicsState];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4688 }
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4689 else
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4690 {
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4691 [image unlockFocus];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	4692 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4693 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4694 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4695
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4696 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4697 * Create a tree object to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4698 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4699 * id: An ID to be used for getting the resource from the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4700 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4701 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4702 HWND API dw_tree_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4703 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4704 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4705 DW_MUTEX_LOCK;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4706 NSScrollView *scrollview = [[NSScrollView alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4707 DWTree *tree = [[DWTree alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4708
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4709 [tree setScrollview:scrollview];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4710 [scrollview setBorderType:NSBezelBorder];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4711 [scrollview setHasVerticalScroller:YES];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4712 [scrollview setAutohidesScrollers:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4713
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4714 [tree setAllowsMultipleSelection:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4715 [tree setDataSource:tree];
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4716 [tree setDelegate:tree];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4717 [scrollview setDocumentView:tree];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4718 [tree setHeaderView:nil];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4719 [tree setTag:cid];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4720 [scrollview release];
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4721 DW_MUTEX_UNLOCK;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4722 return tree;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4723 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4724
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4725 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4726 * Inserts an item into a tree window (widget) after another item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4727 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4728 * handle: Handle to the tree to be inserted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4729 * item: Handle to the item to be positioned after.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4730 * title: The text title of the entry.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4731 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4732 * parent: Parent handle or 0 if root.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4733 * itemdata: Item specific data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4734 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	4735 HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, char title, HICN icon, HTREEITEM parent, void itemdata)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4736 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4737 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4738 DW_MUTEX_LOCK;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4739 DWTree *tree = handle;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4740 NSString *nstr = [NSString stringWithUTF8String:title];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4741 NSPointerArray *treenode = [NSPointerArray pointerArrayWithWeakObjects];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4742 [treenode addPointer:icon];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4743 [treenode addPointer:nstr];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4744 [treenode addPointer:itemdata];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4745 [treenode addPointer:NULL];
881 7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4746 [treenode addPointer:parent];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4747 [tree addTree:treenode and:parent];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4748 [tree reloadData];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4749 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4750 return treenode;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4751 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4752
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4753 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4754 * Inserts an item into a tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4755 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4756 * handle: Handle to the tree to be inserted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4757 * title: The text title of the entry.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4758 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4759 * parent: Parent handle or 0 if root.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4760 * itemdata: Item specific data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4761 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	4762 HTREEITEM API dw_tree_insert(HWND handle, char title, HICN icon, HTREEITEM parent, void itemdata)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4763 {
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4764 return dw_tree_insert_after(handle, NULL, title, icon, parent, itemdata);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4765 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4766
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4767 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4768 * Gets the text an item in a tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4769 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4770 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4771 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4772 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4773 char * API dw_tree_get_title(HWND handle, HTREEITEM item)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4774 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4775 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4776 DW_MUTEX_LOCK;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4777 NSPointerArray array = (NSPointerArray )item;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4778 NSString nstr = (NSString )[array pointerAtIndex:1];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4779 DW_MUTEX_UNLOCK;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4780 return strdup([nstr UTF8String]);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4781 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4782
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4783 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4784 * Gets the text an item in a tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4785 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4786 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4787 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4788 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4789 HTREEITEM API dw_tree_get_parent(HWND handle, HTREEITEM item)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4790 {
881 7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4791 int _locked_by_me = FALSE;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4792 HTREEITEM parent;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4793
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4794 DW_MUTEX_LOCK;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4795 NSPointerArray array = (NSPointerArray )item;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4796 parent = (HTREEITEM)[array pointerAtIndex:4];
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4797 DW_MUTEX_UNLOCK;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4798 return parent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4799 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4800
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4801 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4802 * Sets the text and icon of an item in a tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4803 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4804 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4805 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4806 * title: The text title of the entry.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4807 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4808 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	4809 void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, HICN icon)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4810 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4811 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4812 DW_MUTEX_LOCK;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4813 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4814 NSPointerArray array = (NSPointerArray )item;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4815 if(title)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4816 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4817 NSString *nstr = [NSString stringWithUTF8String:title];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4818 [array replacePointerAtIndex:1 withPointer:nstr];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4819 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4820 if(icon)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4821 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4822 [array replacePointerAtIndex:0 withPointer:icon];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4823 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4824 [tree reloadData];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4825 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4826 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4827
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4828 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4829 * Sets the item data of a tree item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4830 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4831 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4832 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4833 * itemdata: User defined data to be associated with item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4834 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4835 void API dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4836 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4837 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4838 DW_MUTEX_LOCK;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4839 NSPointerArray array = (NSPointerArray )item;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4840 [array replacePointerAtIndex:2 withPointer:itemdata];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4841 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4842 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4843
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4844 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4845 * Gets the item data of a tree item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4846 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4847 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4848 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4849 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4850 void * API dw_tree_item_get_data(HWND handle, HTREEITEM item)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4851 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4852 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4853 DW_MUTEX_LOCK;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4854 NSPointerArray array = (NSPointerArray )item;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4855 void *result = [array pointerAtIndex:2];
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4856 DW_MUTEX_UNLOCK;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4857 return result;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4858 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4859
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4860 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4861 * Sets this item as the active selection.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4862 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4863 * handle: Handle to the tree window (widget) to be selected.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4864 * item: Handle to the item to be selected.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4865 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4866 void API dw_tree_item_select(HWND handle, HTREEITEM item)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4867 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4868 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4869 DW_MUTEX_LOCK;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4870 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4871 NSInteger itemIndex = [tree rowForItem:item];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4872 if(itemIndex > -1)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4873 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4874 [tree selectRowIndexes:[NSIndexSet indexSetWithIndex:itemIndex] byExtendingSelection:NO];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4875 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4876 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4877 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4878
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4879 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4880 * Removes all nodes from a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4881 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4882 * handle: Handle to the window (widget) to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4883 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4884 void API dw_tree_clear(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4885 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4886 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4887 DW_MUTEX_LOCK;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4888 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4889 [tree clear];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4890 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4891 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4892
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4893 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4894 * Expands a node on a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4895 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4896 * handle: Handle to the tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4897 * item: Handle to node to be expanded.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4898 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4899 void API dw_tree_item_expand(HWND handle, HTREEITEM item)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4900 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4901 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4902 DW_MUTEX_LOCK;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4903 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4904 [tree expandItem:item];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4905 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4906 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4907
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4909 * Collapses a node on a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4910 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4911 * handle: Handle to the tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4912 * item: Handle to node to be collapsed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4913 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4914 void API dw_tree_item_collapse(HWND handle, HTREEITEM item)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4915 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4916 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4917 DW_MUTEX_LOCK;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4918 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4919 [tree collapseItem:item];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4920 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4921 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4922
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4923 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924 * Removes a node from a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4925 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4926 * handle: Handle to the window (widget) to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4927 * item: Handle to node to be deleted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4928 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4929 void API dw_tree_item_delete(HWND handle, HTREEITEM item)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4930 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4931 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4932 DW_MUTEX_LOCK;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4933 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4934 [tree deleteNode:item];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	4935 [tree reloadData];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4936 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4937 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4938
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4939 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4940 * Create a container object to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4941 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4942 * id: An ID to be used for getting the resource from the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4943 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4944 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4945 HWND API dw_container_new(ULONG cid, int multi)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4946 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4947 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4948 DW_MUTEX_LOCK;
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	4949 DWContainer *cont = _cont_new(cid, multi);
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	4950 NSScrollView *scrollview = [cont scrollview];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	4951 [scrollview setHasHorizontalScroller:YES];
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	4952 NSTableHeaderView *header = [[NSTableHeaderView alloc] init];
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	4953 [cont setHeaderView:header];
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	4954 [cont setTarget:cont];
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	4955 [cont setDoubleAction:@selector(doubleClicked:)];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4956 [header release];
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4957 DW_MUTEX_UNLOCK;
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	4958 return cont;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4959 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4960
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4961 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4962 * Sets up the container columns.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4963 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4964 * handle: Handle to the container to be configured.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4965 * flags: An array of unsigned longs with column flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4966 * titles: An array of strings with column text titles.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4967 * count: The number of columns (this should match the arrays).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4968 * separator: The column number that contains the main separator.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4969 * (this item may only be used in OS/2)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4970 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4971 int API dw_container_setup(HWND handle, unsigned long flags, char *titles, int count, int separator)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4972 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4973 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4974 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4975 int z;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4976 DWContainer *cont = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4977
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4978 [cont setup];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4979
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4980 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4981 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4982 NSTableColumn *column = [[NSTableColumn alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4983 [[column headerCell] setStringValue:[ NSString stringWithUTF8String:titles[z] ]];
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	4984 if(flags[z] & DW_CFA_BITMAPORICON)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	4985 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4986 NSImageCell *imagecell = [[NSImageCell alloc] init];
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	4987 [column setDataCell:imagecell];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	4988 [imagecell release];
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	4989 }
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4990 else if(flags[z] & DW_CFA_STRINGANDICON)
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4991 {
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4992 NSBrowserCell *browsercell = [[NSBrowserCell alloc] init];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4993 [browsercell setLeaf:YES];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4994 [column setDataCell:browsercell];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4995 [browsercell release];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4996 }
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4997 /* Defaults to left justified so just handle right and center */
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	4998 if(flags[z] & DW_CFA_RIGHT)
855 0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	4999 {
0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5000 [(NSCell *)[column dataCell] setAlignment:NSRightTextAlignment];
858 80f3e108fa43 Also align the header cells, not just the data ones. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 857 diff changeset	5001 [(NSCell *)[column headerCell] setAlignment:NSRightTextAlignment];
855 0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5002 }
0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5003 else if(flags[z] & DW_CFA_CENTER)
0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5004 {
0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5005 [(NSCell *)[column dataCell] setAlignment:NSCenterTextAlignment];
858 80f3e108fa43 Also align the header cells, not just the data ones. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 857 diff changeset	5006 [(NSCell *)[column headerCell] setAlignment:NSCenterTextAlignment];
855 0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5007 }
795 f23cad02cfb3 Make listbox, container and tree cells uneditable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 794 diff changeset	5008 [column setEditable:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5009 [cont addTableColumn:column];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5010 [cont addColumn:column andType:(int)flags[z]];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5011 [column release];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5012 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5013 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5014 return TRUE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5015 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5016
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5017 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5018 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5019 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5020 * handle: Handle to the container to be configured.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5021 * flags: An array of unsigned longs with column flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022 * titles: An array of strings with column text titles.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5023 * count: The number of columns (this should match the arrays).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5024 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5025 int API dw_filesystem_setup(HWND handle, unsigned long flags, char *titles, int count)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5026 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5027 char *newtitles = malloc(sizeof(char ) * (count + 1));
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5028 unsigned long newflags = malloc(sizeof(unsigned long) (count + 1));
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	5029 DWContainer *cont = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5030
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5031 newtitles[0] = "Filename";
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5032
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5033 newflags[0] = DW_CFA_STRINGANDICON \| DW_CFA_LEFT \| DW_CFA_HORZSEPARATOR;
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5034
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5035 memcpy(&newtitles[1], titles, sizeof(char ) count);
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5036 memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5037
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5038 dw_container_setup(handle, newflags, newtitles, count + 1, 0);
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	5039 [cont setFilesystem:YES];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5040
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5041 free(newtitles);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5042 free(newflags);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5043 return TRUE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5044 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5046 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5047 * Allocates memory used to populate a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5048 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5049 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5050 * rowcount: The number of items to be populated.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5051 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5052 void * API dw_container_alloc(HWND handle, int rowcount)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5053 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5054 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5055 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5056 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5057 [cont addRows:rowcount];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5058 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5059 return cont;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5060 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5061
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5062 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5063 * Sets an item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5064 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5065 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5067 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5069 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5071 void API dw_container_set_item(HWND handle, void pointer, int column, int row, void data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5072 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5073 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5074 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5075 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5076 id object = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5077 int type = [cont cellType:column];
801 5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	5078 int lastadd = 0;
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	5079
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	5080 /* If pointer is NULL we are getting a change request instead of set */
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	5081 if(pointer)
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	5082 {
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	5083 lastadd = [cont lastAddPoint];
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	5084 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5085
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5086 if(!data)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5087 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5088 DW_MUTEX_UNLOCK;
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5089 return;
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5090 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5091 if(type & DW_CFA_BITMAPORICON)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5092 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5093 object = ((NSImage *)data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5094 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5095 else if(type & DW_CFA_STRING)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5096 {
726 ecf47778caff Possible fix for container string columns not showing correctly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 725 diff changeset	5097 char str = ((char **)data);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5098 object = [ NSString stringWithUTF8String:str ];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5099 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5100 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5101 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5102 char textbuffer[100];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5103
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5104 if(type & DW_CFA_ULONG)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5105 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5106 ULONG tmp = ((ULONG )data);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5107
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5108 sprintf(textbuffer, "%lu", tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5109 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5110 else if(type & DW_CFA_DATE)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5111 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5112 struct tm curtm;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5113 CDATE cdate = ((CDATE )data);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5114
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5115 memset( &curtm, 0, sizeof(curtm) );
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5116 curtm.tm_mday = cdate.day;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5117 curtm.tm_mon = cdate.month - 1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5118 curtm.tm_year = cdate.year - 1900;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5119
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5120 strftime(textbuffer, 100, "%x", &curtm);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5121 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5122 else if(type & DW_CFA_TIME)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5123 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5124 struct tm curtm;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5125 CTIME ctime = ((CTIME )data);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5126
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5127 memset( &curtm, 0, sizeof(curtm) );
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5128 curtm.tm_hour = ctime.hours;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5129 curtm.tm_min = ctime.minutes;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5130 curtm.tm_sec = ctime.seconds;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5131
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5132 strftime(textbuffer, 100, "%X", &curtm);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5133 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5134 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5135 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5136 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5137 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5138 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5139 object = [ NSString stringWithUTF8String:textbuffer ];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5140 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5141
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5142 [cont editCell:object at:(row+lastadd) and:column];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	5143 [cont setNeedsDisplay:YES];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5144 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5145 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5146
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5147 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5148 * Changes an existing item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5149 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5150 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5151 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5152 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5154 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5155 void API dw_container_change_item(HWND handle, int column, int row, void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5156 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5157 dw_container_set_item(handle, NULL, column, row, data);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5158 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5159
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5160 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5161 * Changes an existing item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5162 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5163 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5164 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5165 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5166 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5167 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5168 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5169 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5170 dw_container_change_item(handle, column+1, row, data);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5171 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5172
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5173 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5174 * Changes an item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5175 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5176 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5177 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5178 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5179 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5180 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5181 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5182 void API dw_filesystem_change_file(HWND handle, int row, char *filename, HICN icon)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5183 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5184 dw_filesystem_set_file(handle, NULL, row, filename, icon);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5185 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5186
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5187 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5188 * Sets an item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5189 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5190 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5191 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5192 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5193 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5194 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5195 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5196 void API dw_filesystem_set_file(HWND handle, void pointer, int row, char filename, HICN icon)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5197 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5198 int _locked_by_me = FALSE;
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5199 DW_MUTEX_LOCK;
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5200 DWContainer *cont = handle;
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5201 NSBrowserCell *browsercell;
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5202 int lastadd = 0;
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5203
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5204 /* If pointer is NULL we are getting a change request instead of set */
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5205 if(pointer)
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5206 {
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5207 lastadd = [cont lastAddPoint];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5208 }
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5209
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5210 browsercell = [[NSBrowserCell alloc] init];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5211 [browsercell setLeaf:YES];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5212 [browsercell setImage:icon];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5213 [browsercell setStringValue:[ NSString stringWithUTF8String:filename ]];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5214 [cont editCell:browsercell at:(row+lastadd) and:0];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5215 [cont setNeedsDisplay:YES];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5216 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5217 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5218
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5219 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5220 * Sets an item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5221 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5222 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5223 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5224 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5225 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5226 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5227 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5228 void API dw_filesystem_set_item(HWND handle, void pointer, int column, int row, void data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5229 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5230 dw_container_set_item(handle, pointer, column+1, row, data);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5231 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5232
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5233 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5234 * Gets column type for a container column
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5235 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5236 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5237 * column: Zero based column.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5238 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5239 int API dw_container_get_column_type(HWND handle, int column)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5240 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5241 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5242 DW_MUTEX_LOCK;
721 56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5243 DWContainer *cont = handle;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5244 int rc;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5245 int flag = [cont cellType:column];
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5246 if(flag & DW_CFA_BITMAPORICON)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5247 rc = DW_CFA_BITMAPORICON;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5248 else if(flag & DW_CFA_STRING)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5249 rc = DW_CFA_STRING;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5250 else if(flag & DW_CFA_ULONG)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5251 rc = DW_CFA_ULONG;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5252 else if(flag & DW_CFA_DATE)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5253 rc = DW_CFA_DATE;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5254 else if(flag & DW_CFA_TIME)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5255 rc = DW_CFA_TIME;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5256 else
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5257 rc = 0;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5258 DW_MUTEX_UNLOCK;
721 56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	5259 return rc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5260 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5261
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5262 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5263 * Gets column type for a filesystem container column
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5264 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5265 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5266 * column: Zero based column.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5267 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5268 int API dw_filesystem_get_column_type(HWND handle, int column)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5269 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	5270 return dw_container_get_column_type(handle, column+1);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5271 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5272
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5273 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5274 * Sets the width of a column in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5275 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5276 * handle: Handle to window (widget) of container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5277 * column: Zero based column of width being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5278 * width: Width of column in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5279 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5280 void API dw_container_set_column_width(HWND handle, int column, int width)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5281 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5282 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5283 DW_MUTEX_LOCK;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5284 DWContainer *cont = handle;
831 168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	5285 if([cont filesystem])
168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	5286 {
168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	5287 column++;
168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	5288 }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5289 NSTableColumn *col = [cont getColumn:column];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5290
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5291 [col setWidth:width];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5292 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5293 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5294
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5295 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5296 * Sets the title of a row in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5298 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5299 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5300 * title: String title of the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5301 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5302 void API dw_container_set_row_title(void pointer, int row, char title)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5303 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5304 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5305 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5306 DWContainer *cont = pointer;
821 00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5307 int lastadd = [cont lastAddPoint];
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5308 [cont setRow:(row+lastadd) title:title];
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5309 DW_MUTEX_UNLOCK;
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5310 }
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5311
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5312
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5313 /*
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5314 * Sets the title of a row in the container.
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5315 * Parameters:
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5316 * handle: Handle to window (widget) of container.
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5317 * row: Zero based row of data being set.
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5318 * title: String title of the item.
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5319 */
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5320 void API dw_container_change_row_title(HWND handle, int row, char *title)
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5321 {
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5322 int _locked_by_me = FALSE;
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5323 DW_MUTEX_LOCK;
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	5324 DWContainer *cont = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5325 [cont setRow:row title:title];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5326 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5327 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5328
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5329 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5330 * Sets the title of a row in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5331 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5332 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5333 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5334 * rowcount: The number of rows to be inserted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5335 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5336 void API dw_container_insert(HWND handle, void *pointer, int rowcount)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5337 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5338 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5339 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5340 DWContainer *cont = handle;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5341 [cont reloadData];
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5342 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5343 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5344
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5345 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5346 * Removes all rows from a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5347 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5348 * handle: Handle to the window (widget) to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5349 * redraw: TRUE to cause the container to redraw immediately.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5350 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5351 void API dw_container_clear(HWND handle, int redraw)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5352 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5353 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5354 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5355 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5356 [cont clear];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5357 if(redraw)
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5358 {
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5359 [cont reloadData];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5360 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5361 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5362 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5363
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5364 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5365 * Removes the first x rows from a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5366 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5367 * handle: Handle to the window (widget) to be deleted from.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5368 * rowcount: The number of rows to be deleted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5369 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5370 void API dw_container_delete(HWND handle, int rowcount)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5371 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5372 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5373 DW_MUTEX_LOCK;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5374 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5375 int x;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5376
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5377 for(x=0;x<rowcount;x++)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5378 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5379 [cont removeRow:0];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5380 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5381 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5382 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5383
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5384 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5385 * Scrolls container up or down.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5386 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5387 * handle: Handle to the window (widget) to be scrolled.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5388 * direction: DW_SCROLL_UP, DW_SCROLL_DOWN, DW_SCROLL_TOP or
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5389 * DW_SCROLL_BOTTOM. (rows is ignored for last two)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5390 * rows: The number of rows to be scrolled.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5391 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5392 void API dw_container_scroll(HWND handle, int direction, long rows)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5393 {
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	5394 DWContainer *cont = handle;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	5395 NSScrollView *sv = [cont scrollview];
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5396 NSScroller *scrollbar = [sv verticalScroller];
855 0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5397 int rowcount = (int)[cont numberOfRowsInTableView:cont];
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5398 float currpos = [scrollbar floatValue];
853 c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5399 float change;
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5400
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5401 /* Safety check */
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5402 if(rowcount < 1)
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5403 {
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5404 return;
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5405 }
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5406
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5407 change = (float)rows/(float)rowcount;
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5408
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5409 switch(direction)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5410 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5411 case DW_SCROLL_TOP:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5412 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5413 [scrollbar setFloatValue:0];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5414 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5415 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5416 case DW_SCROLL_BOTTOM:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5417 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5418 [scrollbar setFloatValue:1];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5419 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5420 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5421 case DW_SCROLL_UP:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5422 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5423 float newpos = currpos - change;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5424 if(newpos < 0)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5425 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5426 newpos = 0;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5427 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5428 [scrollbar setFloatValue:newpos];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5429 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5430 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5431 case DW_SCROLL_DOWN:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5432 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5433 float newpos = currpos + change;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5434 if(newpos > 1)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5435 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5436 newpos = 1;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5437 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5438 [scrollbar setFloatValue:newpos];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5439 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5440 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5441 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5442 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5443
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5444 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5445 * Starts a new query of a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5446 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5447 * handle: Handle to the window (widget) to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5448 * flags: If this parameter is DW_CRA_SELECTED it will only
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5449 * return items that are currently selected. Otherwise
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5450 * it will return all records in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5451 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5452 char * API dw_container_query_start(HWND handle, unsigned long flags)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5453 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5454 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5455 DW_MUTEX_LOCK;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5456 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5457 NSIndexSet *selected = [cont selectedRowIndexes];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5458 NSUInteger result = [selected indexGreaterThanOrEqualToIndex:0];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5459 char *retval = NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5460
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5461 if(result != NSNotFound)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5462 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5463 retval = [cont getRowTitle:(int)result];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5464 [cont setLastQueryPoint:(int)result];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5465 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5466 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5467 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5468 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5469
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5470 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5471 * Continues an existing query of a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5472 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5473 * handle: Handle to the window (widget) to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5474 * flags: If this parameter is DW_CRA_SELECTED it will only
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5475 * return items that are currently selected. Otherwise
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5476 * it will return all records in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5477 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5478 char * API dw_container_query_next(HWND handle, unsigned long flags)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5479 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5480 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5481 DW_MUTEX_LOCK;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5482 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5483 int lastQueryPoint = [cont lastQueryPoint];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5484 NSIndexSet *selected = [cont selectedRowIndexes];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5485 NSUInteger result = [selected indexGreaterThanIndex:lastQueryPoint];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5486 char *retval = NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5487
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5488 if(result != NSNotFound)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5489 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5490 retval = [cont getRowTitle:(int)result];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5491 [cont setLastQueryPoint:(int)result];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5492 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5493 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5494 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5495 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5496
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5497 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5498 * Cursors the item with the text speficied, and scrolls to that item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5499 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5500 * handle: Handle to the window (widget) to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5501 * text: Text usually returned by dw_container_query().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5502 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5503 void API dw_container_cursor(HWND handle, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5504 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5505 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5506 DW_MUTEX_LOCK;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5507 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5508 char *thistext;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5509 int x, count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5510
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5511 for(x=0;x<count;x++)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5512 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5513 thistext = [cont getRowTitle:x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5514
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5515 if(thistext == text)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5516 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5517 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5518
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5519 [cont selectRowIndexes:selected byExtendingSelection:YES];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5520 [selected release];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5521 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5522 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5523 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5524 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5525
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5526 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5527 * Deletes the item with the text speficied.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5528 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5529 * handle: Handle to the window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5530 * text: Text usually returned by dw_container_query().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5531 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5532 void API dw_container_delete_row(HWND handle, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5533 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5534 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5535 DW_MUTEX_LOCK;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5536 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5537 char *thistext;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5538 int x, count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5539
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5540 for(x=0;x<count;x++)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5541 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5542 thistext = [cont getRowTitle:x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5543
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5544 if(thistext == text)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5545 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5546 [cont removeRow:x];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5547 return;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5548 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5549 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5550 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5551 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5552
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5553 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5554 * Optimizes the column widths so that all data is visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5555 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5556 * handle: Handle to the window (widget) to be optimized.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5557 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5558 void API dw_container_optimize(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5559 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5560 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5561 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5562 DWContainer *cont = handle;
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	5563 [cont optimize];
857 718b91ac19d2 Disable auto-sizing... I had enabled this during optimize because it produces some nice results.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 856 diff changeset	5564 #if 0
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	5565 /* All resizable columns should expand */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5566 [cont setColumnAutoresizingStyle:NSTableViewUniformColumnAutoresizingStyle];
857 718b91ac19d2 Disable auto-sizing... I had enabled this during optimize because it produces some nice results.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 856 diff changeset	5567 #endif
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5568 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5569 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5570
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5571 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5572 * Inserts an icon into the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5573 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5574 * handle: Window handle that will handle taskbar icon messages.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5575 * icon: Icon handle to display in the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5576 * bubbletext: Text to show when the mouse is above the icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5577 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5578 void API dw_taskbar_insert(HWND handle, HICN icon, char *bubbletext)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5579 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5580 NSLog(@"dw_taskbar_insert() unimplemented\n");
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5581 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5582
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5583 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5584 * Deletes an icon from the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5585 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5586 * handle: Window handle that was used with dw_taskbar_insert().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5587 * icon: Icon handle that was used with dw_taskbar_insert().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5588 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5589 void API dw_taskbar_delete(HWND handle, HICN icon)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5590 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5591 NSLog(@"dw_taskbar_delete() unimplemented\n");
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5592 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5593
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5594 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5595 * Obtains an icon from a module (or header in GTK).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5596 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5597 * module: Handle to module (DLL) in OS/2 and Windows.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5598 * id: A unsigned long id int the resources on OS/2 and
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5599 * Windows, on GTK this is converted to a pointer
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5600 * to an embedded XPM.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5601 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5602 HICN API dw_icon_load(unsigned long module, unsigned long resid)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5603 {
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5604 NSBundle *bundle = [NSBundle mainBundle];
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5605 NSString *respath = [bundle resourcePath];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5606 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5607 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5608 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5609 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5610
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5611 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5612 * Obtains an icon from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5613 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5614 * filename: Name of the file, omit extention to have
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5615 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5616 * (ICO on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5617 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5618 HICN API dw_icon_load_from_file(char *filename)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5619 {
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5620 NSString *nstr = [ NSString stringWithUTF8String:filename ];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5621 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5622 if(!image)
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5623 {
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5624 nstr = [nstr stringByAppendingString:@".png"];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5625 image = [[NSImage alloc] initWithContentsOfFile:nstr];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5626 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5627 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5628 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5629
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5630 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5631 * Obtains an icon from data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5632 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5633 * filename: Name of the file, omit extention to have
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5634 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5635 * (ICO on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5636 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5637 HICN API dw_icon_load_from_data(char *data, int len)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5638 {
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5639 NSData *thisdata = [NSData dataWithBytes:data length:len];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5640 NSImage *image = [[NSImage alloc] initWithData:thisdata];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5641 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5642 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5643
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5644 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5645 * Frees a loaded resource in OS/2 and Windows.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5646 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5647 * handle: Handle to icon returned by dw_icon_load().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5648 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5649 void API dw_icon_free(HICN handle)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5650 {
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5651 NSImage *image = handle;
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	5652 [image release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5653 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5654
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5655 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5656 * Create a new MDI Frame to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5657 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5658 * id: An ID to be used with dw_window_from_id or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5659 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5660 HWND API dw_mdi_new(unsigned long cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5661 {
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	5662 /* There isn't anything like quite like MDI on MacOS...
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	5663 * However we will make floating windows that hide
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	5664 * when the application is deactivated to simulate
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5665 * similar behavior.
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	5666 */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	5667 DWMDI *mdi = [[DWMDI alloc] init];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5668 /* [mdi setTag:cid]; Why doesn't this work? */
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	5669 return mdi;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5670 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5671
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5672 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5673 * Creates a splitbar window (widget) with given parameters.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5674 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5675 * type: Value can be DW_VERT or DW_HORZ.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5676 * topleft: Handle to the window to be top or left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5677 * bottomright: Handle to the window to be bottom or right.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5678 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5679 * A handle to a splitbar window or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5680 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5681 HWND API dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5683 HWND tmpbox = dw_box_new(DW_VERT, 0);
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5684 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5685 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5686 DWSplitBar *split = [[DWSplitBar alloc] init];
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5687 [split setDelegate:split];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5688 dw_box_pack_start(tmpbox, topleft, 0, 0, TRUE, TRUE, 0);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5689 [split addSubview:tmpbox];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5690 tmpbox = dw_box_new(DW_VERT, 0);
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5691 dw_box_pack_start(tmpbox, bottomright, 0, 0, TRUE, TRUE, 0);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5692 [split addSubview:tmpbox];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5693 if(type == DW_VERT)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5694 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5695 [split setVertical:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5696 }
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5697 else
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5698 {
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5699 [split setVertical:YES];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5700 }
753 590eebc9b61f Preset the splitbar percent to 50% since Leopard doesn't set it automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 752 diff changeset	5701 /* Set the default percent to 50% split */
590eebc9b61f Preset the splitbar percent to 50% since Leopard doesn't set it automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 752 diff changeset	5702 [split setPercent:50.0];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5703 /* [split setTag:cid]; Why doesn't this work? */
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5704 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5705 return split;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5706 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5707
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5708 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5709 * Sets the position of a splitbar (pecentage).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5711 * handle: The handle to the splitbar returned by dw_splitbar_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5712 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5713 void API dw_splitbar_set(HWND handle, float percent)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5714 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5715 DWSplitBar *split = handle;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5716 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5717 DW_MUTEX_LOCK;
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5718 NSRect rect = [split frame];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5719 float pos;
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5720 /* Calculate the position based on the size */
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5721 if([split isVertical])
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5722 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5723 pos = rect.size.width * (percent / 100.0);
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5724 }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5725 else
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5726 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5727 pos = rect.size.height * (percent / 100.0);
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5728 }
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5729 if(pos > 0)
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5730 {
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5731 [split setPosition:pos ofDividerAtIndex:0];
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5732 }
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5733 else
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5734 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5735 /* If we have no size.. wait until the resize
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5736 * event when we get an actual size to try
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5737 * to set the splitbar again.
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5738 */
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5739 [split setPercent:percent];
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5740 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5741 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5742 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5743
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5744 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5745 * Gets the position of a splitbar (pecentage).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5746 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5747 * handle: The handle to the splitbar returned by dw_splitbar_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5748 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5749 float API dw_splitbar_get(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5750 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5751 DWSplitBar *split = handle;
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5752 NSRect rect1 = [split frame];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5753 NSArray *subviews = [split subviews];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5754 NSView *view = [subviews objectAtIndex:0];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5755 NSRect rect2 = [view frame];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5756 float pos, total, retval = 0.0;
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5757 if([split isVertical])
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5758 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5759 total = rect1.size.width;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5760 pos = rect2.size.width;
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5761 }
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5762 else
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5763 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5764 total = rect1.size.height;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5765 pos = rect2.size.height;
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5766 }
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5767 if(total > 0)
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5768 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5769 retval = pos / total;
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5770 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5771 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5772 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5773
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5774 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5775 * Create a bitmap object to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5776 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5777 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5778 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5779 HWND API dw_bitmap_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5780 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5781 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5782 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5783 NSImageView *bitmap = [[NSImageView alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5784 [bitmap setImageFrameStyle:NSImageFrameNone];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5785 [bitmap setEditable:NO];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5786 [bitmap setTag:cid];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5787 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5788 return bitmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5789 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5790
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5791 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5792 * Creates a pixmap with given parameters.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5793 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5794 * handle: Window handle the pixmap is associated with.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5795 * width: Width of the pixmap in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5796 * height: Height of the pixmap in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5797 * depth: Color depth of the pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5798 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5799 * A handle to a pixmap or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5800 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5801 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5802 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5803 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5804
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5805 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5806 return NULL;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5807 pixmap->width = width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5808 pixmap->height = height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5809 pixmap->handle = handle;
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5810 id image = pixmap->image = [[NSBitmapImageRep alloc]
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5811 initWithBitmapDataPlanes:NULL
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5812 pixelsWide:width
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5813 pixelsHigh:height
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5814 bitsPerSample:8
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5815 samplesPerPixel:4
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5816 hasAlpha:YES
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5817 isPlanar:NO
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5818 colorSpaceName:@"NSCalibratedRGBColorSpace"
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5819 bytesPerRow:0
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5820 bitsPerPixel:0];
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5821 [image retain];
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5822 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5823 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5824
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5825 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5826 * Creates a pixmap from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5827 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5828 * handle: Window handle the pixmap is associated with.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5829 * filename: Name of the file, omit extention to have
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5830 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5831 * (BMP on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5832 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5833 * A handle to a pixmap or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5834 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5835 HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5836 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5837 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5838
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5839 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5840 return NULL;
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5841 NSString *nstr = [ NSString stringWithUTF8String:filename ];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5842 NSBitmapImageRep *image = [[NSBitmapImageRep alloc] initWithContentsOfFile:nstr];
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5843 if(!image)
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5844 {
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5845 nstr = [nstr stringByAppendingString:@".png"];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5846 image = [[NSBitmapImageRep alloc] initWithContentsOfFile:nstr];
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5847 }
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5848 NSSize size = [image size];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5849 pixmap->width = size.width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5850 pixmap->height = size.height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5851 pixmap->image = image;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5852 pixmap->handle = handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5853 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5854 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5855
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5856 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5857 * Creates a pixmap from memory.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5858 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5859 * handle: Window handle the pixmap is associated with.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5860 * data: Source of the image data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5861 * (BMP on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5862 * le: length of data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5863 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5864 * A handle to a pixmap or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5865 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5866 HPIXMAP API dw_pixmap_new_from_data(HWND handle, char *data, int len)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5867 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5868 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5869
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5870 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5871 return NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5872 NSData *thisdata = [NSData dataWithBytes:data length:len];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5873 NSBitmapImageRep *image = [[NSBitmapImageRep alloc] initWithData:thisdata];
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5874 NSSize size = [image size];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5875 pixmap->width = size.width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5876 pixmap->height = size.height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5877 pixmap->image = image;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5878 pixmap->handle = handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5879 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5880 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5881
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5882 /*
890 5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	5883 * Sets the transparent color for a pixmap
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	5884 * Parameters:
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	5885 * pixmap: Handle to a pixmap returned by
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	5886 * dw_pixmap_new..
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	5887 * color: transparent color
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	5888 * Note: This does nothing on Mac as transparency
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	5889 * is handled automatically
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5890 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5891 void API dw_pixmap_set_transparent_color( HPIXMAP pixmap, ULONG color )
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5892 {
890 5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	5893 /* Don't do anything */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5894 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5895
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5896 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5897 * Creates a pixmap from internal resource graphic specified by id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5898 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5899 * handle: Window handle the pixmap is associated with.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5900 * id: Resource ID associated with requested pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5901 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5902 * A handle to a pixmap or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903 */
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5904 HPIXMAP API dw_pixmap_grab(HWND handle, ULONG resid)
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5905 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5906 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5907
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5908 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5909 return NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5910
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5911 NSBundle *bundle = [NSBundle mainBundle];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5912 NSString *respath = [bundle resourcePath];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5913 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5914 NSBitmapImageRep *image = [[NSBitmapImageRep alloc] initWithContentsOfFile:filepath];
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5915 NSSize size = [image size];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5916 pixmap->width = size.width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5917 pixmap->height = size.height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5918 pixmap->image = image;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5919 pixmap->handle = handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5920 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5921 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5922
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5923 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5924 * Destroys an allocated pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5925 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5926 * pixmap: Handle to a pixmap returned by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5927 * dw_pixmap_new..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5928 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929 void API dw_pixmap_destroy(HPIXMAP pixmap)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 {
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5931 NSBitmapImageRep image = (NSBitmapImageRep )pixmap->image;
c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	5932 [image release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5933 free(pixmap);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5934 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5935
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5936 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5937 * Copies from one item to another.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5938 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5939 * dest: Destination window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5940 * destp: Destination pixmap. (choose only one).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5941 * xdest: X coordinate of destination.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5942 * ydest: Y coordinate of destination.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5943 * width: Width of area to copy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5944 * height: Height of area to copy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5945 * src: Source window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5946 * srcp: Source pixmap. (choose only one).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5947 * xsrc: X coordinate of source.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5948 * ysrc: Y coordinate of source.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5949 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5950 void API dw_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5951 {
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5952 DWBitBlt *bltinfo = calloc(1, sizeof(DWBitBlt));
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5953 NSValue* bi = [NSValue valueWithPointer:bltinfo];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5954
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5955 /* Fill in the information */
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5956 bltinfo->dest = dest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5957 bltinfo->src = src;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5958 bltinfo->xdest = xdest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5959 bltinfo->ydest = ydest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5960 bltinfo->width = width;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5961 bltinfo->height = height;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5962 bltinfo->xsrc = xsrc;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5963 bltinfo->ysrc = ysrc;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5964
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5965 if(destp)
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5966 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5967 bltinfo->dest = (id)destp->image;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5968 }
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5969 if(srcp)
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5970 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	5971 id object = bltinfo->src = (id)srcp->image;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5972 [object retain];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5973 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	5974 [DWObj performSelectorOnMainThread:@selector(doBitBlt:) withObject:bi waitUntilDone:YES];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5975 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5976
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5977 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5978 * Create a new static text window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5979 * Not available under OS/2, eCS
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5980 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5981 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5982 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5983 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5984 HWND API dw_calendar_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5985 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	5986 DWCalendar *calendar = [[DWCalendar alloc] init];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	5987 [calendar setDatePickerMode:NSSingleDateMode];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	5988 [calendar setDatePickerStyle:NSClockAndCalendarDatePickerStyle];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	5989 [calendar setDatePickerElements:NSYearMonthDayDatePickerElementFlag];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5990 [calendar setTag:cid];
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	5991 return calendar;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5992 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5993
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5994 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5995 * Sets the current date of a calendar
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5996 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5997 * handle: The handle to the calendar returned by dw_calendar_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5998 * year...
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5999 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6000 void dw_calendar_set_date(HWND handle, unsigned int year, unsigned int month, unsigned int day)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6001 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6002 DWCalendar *calendar = handle;
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6003 NSDate *date;
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6004 char buffer[100];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6005
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6006 sprintf(buffer, "%04d-%02d-%02d 00:00:00 +0600", year, month, day);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6007
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6008 date = [[NSDate alloc] initWithString:[ NSString stringWithUTF8String:buffer ]];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6009 [calendar setDateValue:date];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6010 [date release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6011 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6012
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6013 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6014 * Gets the position of a splitbar (pecentage).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6015 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6016 * handle: The handle to the splitbar returned by dw_splitbar_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6017 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6018 void dw_calendar_get_date(HWND handle, unsigned int year, unsigned int month, unsigned int *day)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6020 DWCalendar *calendar = handle;
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6021 NSDate *date = [calendar dateValue];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6022 NSDateFormatter *df = [[NSDateFormatter alloc] init];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6023 [df setDateStyle:NSDateFormatterShortStyle];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6024 NSString *nstr = [df stringFromDate:date];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6025 sscanf([ nstr UTF8String ], "%d/%d/%d", month, day, year);
730 d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6026 if(*year < 70)
d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6027 {
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6028 *year += 2000;
730 d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6029 }
d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6030 else if(*year < 100)
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6031 {
730 d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6032 *year += 1900;
d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6033 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6034 [df release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6035 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6036
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6037 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6038 * Causes the embedded HTML widget to take action.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6039 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6040 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6041 * action: One of the DW_HTML_* constants.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6042 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6043 void API dw_html_action(HWND handle, int action)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6044 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6045 WebView *html = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6046 switch(action)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6047 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6048 case DW_HTML_GOBACK:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6049 [html goBack];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6050 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6051 case DW_HTML_GOFORWARD:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6052 [html goForward];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6053 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6054 case DW_HTML_GOHOME:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6055 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6056 case DW_HTML_SEARCH:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6057 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6058 case DW_HTML_RELOAD:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6059 [html reload:html];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6060 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6061 case DW_HTML_STOP:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6062 [html stopLoading:html];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6063 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6064 case DW_HTML_PRINT:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6065 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6066 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6067 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6068
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6069 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6070 * Render raw HTML code in the embedded HTML widget..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6071 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6072 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6073 * string: String buffer containt HTML code to
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6074 * be rendered.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6075 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6076 * 0 on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6077 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6078 int API dw_html_raw(HWND handle, char *string)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6079 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6080 WebView *html = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6081 [[html mainFrame] loadHTMLString:[ NSString stringWithUTF8String:string ] baseURL:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6082 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6083 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6084
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6085 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6086 * Render file or web page in the embedded HTML widget..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6087 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6088 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6089 * url: Universal Resource Locator of the web or
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6090 * file object to be rendered.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6091 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6092 * 0 on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6093 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6094 int API dw_html_url(HWND handle, char *url)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6095 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6096 WebView *html = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6097 [[html mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[ NSString stringWithUTF8String:url ]]]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6098 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6099 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6100
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6101 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6102 * Create a new HTML window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6103 * Not available under OS/2, eCS
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6104 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6105 * text: The default text to be in the entryfield widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6106 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6107 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6108 HWND API dw_html_new(unsigned long cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6109 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6110 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6111 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6112 WebView *web = [[WebView alloc] init];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6113 /* [web setTag:cid]; Why doesn't this work? */
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6114 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6115 return web;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6116 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6117
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6118 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6119 * Returns the current X and Y coordinates of the mouse pointer.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6120 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6121 * x: Pointer to variable to store X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6122 * y: Pointer to variable to store Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6123 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6124 void API dw_pointer_query_pos(long x, long y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6125 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6126 NSPoint mouseLoc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6127 mouseLoc = [NSEvent mouseLocation];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6128 if(x)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6129 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6130 *x = mouseLoc.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6131 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6132 if(y)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6133 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6134 *y = mouseLoc.y;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6135 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6136 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6137
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6138 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6139 * Sets the X and Y coordinates of the mouse pointer.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6140 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6141 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6142 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6143 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6144 void API dw_pointer_set_pos(long x, long y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6145 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6146 /* From what I have read this isn't possible, agaist human interface rules */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6147 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6148
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6149 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6150 * Create a menu object to be popped up.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6151 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6152 * id: An ID to be used for getting the resource from the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6153 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6154 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6155 HMENUI API dw_menu_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6156 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6157 NSMenu *menu = [[[NSMenu alloc] init] autorelease];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6158 [menu setAutoenablesItems:NO];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6159 /* [menu setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6160 return menu;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6161 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6162
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6163 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6164 * Create a menubar on a window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6165 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6166 * location: Handle of a window frame to be attached to.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6167 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6168 HMENUI API dw_menubar_new(HWND location)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6169 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6170 NSWindow *window = location;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6171 NSMenu *windowmenu = _generate_main_menu();
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6172 [[window contentView] setMenu:windowmenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6173 return (HMENUI)windowmenu;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6174 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6175
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6176 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6177 * Destroys a menu created with dw_menubar_new or dw_menu_new.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6178 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6179 * menu: Handle of a menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6180 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6181 void API dw_menu_destroy(HMENUI *menu)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6182 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6183 NSMenu thismenu = menu;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6184 [thismenu release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6185 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6186
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6187 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6188 * Pops up a context menu at given x and y coordinates.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6189 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6190 * menu: The handle the the existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6191 * parent: Handle to the window initiating the popup.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6192 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6193 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6194 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6195 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6196 {
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	6197 NSMenu thismenu = (NSMenu )*menu;
711 82250177f814 Fix for popup menus not being created when window handle passed is a toplevel window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 710 diff changeset	6198 id object = parent;
82250177f814 Fix for popup menus not being created when window handle passed is a toplevel window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 710 diff changeset	6199 NSView *view = [object isKindOfClass:[NSWindow class]] ? [object contentView] : parent;
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	6200 NSWindow *window = [view window];
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	6201 NSEvent *event = [DWApp currentEvent];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6202 NSEvent* fake = [NSEvent mouseEventWithType:NSRightMouseDown
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	6203 location:[window convertScreenToBase:NSMakePoint(x, y)]
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6204 modifierFlags:0
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	6205 timestamp:[event timestamp]
e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	6206 windowNumber:[window windowNumber]
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6207 context:[NSGraphicsContext currentContext]
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6208 eventNumber:1
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6209 clickCount:1
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6210 pressure:0.0];
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	6211 [NSMenu popUpContextMenu:thismenu withEvent:fake forView:view];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6212 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6213
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6214 char _removetilde(char dest, char src)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6215 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6216 int z, cur=0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6217 char accel = '\0';
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6218
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6219 for(z=0;z<strlen(src);z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6220 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6221 if(src[z] != '~')
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6222 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6223 dest[cur] = src[z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6224 cur++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6225 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6226 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6227 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6228 accel = src[z+1];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6229 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6230 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6231 dest[cur] = 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6232 return accel;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6233 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6234
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6235 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6236 * Adds a menuitem or submenu to an existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6237 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6238 * menu: The handle the the existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6239 * title: The title text on the menu item to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6240 * id: An ID to be used for message passing.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6241 * flags: Extended attributes to set on the menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6242 * end: If TRUE memu is positioned at the end of the menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6243 * check: If TRUE menu is "check"able.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6244 * flags: Extended attributes to set on the menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6245 * submenu: Handle to an existing menu to be a submenu or NULL.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6246 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	6247 HWND API dw_menu_append_item(HMENUI menux, char *title, ULONG itemid, ULONG flags, int end, int check, HMENUI submenux)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6248 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6249 NSMenu *menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6250 NSMenu *submenu = submenux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6251 NSMenuItem *item = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6252 if(strlen(title) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6253 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6254 [menu addItem:[NSMenuItem separatorItem]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6255 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6256 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6257 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6258 char accel[2];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6259 char *newtitle = malloc(strlen(title)+1);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6260 NSString *nstr;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6261
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6262 accel[0] = _removetilde(newtitle, title);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6263 accel[1] = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6264
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6265 nstr = [ NSString stringWithUTF8String:newtitle ];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6266 free(newtitle);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6267
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6268 item = [menu addItemWithTitle: nstr
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6269 action:@selector(menuHandler:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6270 keyEquivalent:[ NSString stringWithUTF8String:accel ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6271 [item setTag:itemid];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6272 if(flags & DW_MIS_CHECKED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6273 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6274 [item setState:NSOnState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6275 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6276 if(flags & DW_MIS_DISABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6277 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6278 [item setEnabled:NO];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6279 }
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6280
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6281 if(submenux)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6282 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6283 [submenu setTitle:nstr];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6284 [menu setSubmenu:submenu forItem:item];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6285 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6286 return item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6287 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6288 return item;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6289 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6290
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6291 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6292 * Sets the state of a menu item check.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6293 * Deprecated; use dw_menu_item_set_state()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6294 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6295 * menu: The handle the the existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6296 * id: Menuitem id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6297 * check: TRUE for checked FALSE for not checked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6298 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	6299 void API dw_menu_item_set_check(HMENUI menux, unsigned long itemid, int check)
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	6300 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6301 id menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6302 NSMenuItem menuitem = (NSMenuItem )[menu itemWithTag:itemid];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6303
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6304 if(menuitem != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6305 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6306 if(check)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6307 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6308 [menuitem setState:NSOnState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6309 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6310 else
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6311 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6312 [menuitem setState:NSOffState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6313 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6314 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6315 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6316
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6317 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6318 * Sets the state of a menu item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6319 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6320 * menu: The handle to the existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6321 * id: Menuitem id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6322 * flags: DW_MIS_ENABLED/DW_MIS_DISABLED
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6323 * DW_MIS_CHECKED/DW_MIS_UNCHECKED
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6324 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	6325 void API dw_menu_item_set_state(HMENUI menux, unsigned long itemid, unsigned long state)
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	6326 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6327 id menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6328 NSMenuItem menuitem = (NSMenuItem )[menu itemWithTag:itemid];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6329
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6330 if(menuitem != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6331 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6332 if(state & DW_MIS_CHECKED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6333 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6334 [menuitem setState:NSOnState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6335 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6336 else if(state & DW_MIS_UNCHECKED)
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6337 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6338 [menuitem setState:NSOffState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6339 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6340 if(state & DW_MIS_ENABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6341 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6342 [menuitem setEnabled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6343 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6344 else if(state & DW_MIS_DISABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6345 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6346 [menuitem setEnabled:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6347 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6348 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6349 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6350
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	6351 /* Gets the notebook page from associated ID */
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	6352 DWNotebookPage _notepage_from_id(DWNotebook notebook, unsigned long pageid)
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	6353 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6354 NSArray *pages = [notebook tabViewItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6355 for(DWNotebookPage *notepage in pages)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6356 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6357 if([notepage pageid] == pageid)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6358 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6359 return notepage;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6360 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6361 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6362 return nil;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	6363 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	6364
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6365 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6366 * Create a notebook object to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6367 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6368 * id: An ID to be used for getting the resource from the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6369 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6370 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6371 HWND API dw_notebook_new(ULONG cid, int top)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6372 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6373 DWNotebook *notebook = [[DWNotebook alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6374 [notebook setDelegate:notebook];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6375 /* [notebook setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6376 return notebook;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6377 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6378
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6379 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6380 * Adds a new page to specified notebook.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6381 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6382 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6383 * flags: Any additional page creation flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6384 * front: If TRUE page is added at the beginning.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6385 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6386 unsigned long API dw_notebook_page_new(HWND handle, ULONG flags, int front)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6387 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6388 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6389 NSInteger page = [notebook pageid];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6390 DWNotebookPage *notepage = [[DWNotebookPage alloc] initWithIdentifier:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6391 [notepage setPageid:(NSInteger)page];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6392 if(front)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6393 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6394 [notebook insertTabViewItem:notepage atIndex:(NSInteger)0];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6395 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6396 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6397 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6398 [notebook addTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6399 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6400 [notebook setPageid:(page+1)];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6401 [notepage release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6402 return (unsigned long)page;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6403 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6404
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6405 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6406 * Remove a page from a notebook.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6407 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6408 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6409 * pageid: ID of the page to be destroyed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6410 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6411 void API dw_notebook_page_destroy(HWND handle, unsigned int pageid)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6412 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6413 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6414 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6415
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6416 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6417 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6418 [notebook removeTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6419 [notepage release];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6420 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6421 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6422
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6423 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6424 * Queries the currently visible page ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6425 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6426 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6427 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6428 unsigned long API dw_notebook_page_get(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6429 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6430 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6431 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6432 return [notepage pageid];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6433 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6434
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6435 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6436 * Sets the currently visibale page ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6437 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6438 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6439 * pageid: ID of the page to be made visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6440 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6441 void API dw_notebook_page_set(HWND handle, unsigned int pageid)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6442 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6443 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6444 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6445
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6446 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6447 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6448 [notebook selectTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6449 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6450 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6451
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6452 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6453 * Sets the text on the specified notebook tab.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6454 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6455 * handle: Notebook handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6456 * pageid: Page ID of the tab to set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6457 * text: Pointer to the text to set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6458 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6459 void API dw_notebook_page_set_text(HWND handle, ULONG pageid, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6460 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6461 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6462 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6463
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6464 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6465 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6466 [notepage setLabel:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6467 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6468 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6469
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6470 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6471 * Sets the text on the specified notebook tab status area.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6472 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6473 * handle: Notebook handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6474 * pageid: Page ID of the tab to set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6475 * text: Pointer to the text to set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6476 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6477 void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6478 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6479 /* Note supported here... do nothing */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6480 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6481
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6482 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6483 * Packs the specified box into the notebook page.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6484 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6485 * handle: Handle to the notebook to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6486 * pageid: Page ID in the notebook which is being packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6487 * page: Box handle to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6488 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6489 void API dw_notebook_pack(HWND handle, ULONG pageid, HWND page)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6490 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6491 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6492 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6493
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6494 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6495 {
667 28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	6496 HWND tmpbox = dw_box_new(DW_VERT, 0);
28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	6497 DWBox *box = tmpbox;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6498
667 28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	6499 dw_box_pack_start(tmpbox, page, 0, 0, TRUE, TRUE, 0);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6500 [notepage setView:box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6501 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6502 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6503
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6504 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6505 * Create a new Window Frame.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6506 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6507 * owner: The Owner's window handle or HWND_DESKTOP.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6508 * title: The Window title.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6509 * flStyle: Style flags, see the PM reference.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6510 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6511 HWND API dw_window_new(HWND hwndOwner, char *title, ULONG flStyle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6512 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6513 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6514 DW_MUTEX_LOCK;
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6515 NSRect frame = NSMakeRect(1,1,1,1);
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	6516 DWWindow *window = [[DWWindow alloc]
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6517 initWithContentRect:frame
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6518 styleMask:(flStyle \| NSTexturedBackgroundWindowMask)
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6519 backing:NSBackingStoreBuffered
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6520 defer:false];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6521
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6522 [window setTitle:[ NSString stringWithUTF8String:title ]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6523
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6524 DWView *view = [[DWView alloc] init];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6525
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6526 [window setContentView:view];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6527 [window setDelegate:view];
766 82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	6528 [window setAutorecalculatesKeyViewLoop:YES];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6529 [view release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6530
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6531 /* If it isn't a toplevel window... */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6532 if(hwndOwner)
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6533 {
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6534 id object = hwndOwner;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6535
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6536 /* Check to see if the parent is an MDI window */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6537 if([object isMemberOfClass:[DWMDI class]])
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6538 {
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6539 /* Set the window level to be floating */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6540 [window setLevel:NSFloatingWindowLevel];
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6541 [window setHidesOnDeactivate:YES];
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6542 }
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6543 }
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6544 DW_MUTEX_UNLOCK;
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6545 return (HWND)window;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6546 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6547
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6548 /*
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6549 * Call a function from the window (widget)'s context.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6550 * Parameters:
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6551 * handle: Window handle of the widget.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6552 * function: Function pointer to be called.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6553 * data: Pointer to the data to be passed to the function.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6554 */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6555 void API dw_window_function(HWND handle, void function, void data)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6556 {
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6557 void *params = calloc(2, sizeof(void ));
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6558 NSValue *v = [NSValue valueWithPointer:params];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6559 params[0] = function;
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6560 params[1] = data;
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6561 [DWObj performSelectorOnMainThread:@selector(doWindowFunc:) withObject:v waitUntilDone:YES];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6562 free(params);
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6563 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6564
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6565
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6566 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6567 * Changes the appearance of the mouse pointer.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6568 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6569 * handle: Handle to widget for which to change.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6570 * cursortype: ID of the pointer you want.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6571 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6572 void API dw_window_set_pointer(HWND handle, int pointertype)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6573 {
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6574 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6575
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6576 if([ object isKindOfClass:[ NSView class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6577 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6578 NSView *view = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6579
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6580 if(pointertype == DW_POINTER_DEFAULT)
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6581 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6582 [view discardCursorRects];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6583 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6584 else if(pointertype == DW_POINTER_ARROW)
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6585 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6586 NSRect rect = [view frame];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6587 NSCursor *cursor = [NSCursor arrowCursor];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6588
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6589 [view addCursorRect:rect cursor:cursor];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6590 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6591 /* No cursor for DW_POINTER_CLOCK? */
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6592 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6593 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6594
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6595 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6596 * Makes the window visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6597 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6598 * handle: The window handle to make visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6599 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6600 int API dw_window_show(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6601 {
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6602 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6603
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6604 if([ object isKindOfClass:[ NSWindow class ] ])
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6605 {
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6606 NSWindow *window = handle;
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6607 NSRect rect = [window frame];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6608 if([window isMiniaturized])
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6609 {
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6610 [window deminiaturize:nil];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6611 }
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6612 /* If we haven't been sized by a call.. */
737 680c7f365d0d Slight change to the window initial size fix... still don't like this solution. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 736 diff changeset	6613 if(rect.size.width < 5 \|\| rect.size.height < 5)
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6614 {
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6615 /* Make a sane default size because MacOS won't automatically */
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6616 [window setContentSize:NSMakeSize(200,150)];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6617 }
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6618 [window makeKeyAndOrderFront:nil];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6619 [[window contentView] windowResized:nil];
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	6620 [[window contentView] windowDidBecomeMain:nil];
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6621 }
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	6622 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6623 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6624
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6625 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6626 * Makes the window invisible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6627 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6628 * handle: The window handle to make visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6629 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6630 int API dw_window_hide(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6631 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6632 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6633
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6634 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6635 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6636 NSWindow *window = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6637
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6638 [window orderOut:nil];
8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6639 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6640 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6641 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6642
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6643 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6644 * Sets the colors used by a specified window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6645 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6646 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6647 * fore: Foreground color in DW_RGB format or a default color index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6648 * back: Background color in DW_RGB format or a default color index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6649 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6650 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6651 {
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6652 id object = handle;
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6653 unsigned long _fore = _get_color(fore);
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6654 unsigned long _back = _get_color(back);
811 50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6655 NSColor *fg = NULL;
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6656 NSColor *bg = NULL;
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6657
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6658 /* Get the NSColor for non-default colors */
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6659 if(fore != DW_CLR_DEFAULT)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6660 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6661 fg = [NSColor colorWithDeviceRed: DW_RED_VALUE(_fore)/255.0 green: DW_GREEN_VALUE(_fore)/255.0 blue: DW_BLUE_VALUE(_fore)/255.0 alpha: 1];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6662 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6663 if(back != DW_CLR_DEFAULT)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6664 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6665 bg = [NSColor colorWithDeviceRed: DW_RED_VALUE(_back)/255.0 green: DW_GREEN_VALUE(_back)/255.0 blue: DW_BLUE_VALUE(_back)/255.0 alpha: 1];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6666 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6667
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6668 /* Get the textfield from the spinbutton */
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6669 if([object isMemberOfClass:[DWSpinButton class]])
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6670 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6671 object = [object textfield];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6672 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6673 /* Get the cell on classes using NSCell */
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6674 if([object isKindOfClass:[NSTextField class]])
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6675 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6676 id cell = [object cell];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6677
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6678 if(fg)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6679 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6680 [cell setTextColor:fg];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6681 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6682 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6683 if([object isKindOfClass:[NSTextField class]] \|\| [object isKindOfClass:[NSButton class]])
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6684 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6685 id cell = [object cell];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6686
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6687 if(bg)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6688 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6689 [cell setBackgroundColor:bg];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6690 }
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6691 }
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6692 else if([object isMemberOfClass:[DWBox class]])
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6693 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6694 DWBox *box = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6695
811 50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6696 if(bg)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6697 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6698 [box setColor:_back];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6699 }
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6700 }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6701 else if([object isKindOfClass:[NSTableView class]])
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6702 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6703 DWContainer *cont = handle;
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6704
811 50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6705 if(bg)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6706 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6707 [cont setBackgroundColor:bg];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6708 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6709 if(fg)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6710 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6711 [cont setForegroundColor:fg];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	6712 }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6713 }
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6714 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6715 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6716
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6717 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6718 * Sets the font used by a specified window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6719 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6720 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6721 * border: Size of the window border in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6722 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6723 int API dw_window_set_border(HWND handle, int border)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6724 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6725 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6726 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6727
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6728 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6729 * Sets the style of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6730 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6731 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6732 * width: New width in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6733 * height: New height in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6734 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6735 void API dw_window_set_style(HWND handle, ULONG style, ULONG mask)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6736 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6737 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6738
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	6739 if(DWOSMinor > 5 && [object isMemberOfClass:[DWWindow class]])
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	6740 {
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	6741 DWWindow *window = object;
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6742 int currentstyle = (int)[window styleMask];
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6743 int tmp;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6744
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6745 tmp = currentstyle \| (int)mask;
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6746 tmp ^= mask;
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6747 tmp \|= style;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6748
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6749 [window setStyleMask:tmp];
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6750 }
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	6751 else if([object isKindOfClass:[NSTextField class]])
bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	6752 {
bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	6753 NSTextField *tf = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6754
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	6755 [[tf cell] setAlignment:(style & 0xF)];
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	6756 if(style & DW_DT_VCENTER)
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	6757 {
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	6758 [[tf cell] setVCenter:YES];
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	6759 }
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	6760 }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6761 else if([object isMemberOfClass:[NSTextView class]])
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6762 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6763 NSTextView *tv = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6764 [tv setAlignment:(style & mask)];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6765 }
763 2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6766 else if([object isMemberOfClass:[DWButton class]])
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6767 {
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6768 DWButton *button = handle;
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6769
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6770 if(mask & DW_BS_NOBORDER)
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6771 {
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6772 if(style & DW_BS_NOBORDER)
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6773 {
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6774 [button setButtonType:NSMomentaryLight];
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6775 [button setBordered:NO];
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6776 }
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6777 else
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6778 {
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6779 [button setButtonType:NSMomentaryPushInButton];
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6780 [button setBordered:YES];
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6781 }
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6782 }
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	6783 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6784 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6785
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6786 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6787 * Sets the default focus item for a window/dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6788 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6789 * window: Toplevel window or dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6790 * defaultitem: Handle to the dialog item to be default.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6791 */
766 82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	6792 void API dw_window_default(HWND handle, HWND defaultitem)
82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	6793 {
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	6794 DWWindow *window = handle;
872 13debcad9757 Another test fix at reported crash in dw_window_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 867 diff changeset	6795 id object = defaultitem;
766 82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	6796
872 13debcad9757 Another test fix at reported crash in dw_window_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 867 diff changeset	6797 if([window isKindOfClass:[NSWindow class]] && [object isKindOfClass:[NSControl class]])
864 ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	6798 {
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	6799 [window setInitialFirstResponder:defaultitem];
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	6800 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6801 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6802
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6803 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6804 * Sets window to click the default dialog item when an ENTER is pressed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6805 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6806 * window: Window (widget) to look for the ENTER press.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6807 * next: Window (widget) to move to next (or click)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6808 */
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6809 void API dw_window_click_default(HWND handle, HWND next)
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6810 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6811 id object = handle;
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6812 id control = next;
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6813
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	6814 if([object isMemberOfClass:[DWWindow class]])
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	6815 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	6816 if([control isMemberOfClass:[DWButton class]])
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	6817 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	6818 NSWindow *window = object;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6819
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	6820 [window setDefaultButtonCell:control];
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	6821 }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6822 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6823 else
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6824 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6825 if([control isMemberOfClass:[DWSpinButton class]])
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6826 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6827 control = [control textfield];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6828 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6829 else if([control isMemberOfClass:[DWComboBox class]])
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6830 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6831 /* TODO: Figure out why the combobox can't be
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6832 * focused using makeFirstResponder method.
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6833 */
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6834 control = [control textfield];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6835 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6836 [object setClickDefault:control];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	6837 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6838 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6839
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6840 static id _DWCapture;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6841
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6842 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6843 * Captures the mouse input to this window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6844 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6845 * handle: Handle to receive mouse input.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6846 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6847 void API dw_window_capture(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6848 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6849 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6850
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	6851 if(![object isMemberOfClass:[DWWindow class]])
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6852 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6853 object = [object window];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6854 }
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6855 if(object)
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6856 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6857 [object setAcceptsMouseMovedEvents:YES];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6858 _DWCapture = object;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6859 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6860 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6861
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6862 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6863 * Releases previous mouse capture.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6864 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6865 void API dw_window_release(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6866 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6867 if(_DWCapture)
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6868 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6869 [_DWCapture setAcceptsMouseMovedEvents:NO];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6870 _DWCapture = nil;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6871 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6872 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6873
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6874 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6875 * Changes a window's parent to newparent.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6876 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6877 * handle: The window handle to destroy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6878 * newparent: The window's new parent window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6879 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6880 void API dw_window_reparent(HWND handle, HWND newparent)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6881 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6882 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6883
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	6884 if([object isMemberOfClass:[DWWindow class]])
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6885 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6886 /* We can't actually reparent on MacOS but if the
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6887 * new parent is an MDI window, change to be a
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6888 * floating window... otherwise set it to normal.
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6889 */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6890 NSWindow *window = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6891
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6892 /* If it isn't a toplevel window... */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6893 if(newparent)
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6894 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6895 object = newparent;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6896
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6897 /* Check to see if the parent is an MDI window */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6898 if([object isMemberOfClass:[DWMDI class]])
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6899 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6900 /* Set the window level to be floating */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6901 [window setLevel:NSFloatingWindowLevel];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6902 [window setHidesOnDeactivate:YES];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6903 return;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6904 }
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6905 }
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6906 /* Set the window back to a normal window */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6907 [window setLevel:NSNormalWindowLevel];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6908 [window setHidesOnDeactivate:NO];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	6909 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6910 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6911
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6912 NSFont _dw_font_by_name(char fontname)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6913 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6914 char *fontcopy = strdup(fontname);
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6915 char *name = strchr(fontcopy, '.');
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6916 NSFont *font = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6917
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6918 if(name)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6919 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6920 int size = atoi(fontcopy);
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6921 *name = 0;
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6922 name++;
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6923 font = [NSFont fontWithName:[ NSString stringWithUTF8String:name ] size:(float)size];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6924 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6925 free(fontcopy);
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6926 return font;
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6927 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6928
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6929 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6930 * Sets the font used by a specified window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6931 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6932 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6933 * fontname: Name and size of the font in the form "size.fontname"
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6934 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6935 int API dw_window_set_font(HWND handle, char *fontname)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6936 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6937 NSFont *font = _dw_font_by_name(fontname);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6938
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6939 if(font)
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	6940 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6941 id object = handle;
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6942 if([object window])
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	6943 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6944 [object lockFocus];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6945 [font set];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6946 [object unlockFocus];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6947 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6948 if([object isKindOfClass:[NSControl class]])
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6949 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6950 [object setFont:font];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6951 [[object cell] setFont:font];
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	6952 }
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6953 else if([object isMemberOfClass:[DWRender class]])
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6954 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6955 DWRender *render = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6956
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6957 [render setFont:font];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6958 }
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	6959 }
bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	6960 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6961 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6962
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6963 /*
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6964 * Returns the current font for the specified window
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6965 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6966 * handle: The window handle from which to obtain the font.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6967 */
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6968 char * API dw_window_get_font(HWND handle)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6969 {
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6970 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6971
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6972 if([object isKindOfClass:[NSControl class]] \|\| [object isMemberOfClass:[DWRender class]])
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6973 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6974 NSFont *font = [object font];
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6975 NSString *fontname = [font fontName];
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6976 NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]];
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6977 return strdup([output UTF8String]);
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6978 }
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6979 return NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6980 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6981
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6982 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6983 * Destroys a window and all of it's children.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6984 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6985 * handle: The window handle to destroy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6986 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6987 int API dw_window_destroy(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6988 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6989 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6990 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6991 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6992
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6993 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6994 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6995 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6996 [window close];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6997 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	6998 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6999 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7000 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7001
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7002 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7003 * Gets the text used for a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7004 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7005 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7006 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7007 * text: The text associsated with a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7008 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7009 char * API dw_window_get_text(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7010 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7011 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7012
808 c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7013 if([ object isKindOfClass:[ NSWindow class ] ] \|\| [ object isKindOfClass:[ NSButton class ] ])
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7014 {
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7015 id window = handle;
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7016 NSString *nsstr = [ window title];
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7017
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7018 return strdup([ nsstr UTF8String ]);
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7019 }
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7020 else if([ object isKindOfClass:[ NSControl class ] ])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7021 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7022 NSControl *control = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7023 NSString *nsstr = [ control stringValue];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7024
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7025 return strdup([ nsstr UTF8String ]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7026 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7027 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7028 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7029
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7030 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7031 * Sets the text used for a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7032 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7033 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7034 * text: The text associsated with a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7035 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7036 void API dw_window_set_text(HWND handle, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7037 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7038 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7039 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7040 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7041
807 f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7042 if([ object isKindOfClass:[ NSWindow class ] ] \|\| [ object isKindOfClass:[ NSButton class ] ])
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7043 {
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7044 id window = handle;
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7045 [window setTitle:[ NSString stringWithUTF8String:text ]];
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7046 }
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7047 else if([ object isKindOfClass:[ NSControl class ] ])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7048 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7049 NSControl *control = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7050 [control setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7051 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7052 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7053 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7054
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7055 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7056 * Disables given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7057 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7058 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7059 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7060 void API dw_window_disable(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7061 {
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7062 id object = handle;
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7063
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7064 if([object isMemberOfClass:[NSScrollView class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7065 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7066 NSScrollView *sv = handle;
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7067 object = [sv documentView];
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7068 }
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7069 if([object isKindOfClass:[NSControl class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7070 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7071 NSControl *control = object;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7072 [control setEnabled:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7073 }
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7074 if([object isKindOfClass:[NSTextView class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7075 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7076 NSTextView *mle = object;
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7077
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7078 [mle setEditable:NO];
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7079 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7080 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7081
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7082 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7083 * Enables given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7084 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7085 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7086 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7087 void API dw_window_enable(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7088 {
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7089 id object = handle;
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7090
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7091 if([object isMemberOfClass:[NSScrollView class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7092 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7093 NSScrollView *sv = handle;
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7094 object = [sv documentView];
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7095 }
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7096 if([object isKindOfClass:[NSControl class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7097 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7098 NSControl *control = object;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7099 [control setEnabled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7100 }
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7101 if([object isKindOfClass:[NSTextView class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7102 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7103 NSTextView *mle = object;
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7104
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7105 [mle setEditable:YES];
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	7106 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7107 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7108
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7109 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7110 * Sets the bitmap used for a given static window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7111 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7112 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7113 * id: An ID to be used to specify the icon,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7114 * (pass 0 if you use the filename param)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7115 * filename: a path to a file (Bitmap on OS/2 or
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7116 * Windows and a pixmap on Unix, pass
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7117 * NULL if you use the id param)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7118 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	7119 void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, char *data, int len)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7120 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7121 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7122 if([ object isKindOfClass:[ NSImageView class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7123 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7124 NSImageView *iv = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7125 NSData *thisdata = [NSData dataWithBytes:data length:len];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7126 NSImage *pixmap = [[NSImage alloc] initWithData:thisdata];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7127
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7128 if(pixmap)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7129 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7130 [iv setImage:pixmap];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7131 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7132 [pixmap release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7133 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7134 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7135
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7136 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7137 * Sets the bitmap used for a given static window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7138 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7139 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7140 * id: An ID to be used to specify the icon,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7141 * (pass 0 if you use the filename param)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7142 * filename: a path to a file (Bitmap on OS/2 or
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7143 * Windows and a pixmap on Unix, pass
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7144 * NULL if you use the id param)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7145 */
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7146 void API dw_window_set_bitmap(HWND handle, unsigned long resid, char *filename)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7147 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7148 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7149 if([ object isKindOfClass:[ NSImageView class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7150 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7151 NSImageView *iv = handle;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	7152 NSImage *bitmap = nil;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7153
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7154 if(filename)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7155 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7156 bitmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7157 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7158 else if(resid > 0 && resid < 65536)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7159 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7160 bitmap = dw_icon_load(0, resid);
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7161 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7162
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7163 if(bitmap)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7164 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7165 [iv setImage:bitmap];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7166 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7167 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7168 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7169
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7170 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7171 * Sets the icon used for a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7172 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7173 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7174 * id: An ID to be used to specify the icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7175 */
672 388f2a48aaae Missed one function to typedef. Fixed errors in the test program and switched to using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 671 diff changeset	7176 void API dw_window_set_icon(HWND handle, HICN icon)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7177 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7178 /* This isn't needed, it is loaded from the bundle */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7179 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7180
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7181 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7182 * Gets the child window handle with specified ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7183 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7184 * handle: Handle to the parent window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7185 * id: Integer ID of the child.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7186 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	7187 HWND API dw_window_from_id(HWND handle, int cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7188 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7189 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7190 NSView *view = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7191 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7192 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7193 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7194 view = [window contentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7195 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7196 return [view viewWithTag:cid];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7197 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7198
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7199 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7200 * Minimizes or Iconifies a top-level window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7201 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7202 * handle: The window handle to minimize.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7203 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7204 int API dw_window_minimize(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7205 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7206 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7207 [window miniaturize:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7208 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7209 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7210
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7211 /* Causes entire window to be invalidated and redrawn.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7212 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7213 * handle: Toplevel window handle to be redrawn.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7214 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7215 void API dw_window_redraw(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7216 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7217 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7218 [window flushWindow];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7219 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7220
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7221 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7222 * Makes the window topmost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7223 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7224 * handle: The window handle to make topmost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7225 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7226 int API dw_window_raise(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7227 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7228 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7229 [window orderFront:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7230 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7231 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7232
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7233 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7234 * Makes the window bottommost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7235 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7236 * handle: The window handle to make bottommost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7237 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7238 int API dw_window_lower(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7239 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7240 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7241 [window orderBack:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7242 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7243 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7244
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7245 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7246 * Sets the size of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7247 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7248 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7249 * width: New width in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7250 * height: New height in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7251 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7252 void API dw_window_set_size(HWND handle, ULONG width, ULONG height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7253 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7254 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7255 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7256 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7257 NSSize size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7258 size.width = width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7259 size.height = height;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7260
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7261 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7262 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7263 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7264 [window setContentSize:size];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7265 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7266 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7267 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7268
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7269 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7270 * Sets the position of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7271 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7272 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7273 * x: X location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7274 * y: Y location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7275 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7276 void API dw_window_set_pos(HWND handle, LONG x, LONG y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7277 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7278 int _locked_by_me = FALSE;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7279 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7280 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7281 NSPoint point;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7282 point.x = x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7283 point.y = y;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7284
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7285 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7286 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7287 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7288 [window setFrameOrigin:point];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7289 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7290 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7291 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7292
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7293 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7294 * Sets the position and size of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7295 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7296 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7297 * x: X location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7298 * y: Y location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7299 * width: Width of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7300 * height: Height of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7301 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7302 void API dw_window_set_pos_size(HWND handle, LONG x, LONG y, ULONG width, ULONG height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7303 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7304 dw_window_set_pos(handle, x, y);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7305 dw_window_set_size(handle, width, height);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7306 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7307
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7308 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7309 * Gets the position and size of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7310 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7311 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7312 * x: X location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7313 * y: Y location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7314 * width: Width of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7315 * height: Height of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7316 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7317 void API dw_window_get_pos_size(HWND handle, LONG x, LONG y, ULONG width, ULONG height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7318 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7319 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7320
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7321 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7322 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7323 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7324 NSRect rect = [window frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7325 if(x)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7326 *x = rect.origin.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7327 if(y)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7328 *y = rect.origin.y;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7329 if(width)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7330 *width = rect.size.width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7331 if(height)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7332 *height = rect.size.height;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7333 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7334 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7335 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7336
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7337 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7338 * Returns the width of the screen.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7339 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7340 int API dw_screen_width(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7341 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7342 NSRect screenRect = [[NSScreen mainScreen] frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7343 return screenRect.size.width;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7344 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7345
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7346 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7347 * Returns the height of the screen.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7348 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7349 int API dw_screen_height(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7350 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7351 NSRect screenRect = [[NSScreen mainScreen] frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7352 return screenRect.size.height;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7353 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7354
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7355 /* This should return the current color depth */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7356 unsigned long API dw_color_depth_get(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7357 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7358 NSWindowDepth screenDepth = [[NSScreen mainScreen] depth];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7359 return NSBitsPerPixelFromDepth(screenDepth);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7360 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7361
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7362 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7363 * Returns some information about the current operating environment.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7364 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7365 * env: Pointer to a DWEnv struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7366 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7367 void dw_environment_query(DWEnv *env)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7368 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7369 struct utsname name;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7370
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7371 uname(&name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7372 strcpy(env->osName, "MacOS");
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7373
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7374 strcpy(env->buildDate, __DATE__);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7375 strcpy(env->buildTime, __TIME__);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7376 env->DWMajorVersion = DW_MAJOR_VERSION;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7377 env->DWMinorVersion = DW_MINOR_VERSION;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7378 env->DWSubVersion = DW_SUB_VERSION;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7379
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	7380 env->MajorVersion = DWOSMajor;
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	7381 env->MinorVersion = DWOSMinor;
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	7382 env->MajorBuild = DWOSBuild;
809 1ef0f4c03c14 MinorBuild was being left uninitialized. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 808 diff changeset	7383 env->MinorBuild = 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7384 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7385
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7386 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7387 * Emits a beep.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7388 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7389 * freq: Frequency.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7390 * dur: Duration.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7391 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7392 void API dw_beep(int freq, int dur)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7393 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7394 NSBeep();
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7395 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7396
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7397 /* Call this after drawing to the screen to make sure
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7398 * anything you have drawn is visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7399 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7400 void API dw_flush(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7401 {
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	7402 /* This may need to be thread specific */
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	7403 [DWObj performSelectorOnMainThread:@selector(doFlush:) withObject:nil waitUntilDone:NO];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7404 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7405
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7406 /* Functions for managing the user data lists that are associated with
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7407 * a given window handle. Used in dw_window_set_data() and
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7408 * dw_window_get_data().
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7409 */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7410 UserData _find_userdata(UserData root, char varname)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7411 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7412 UserData tmp = root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7413
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7414 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7415 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7416 if(strcasecmp(tmp->varname, varname) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7417 return tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7418 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7419 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7420 return NULL;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7421 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7422
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7423 int _new_userdata(UserData *root, char varname, void *data)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7424 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7425 UserData *new = _find_userdata(root, varname);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7426
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7427 if(new)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7428 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7429 new->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7430 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7431 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7432 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7433 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7434 new = malloc(sizeof(UserData));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7435 if(new)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7436 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7437 new->varname = strdup(varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7438 new->data = data;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7439
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7440 new->next = NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7441
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7442 if (!*root)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7443 *root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7444 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7445 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7446 UserData prev = NULL, tmp = *root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7447 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7448 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7449 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7450 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7451 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7452 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7453 prev->next = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7454 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7455 *root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7456 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7457 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7458 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7459 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7460 return FALSE;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7461 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7462
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7463 int _remove_userdata(UserData *root, char varname, int all)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7464 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7465 UserData prev = NULL, tmp = *root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7466
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7467 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7468 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7469 if(all \|\| strcasecmp(tmp->varname, varname) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7470 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7471 if(!prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7472 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7473 *root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7474 free(tmp->varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7475 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7476 if(!all)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7477 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7478 tmp = *root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7479 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7480 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7481 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7482 /* If all is true we should
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7483 * never get here.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7484 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7485 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7486 free(tmp->varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7487 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7488 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7489 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7490 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7491 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7492 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7493 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7494 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7495 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7496 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7497 return 0;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7498 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7499
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7500 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7501 * Add a named user data item to a window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7502 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7503 * window: Window handle of signal to be called back.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7504 * dataname: A string pointer identifying which signal to be hooked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7505 * data: User data to be passed to the handler function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7506 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7507 void dw_window_set_data(HWND window, char dataname, void data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7508 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7509 id object = window;
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	7510 if([object isMemberOfClass:[DWWindow class]])
681 5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7511 {
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7512 NSWindow *win = window;
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7513 object = [win contentView];
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7514 }
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7515 else if([object isMemberOfClass:[NSScrollView class]])
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7516 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7517 NSScrollView *sv = window;
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7518 object = [sv documentView];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7519 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7520 WindowData blah = (WindowData )[object userdata];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7521
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7522 if(!blah)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7523 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7524 if(!dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7525 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7526
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7527 blah = calloc(1, sizeof(WindowData));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7528 [object setUserdata:blah];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7529 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7530
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7531 if(data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7532 _new_userdata(&(blah->root), dataname, data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7533 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7534 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7535 if(dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7536 _remove_userdata(&(blah->root), dataname, FALSE);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7537 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7538 _remove_userdata(&(blah->root), NULL, TRUE);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7539 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7540 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7541
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7542 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7543 * Gets a named user data item to a window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7544 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7545 * window: Window handle of signal to be called back.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7546 * dataname: A string pointer identifying which signal to be hooked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7547 * data: User data to be passed to the handler function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7548 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7549 void dw_window_get_data(HWND window, char dataname)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7550 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7551 id object = window;
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	7552 if([object isMemberOfClass:[DWWindow class]])
681 5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7553 {
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7554 NSWindow *win = window;
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7555 object = [win contentView];
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7556 }
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7557 else if([object isMemberOfClass:[NSScrollView class]])
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7558 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7559 NSScrollView *sv = window;
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7560 object = [sv documentView];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7561 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7562 WindowData blah = (WindowData )[object userdata];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7563
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7564 if(blah && blah->root && dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7565 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7566 UserData *ud = _find_userdata(&(blah->root), dataname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7567 if(ud)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7568 return ud->data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7569 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7570 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7571 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7572
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	7573 #define DW_TIMER_MAX 64
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	7574 NSTimer *DWTimers[DW_TIMER_MAX];
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	7575
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7576 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7577 * Add a callback to a timer event.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7578 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7579 * interval: Milliseconds to delay between calls.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7580 * sigfunc: The pointer to the function to be used as the callback.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7581 * data: User data to be passed to the handler function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7582 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7583 * Timer ID for use with dw_timer_disconnect(), 0 on error.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7584 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7585 int API dw_timer_connect(int interval, void sigfunc, void data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7586 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7587 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7588
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7589 for(z=0;z<DW_TIMER_MAX;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7590 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7591 if(!DWTimers[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7592 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7593 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7594 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7595 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7596
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7597 if(sigfunc && !DWTimers[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7598 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7599 NSTimeInterval seconds = (double)interval / 1000.0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7600 NSTimer *thistimer = DWTimers[z] = [NSTimer scheduledTimerWithTimeInterval:seconds target:DWHandler selector:@selector(runTimer:) userInfo:nil repeats:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7601 _new_signal(0, thistimer, z+1, sigfunc, data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7602 return z+1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7603 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7604 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7605 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7606
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7607 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7608 * Removes timer callback.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7609 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7610 * id: Timer ID returned by dw_timer_connect().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7611 */
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	7612 void API dw_timer_disconnect(int timerid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7613 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7614 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7615 NSTimer *thistimer;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7616
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7617 /* 0 is an invalid timer ID */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7618 if(timerid < 1 \|\| !DWTimers[timerid-1])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7619 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7620
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7621 thistimer = DWTimers[timerid-1];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7622 DWTimers[timerid-1] = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7623
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7624 [thistimer invalidate];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7625
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7626 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7627 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7628 if(tmp->id == timerid && tmp->window == thistimer)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7629 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7630 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7631 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7632 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7633 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7634 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7635 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7636 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7637 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7638 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7639 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7640 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7641 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7642 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7643 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7644 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7645 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7646 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7647 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7648 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7649 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7650
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7651 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7652 * Add a callback to a window event.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7653 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7654 * window: Window handle of signal to be called back.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7655 * signame: A string pointer identifying which signal to be hooked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7656 * sigfunc: The pointer to the function to be used as the callback.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7657 * data: User data to be passed to the handler function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7658 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7659 void API dw_signal_connect(HWND window, char signame, void sigfunc, void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7660 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7661 ULONG message = 0, msgid = 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7662
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7663 if(window && signame && sigfunc)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7664 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7665 if((message = _findsigmessage(signame)) != 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7666 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7667 _new_signal(message, window, (int)msgid, sigfunc, data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7668 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7669 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7670 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7671
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7672 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7673 * Removes callbacks for a given window with given name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7674 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7675 * window: Window handle of callback to be removed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7676 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7677 void API dw_signal_disconnect_by_name(HWND window, char *signame)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7678 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7679 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7680 ULONG message;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7681
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7682 if(!window \|\| !signame \|\| (message = _findsigmessage(signame)) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7683 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7684
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7685 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7686 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7687 if(tmp->window == window && tmp->message == message)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7688 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7689 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7690 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7691 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7692 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7693 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7694 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7695 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7696 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7697 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7698 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7699 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7700 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7701 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7702 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7703 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7704 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7705 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7706 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7707 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7708 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7709
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7710 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7711 * Removes all callbacks for a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7712 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7713 * window: Window handle of callback to be removed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7714 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7715 void API dw_signal_disconnect_by_window(HWND window)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7716 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7717 SignalHandler prev = NULL, tmp = Root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7718
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7719 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7720 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7721 if(tmp->window == window)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7722 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7723 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7724 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7725 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7726 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7727 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7728 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7729 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7730 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7731 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7732 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7733 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7734 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7735 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7736 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7737 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7738 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7739 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7740 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7741 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7742 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7743
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7744 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7745 * Removes all callbacks for a given window with specified data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7746 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7747 * window: Window handle of callback to be removed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7748 * data: Pointer to the data to be compared against.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7749 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7750 void API dw_signal_disconnect_by_data(HWND window, void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7751 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7752 SignalHandler prev = NULL, tmp = Root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7753
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7754 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7755 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7756 if(tmp->window == window && tmp->data == data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7757 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7758 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7759 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7760 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7761 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7762 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7763 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7764 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7765 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7766 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7767 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7768 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7769 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7770 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7771 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7772 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7773 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7774 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7775 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7776 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7777 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7778
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7779 void _my_strlwr(char *buf)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7780 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7781 int z, len = strlen(buf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7782
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7783 for(z=0;z<len;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7784 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7785 if(buf[z] >= 'A' && buf[z] <= 'Z')
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7786 buf[z] -= 'A' - 'a';
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7787 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7788 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7789
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7790 /* Open a shared library and return a handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7791 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7792 * name: Base name of the shared library.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7793 * handle: Pointer to a module handle,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7794 * will be filled in with the handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7795 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7796 int dw_module_load(char name, HMOD handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7797 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7798 int len;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7799 char *newname;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7800 char errorbuf[1024];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7801
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7802
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7803 if(!handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7804 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7805
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7806 if((len = strlen(name)) == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7807 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7808
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7809 /* Lenth + "lib" + ".dylib" + NULL */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7810 newname = malloc(len + 10);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7811
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7812 if(!newname)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7813 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7814
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7815 sprintf(newname, "lib%s.dylib", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7816 _my_strlwr(newname);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7817
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7818 *handle = dlopen(newname, RTLD_NOW);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7819 if(*handle == NULL)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7820 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7821 strncpy(errorbuf, dlerror(), 1024);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822 printf("%s\n", errorbuf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823 sprintf(newname, "lib%s.dylib", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7824 *handle = dlopen(newname, RTLD_NOW);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7825 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7826
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7827 free(newname);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7828
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7829 return (NULL == *handle) ? -1 : 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7830 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7831
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7832 /* Queries the address of a symbol within open handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7833 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7834 * handle: Module handle returned by dw_module_load()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7835 * name: Name of the symbol you want the address of.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7836 * func: A pointer to a function pointer, to obtain
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7837 * the address.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7838 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7839 int dw_module_symbol(HMOD handle, char name, void*func)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7840 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7841 if(!func \|\| !name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7842 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7843
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7844 if(strlen(name) == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7845 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7846
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7847 func = (void)dlsym(handle, name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7848 return (NULL == *func);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7849 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7850
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7851 /* Frees the shared library previously opened.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7852 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7853 * handle: Module handle returned by dw_module_load()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7854 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7855 int dw_module_close(HMOD handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7856 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7857 if(handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7858 return dlclose(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7859 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7860 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7861
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7862 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7863 * Returns the handle to an unnamed mutex semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7864 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7865 HMTX dw_mutex_new(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7866 {
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	7867 HMTX mutex = malloc(sizeof(pthread_mutex_t));
727 f190b5c2ce16 Fixed 2 errors in the tree select event handler. Also removed unused experimental code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 726 diff changeset	7868
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	7869 pthread_mutex_init(mutex, NULL);
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	7870 return mutex;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7871 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7872
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7873 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7874 * Closes a semaphore created by dw_mutex_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7875 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7876 * mutex: The handle to the mutex returned by dw_mutex_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7877 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7878 void dw_mutex_close(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7879 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7880 if(mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7881 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7882 pthread_mutex_destroy(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7883 free(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7884 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7885 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7886
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7887 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7888 * Tries to gain access to the semaphore, if it can't it blocks.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7889 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7890 * mutex: The handle to the mutex returned by dw_mutex_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7891 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7892 void dw_mutex_lock(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7893 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7894 /* We need to handle locks from the main thread differently...
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7895 * since we can't stop message processing... otherwise we
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7896 * will deadlock... so try to acquire the lock and continue
2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7897 * processing messages in between tries.
2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7898 */
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7899 if(DWThread == pthread_self())
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7900 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7901 while(pthread_mutex_trylock(mutex) != 0)
2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7902 {
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	7903 /* Process any pending events */
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	7904 while(_dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]))
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	7905 {
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	7906 /* Just loop */
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	7907 }
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7908 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7909 }
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7910 else
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7911 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	7912 pthread_mutex_lock(mutex);
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7913 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7914 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7915
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7916 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7917 * Reliquishes the access to the semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7918 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7919 * mutex: The handle to the mutex returned by dw_mutex_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7920 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7921 void dw_mutex_unlock(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7922 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7923 pthread_mutex_unlock(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7924 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7925
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7926 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7927 * Returns the handle to an unnamed event semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7928 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7929 HEV dw_event_new(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7930 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7931 HEV eve = (HEV)malloc(sizeof(struct _dw_unix_event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7932
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7933 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7934 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7935
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7936 /* We need to be careful here, mutexes on Linux are
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7937 * FAST by default but are error checking on other
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7938 * systems such as FreeBSD and OS/2, perhaps others.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7939 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7940 pthread_mutex_init (&(eve->mutex), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7941 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7942 pthread_cond_init (&(eve->event), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7943
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7944 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7945 eve->alive = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7946 eve->posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7947
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7948 return eve;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7949 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7950
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7951 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7952 * Resets a semaphore created by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7954 * eve: The handle to the event returned by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7955 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7956 int dw_event_reset (HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7957 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7958 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7959 return FALSE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7960
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7961 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7962 pthread_cond_broadcast (&(eve->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7963 pthread_cond_init (&(eve->event), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7964 eve->posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7965 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7966 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7967 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7968
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7969 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7970 * Posts a semaphore created by dw_event_new(). Causing all threads
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7971 * waiting on this event in dw_event_wait to continue.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7972 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7973 * eve: The handle to the event returned by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7974 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975 int dw_event_post (HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7976 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7977 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7978 return FALSE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7979
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7980 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7981 pthread_cond_broadcast (&(eve->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7982 eve->posted = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7983 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7984 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7985 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7986
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7987 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7988 * Waits on a semaphore created by dw_event_new(), until the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7989 * event gets posted or until the timeout expires.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7990 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7991 * eve: The handle to the event returned by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7993 int dw_event_wait(HEV eve, unsigned long timeout)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7994 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7995 int rc;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7996 struct timeval now;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7997 struct timespec timeo;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7998
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7999 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8000 return FALSE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8001
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8002 if(eve->posted)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8003 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8004
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8005 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8006 gettimeofday(&now, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8007 timeo.tv_sec = now.tv_sec + (timeout / 1000);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8008 timeo.tv_nsec = now.tv_usec * 1000;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8009 rc = pthread_cond_timedwait (&(eve->event), &(eve->mutex), &timeo);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8010 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8011 if(!rc)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8012 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8013 if(rc == ETIMEDOUT)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8014 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8015 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8016 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8017
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8018 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8019 * Closes a semaphore created by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8020 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8021 * eve: The handle to the event returned by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8022 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8023 int dw_event_close(HEV *eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8024 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8025 if(!eve \|\| !(*eve))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8026 return FALSE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8027
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8028 pthread_mutex_lock (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8029 pthread_cond_destroy (&((*eve)->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8030 pthread_mutex_unlock (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8031 pthread_mutex_destroy (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8032 free(*eve);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 *eve = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8034
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8035 return TRUE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8036 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8037
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8038 struct _seminfo {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8039 int fd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8040 int waiting;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8041 };
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8042
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8043 static void _handle_sem(int *tmpsock)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8044 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8045 fd_set rd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8046 struct _seminfo array = (struct _seminfo )malloc(sizeof(struct _seminfo));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8047 int listenfd = tmpsock[0];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8048 int bytesread, connectcount = 1, maxfd, z, posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8049 char command;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8050 sigset_t mask;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8051
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8052 sigfillset(&mask); /* Mask all allowed signals */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8053 pthread_sigmask(SIG_BLOCK, &mask, NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8054
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8055 /* problems */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8056 if(tmpsock[1] == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8057 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8058 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8059 return;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8060 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8061
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8062 array[0].fd = tmpsock[1];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8063 array[0].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8064
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8065 /* Free the memory allocated in dw_named_event_new. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8066 free(tmpsock);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8067
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8068 while(1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8069 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8070 FD_ZERO(&rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8071 FD_SET(listenfd, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8072
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8073 maxfd = listenfd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8074
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075 /* Added any connections to the named event semaphore */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8076 for(z=0;z<connectcount;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8077 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8078 if(array[z].fd > maxfd)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8079 maxfd = array[z].fd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8080
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8081 FD_SET(array[z].fd, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8082 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8083
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8084 if(select(maxfd+1, &rd, NULL, NULL, NULL) == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8085 return;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8086
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8087 if(FD_ISSET(listenfd, &rd))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8088 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8089 struct _seminfo *newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8090 int newfd = accept(listenfd, 0, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8091
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8092 if(newfd > -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8093 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8094 /* Add new connections to the set */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8095 newarray = (struct _seminfo )malloc(sizeof(struct _seminfo)(connectcount+1));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8096 memcpy(newarray, array, sizeof(struct _seminfo)*(connectcount));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8097
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8098 newarray[connectcount].fd = newfd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8099 newarray[connectcount].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8100
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8101 connectcount++;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8102
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8103 /* Replace old array with new one */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8104 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8105 array = newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8106 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8107 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8108
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8109 /* Handle any events posted to the semaphore */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110 for(z=0;z<connectcount;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8111 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8112 if(FD_ISSET(array[z].fd, &rd))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8113 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8114 if((bytesread = read(array[z].fd, &command, 1)) < 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8115 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8116 struct _seminfo *newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8117
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8118 /* Remove this connection from the set */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8119 newarray = (struct _seminfo )malloc(sizeof(struct _seminfo)(connectcount-1));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 if(!z)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8121 memcpy(newarray, &array[1], sizeof(struct _seminfo)*(connectcount-1));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8122 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8123 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8124 memcpy(newarray, array, sizeof(struct _seminfo)*z);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8125 if(z!=(connectcount-1))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8126 memcpy(&newarray[z], &array[z+1], sizeof(struct _seminfo)*(z-connectcount-1));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8127 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8128 connectcount--;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8129
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8130 /* Replace old array with new one */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8131 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8132 array = newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8133 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8134 else if(bytesread == 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8135 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8136 switch(command)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8137 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8138 case 0:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8139 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8140 /* Reset */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8141 posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8142 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8143 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8144 case 1:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8145 /* Post */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8146 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8147 int s;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8148 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8149
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8150 posted = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8151
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8152 for(s=0;s<connectcount;s++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8153 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8154 /* The semaphore has been posted so
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8155 * we tell all the waiting threads to
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8156 * continue.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8157 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8158 if(array[s].waiting)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8159 write(array[s].fd, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8160 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8161 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8162 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8163 case 2:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8164 /* Wait */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8165 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8166 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8167
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8168 array[z].waiting = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8169
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8170 /* If we are posted exit immeditately */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8171 if(posted)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8172 write(array[z].fd, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8173 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8174 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8175 case 3:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8176 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8177 /* Done Waiting */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8178 array[z].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8179 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8180 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8181 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8182 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8183 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8184 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8185
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8186 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8187
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8188 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8189
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8190 /* Using domain sockets on unix for IPC */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 /* Create a named event semaphore which can be
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8192 * opened from other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8193 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8194 * eve: Pointer to an event handle to receive handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8195 * name: Name given to semaphore which can be opened
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8196 * by other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8197 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8198 HEV dw_named_event_new(char *name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8199 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8200 struct sockaddr_un un;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8201 int ev, tmpsock = (int )malloc(sizeof(int)*2);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8202 HEV eve;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8203 DWTID dwthread;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8204
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8205 if(!tmpsock)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8206 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8207
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8208 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8209
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8210 if(!eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8211 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8212 free(tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8213 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8214 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8215
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8216 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8217 ev = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8218 memset(&un, 0, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8219 un.sun_family=AF_UNIX;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8220 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8221 strcpy(un.sun_path, "/tmp/.dw/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8222 strcat(un.sun_path, name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8223
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8224 /* just to be safe, this should be changed
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8225 * to support multiple instances.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8226 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8227 remove(un.sun_path);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8228
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8229 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8230 listen(tmpsock[0], 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8231 connect(ev, (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8232 tmpsock[1] = accept(tmpsock[0], 0, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8233
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8234 if(tmpsock[0] < 0 \|\| tmpsock[1] < 0 \|\| ev < 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8235 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8236 if(tmpsock[0] > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8237 close(tmpsock[0]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8238 if(tmpsock[1] > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8239 close(tmpsock[1]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8240 if(ev > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8241 close(ev);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8242 free(tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8243 free(eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8244 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8245 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8246
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8247 /* Create a thread to handle this event semaphore */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8248 pthread_create(&dwthread, NULL, (void )_handle_sem, (void )tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8249 eve->alive = ev;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8250 return eve;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8251 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8252
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8253 /* Open an already existing named event semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8254 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 * eve: Pointer to an event handle to receive handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8256 * name: Name given to semaphore which can be opened
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8257 * by other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8258 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8259 HEV dw_named_event_get(char *name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8260 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8261 struct sockaddr_un un;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8262 HEV eve;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8263 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8264 if(ev < 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8265 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8266
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8267 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8268
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8269 if(!eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8270 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8271 close(ev);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8272 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8273 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8274
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8275 un.sun_family=AF_UNIX;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8276 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8277 strcpy(un.sun_path, "/tmp/.dw/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8278 strcat(un.sun_path, name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8279 connect(ev, (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8280 eve->alive = ev;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8281 return eve;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8282 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8283
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8284 /* Resets the event semaphore so threads who call wait
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8285 * on this semaphore will block.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8286 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 * eve: Handle to the semaphore obtained by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8288 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8289 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8290 int dw_named_event_reset(HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8291 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8292 /* signal reset */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8293 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8294
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8295 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8296 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8297
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8298 if(write(eve->alive, &tmp, 1) == 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8299 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8300 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8301 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8302
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8303 /* Sets the posted state of an event semaphore, any threads
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8304 * waiting on the semaphore will no longer block.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8305 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8306 * eve: Handle to the semaphore obtained by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8307 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8308 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8309 int dw_named_event_post(HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8311
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8312 /* signal post */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8313 char tmp = (char)1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8315 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8316 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8317
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8318 if(write(eve->alive, &tmp, 1) == 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8319 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8320 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8321 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8322
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8323 /* Waits on the specified semaphore until it becomes
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8324 * posted, or returns immediately if it already is posted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8325 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8326 * eve: Handle to the semaphore obtained by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8328 * timeout: Number of milliseconds before timing out
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8329 * or -1 if indefinite.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8330 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8331 int dw_named_event_wait(HEV eve, unsigned long timeout)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8332 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333 fd_set rd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334 struct timeval tv, *useme;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8335 int retval = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8336 char tmp;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8337
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8338 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8339 return DW_ERROR_NON_INIT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8340
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8341 /* Set the timout or infinite */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8342 if(timeout == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8343 useme = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8344 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8345 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8346 tv.tv_sec = timeout / 1000;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8347 tv.tv_usec = timeout % 1000;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8348
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8349 useme = &tv;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8350 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8351
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8352 FD_ZERO(&rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8353 FD_SET(eve->alive, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8354
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8355 /* Signal wait */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356 tmp = (char)2;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8357 write(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8358
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8359 retval = select(eve->alive+1, &rd, NULL, NULL, useme);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8360
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8361 /* Signal done waiting. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8362 tmp = (char)3;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8363 write(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8364
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8365 if(retval == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8366 return DW_ERROR_TIMEOUT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8367 else if(retval == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8368 return DW_ERROR_INTERRUPT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8369
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8370 /* Clear the entry from the pipe so
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8371 * we don't loop endlessly. :)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8372 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8373 read(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8374 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8375 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8376
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8377 /* Release this semaphore, if there are no more open
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8378 * handles on this semaphore the semaphore will be destroyed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8379 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8380 * eve: Handle to the semaphore obtained by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8381 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8382 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8383 int dw_named_event_close(HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8384 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8385 /* Finally close the domain socket,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8386 * cleanup will continue in _handle_sem.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8387 */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8388 if(eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8389 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8390 close(eve->alive);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8391 free(eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8392 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8393 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8394 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8395
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8396 /* Mac specific function to cause garbage collection */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8397 void _dw_pool_drain(void)
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8398 {
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8399 #if !defined(GARBAGE_COLLECT)
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8400 NSAutoreleasePool *pool = pthread_getspecific(_dw_pool_key);
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8401 [pool drain];
698 e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	8402 pool = [[NSAutoreleasePool alloc] init];
e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	8403 pthread_setspecific(_dw_pool_key, pool);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8404 #endif
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8405 }
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8406
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8407 /*
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8408 * Setup thread independent pools.
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8409 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8410 void _dwthreadstart(void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8411 {
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8412 void (threadfunc)(void ) = NULL;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8413 void tmp = (void )data;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8414 NSColor *color;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8415
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8416 /* If we aren't using garbage collection we need autorelease pools */
660 2784e7ee8bcb Fixes for pixmaps and drawing to the screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 659 diff changeset	8417 #if !defined(GARBAGE_COLLECT)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8418 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8419 pthread_setspecific(_dw_pool_key, pool);
660 2784e7ee8bcb Fixes for pixmaps and drawing to the screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 659 diff changeset	8420 #endif
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8421 _init_colors();
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8422
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8423 threadfunc = (void ()(void ))tmp[0];
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8424
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8425 /* Start our thread function */
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8426 threadfunc(tmp[1]);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8427
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8428 /* Release the pool when we are done so we don't leak */
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8429 color = pthread_getspecific(_dw_fg_color_key);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8430 [color release];
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8431 color = pthread_getspecific(_dw_bg_color_key);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8432 [color release];
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	8433 #if !defined(GARBAGE_COLLECT)
698 e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	8434 pool = pthread_getspecific(_dw_pool_key);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8435 [pool drain];
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	8436 #endif
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8437 free(tmp);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8438 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8439
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8440 void _dw_default_font(char *fontname)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8441 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8442 if(DWDefaultFont)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8443 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8444 [DWDefaultFont release];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8445 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8446 DWDefaultFont = _dw_font_by_name(fontname);
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8447 [DWDefaultFont retain];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8448 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8449
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8450 /*
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8451 * Initializes the Dynamic Windows engine.
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8452 * Parameters:
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8453 * newthread: True if this is the only thread.
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8454 * False if there is already a message loop running.
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8455 */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8456 int API dw_init(int newthread, int argc, char *argv[])
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8457 {
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	8458 /* Get the operating system version */
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	8459 Gestalt(gestaltSystemVersionMajor, &DWOSMajor);
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	8460 Gestalt(gestaltSystemVersionMinor, &DWOSMinor);
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	8461 Gestalt(gestaltSystemVersionBugFix, &DWOSBuild);
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8462 /* Create the application object */
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8463 DWApp = [NSApplication sharedApplication];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8464 /* Create object for handling timers */
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8465 DWHandler = [[DWTimerHandler alloc] init];
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8466 /* If we aren't using garbage collection we need autorelease pools */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8467 #if !defined(GARBAGE_COLLECT)
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8468 pthread_key_create(&_dw_pool_key, NULL);
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8469 pool = [[NSAutoreleasePool alloc] init];
726 ecf47778caff Possible fix for container string columns not showing correctly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 725 diff changeset	8470 pthread_setspecific(_dw_pool_key, pool);
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8471 #endif
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8472 pthread_key_create(&_dw_fg_color_key, NULL);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8473 pthread_key_create(&_dw_bg_color_key, NULL);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	8474 _init_colors();
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8475 /* Create a default main menu, with just the application menu */
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8476 DWMainMenu = _generate_main_menu();
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8477 [DWMainMenu retain];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8478 [DWApp setMainMenu:DWMainMenu];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8479 DWObj = [[DWObject alloc] init];
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8480 DWDefaultFont = nil;
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8481 /* Create mutexes for thread safety */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8482 DWRunMutex = dw_mutex_new();
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8483 DWThreadMutex = dw_mutex_new();
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8484 DWThreadMutex2 = dw_mutex_new();
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8485 /* Use NSThread to start a dummy thread to initialize the threading subsystem */
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8486 NSThread *thread = [[ NSThread alloc] initWithTarget:DWObj selector:@selector(uselessThread:) object:nil];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8487 [thread start];
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8488 [thread release];
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	8489 [NSTextField setCellClass:[DWTextFieldCell class]];
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	8490 return 0;
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8491 }
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8492
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8493 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8494 * Allocates a shared memory region with a name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8495 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8496 * handle: A pointer to receive a SHM identifier.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8497 * dest: A pointer to a pointer to receive the memory address.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8498 * size: Size in bytes of the shared memory region to allocate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499 * name: A string pointer to a unique memory name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8500 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8501 HSHM dw_named_memory_new(void *dest, int size, char name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8502 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8503 char namebuf[1024];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8504 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8505
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8506 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8507 sprintf(namebuf, "/tmp/.dw/%s", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8508
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8509 if((handle->fd = open(namebuf, O_CREAT \| O_RDWR, S_IRUSR \| S_IWUSR)) < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8510 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8511 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8512 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8513 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8514
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8515 ftruncate(handle->fd, size);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8516
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8517 /* attach the shared memory segment to our process's address space. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8518 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8519
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8520 if(*dest == MAP_FAILED)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8521 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8522 close(handle->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8523 *dest = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8524 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8525 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8526 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8527
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8528 handle->size = size;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8529 handle->sid = getsid(0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8530 handle->path = strdup(namebuf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8531
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8532 return handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8533 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8534
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8535 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8536 * Aquires shared memory region with a name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8537 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8538 * dest: A pointer to a pointer to receive the memory address.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8539 * size: Size in bytes of the shared memory region to requested.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8540 * name: A string pointer to a unique memory name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8541 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8542 HSHM dw_named_memory_get(void *dest, int size, char name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8543 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8544 char namebuf[1024];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8545 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8546
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8547 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8548 sprintf(namebuf, "/tmp/.dw/%s", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8549
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8550 if((handle->fd = open(namebuf, O_RDWR)) < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8551 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8552 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8553 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8554 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8555
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8556 /* attach the shared memory segment to our process's address space. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8557 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8558
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8559 if(*dest == MAP_FAILED)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8560 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8561 close(handle->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8562 *dest = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8563 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8564 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8565 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8566
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8567 handle->size = size;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8568 handle->sid = -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8569 handle->path = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8570
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8571 return handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8572 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8573
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8574 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8575 * Frees a shared memory region previously allocated.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8576 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8577 * handle: Handle obtained from DB_named_memory_allocate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8578 * ptr: The memory address aquired with DB_named_memory_allocate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8579 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8580 int dw_named_memory_free(HSHM handle, void *ptr)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8581 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8582 struct _dw_unix_shm *h = handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8583 int rc = munmap(ptr, h->size);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8584
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8585 close(h->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8586 if(h->path)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8587 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8588 /* Only remove the actual file if we are the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8589 * creator of the file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8590 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8591 if(h->sid != -1 && h->sid == getsid(0))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8592 remove(h->path);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8593 free(h->path);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8594 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8595 return rc;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8596 }
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8597
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8598 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8599 * Creates a new thread with a starting point of func.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8600 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8601 * func: Function which will be run in the new thread.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8602 * data: Parameter(s) passed to the function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8603 * stack: Stack size of new thread (OS/2 and Windows only).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8604 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8605 DWTID dw_thread_new(void func, void data, int stack)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8606 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8607 DWTID thread;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8608 void *tmp = malloc(sizeof(void ) * 2);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8609 int rc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8610
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8611 tmp[0] = func;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8612 tmp[1] = data;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8613
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8614 rc = pthread_create(&thread, NULL, (void )_dwthreadstart, (void )tmp);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8615 if(rc == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8616 return thread;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8617 return (DWTID)-1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8618 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8619
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8620 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8621 * Ends execution of current thread immediately.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8622 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8623 void dw_thread_end(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8624 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8625 pthread_exit(NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8626 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8627
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8628 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8629 * Returns the current thread's ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8630 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8631 DWTID dw_thread_id(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8632 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8633 return (DWTID)pthread_self();
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8634 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8635
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8636 /*
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8637 * Execute and external program in a seperate session.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8638 * Parameters:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8639 * program: Program name with optional path.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8640 * type: Either DW_EXEC_CON or DW_EXEC_GUI.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8641 * params: An array of pointers to string arguements.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8642 * Returns:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8643 * -1 on error.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8644 */
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8645 int dw_exec(char program, int type, char *params)
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8646 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8647 int ret = -1;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8648
738 52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8649 if(type == DW_EXEC_GUI)
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8650 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8651 if(params && params[0] && params[1])
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8652 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8653 [[NSWorkspace sharedWorkspace] openFile:[NSString stringWithUTF8String:params[1]]
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8654 withApplication:[NSString stringWithUTF8String:program]];
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8655 }
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8656 else
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8657 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8658 [[NSWorkspace sharedWorkspace] launchApplication:[NSString stringWithUTF8String:program]];
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8659 }
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8660 return 0;
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8661 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8662
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8663 if((ret = fork()) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8664 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8665 int i;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8666
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8667 for (i = 3; i < 256; i++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8668 close(i);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8669 setsid();
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8670
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8671 if(type == DW_EXEC_CON)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8672 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8673 char **tmpargs;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8674
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8675 if(!params)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8676 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8677 tmpargs = malloc(sizeof(char *));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8678 tmpargs[0] = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8679 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8680 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8681 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8682 int z = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8683
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8684 while(params[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8685 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8686 z++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8687 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8688 tmpargs = malloc(sizeof(char )(z+3));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8689 z=0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8690 tmpargs[0] = "xterm";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8691 tmpargs[1] = "-e";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8692 while(params[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8693 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8694 tmpargs[z+2] = params[z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8695 z++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8696 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8697 tmpargs[z+2] = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8698 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8699 execvp("xterm", tmpargs);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8700 free(tmpargs);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8701 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8702 /* If we got here exec failed */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8703 _exit(-1);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8704 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8705 return ret;
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8706 }
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8707
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8708 /*
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8709 * Loads a web browser pointed at the given URL.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8710 * Parameters:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8711 * url: Uniform resource locator.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8712 */
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8713 int dw_browse(char *url)
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8714 {
715 5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	8715 NSURL *myurl = [NSURL URLWithString:[NSString stringWithUTF8String:url]];
5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	8716 [[NSWorkspace sharedWorkspace] openURL:myurl];
5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	8717 return 0;
5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	8718 }

Mercurial > dwindows

annotate mac/dw.m @ 909:c092eab43ae3