dwindows: mac/dw.m annotate

annotate mac/dw.m @ 935:114729f5aedc

Needed to retain NSStrings in the tree view on Mac to prevent crashes. These retains also require us to release them during delete and clear.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 26 Apr 2011 10:45:21 +0000
parents	13384e89964c
children	4be0c9f963f8

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);
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	108 void _handle_resize_events(Box *thisbox);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	109 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	110 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	111
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	112 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	113 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	114 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	115
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	116 /* Find any callbacks for this function */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	117 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	118 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	119 if(tmp->message == messageid && window == tmp->window)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	120 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	121 return tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	122 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	123 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	124 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	125 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	126 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	127
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	128 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	129 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	130 ULONG message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	131 char name[30];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	132
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	133 } SignalList;
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	134
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	135 /* 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	136 #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	137
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	138 SignalList SignalTranslate[SIGNALMAX] = {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	139 { 1, DW_SIGNAL_CONFIGURE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	140 { 2, DW_SIGNAL_KEY_PRESS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	141 { 3, DW_SIGNAL_BUTTON_PRESS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	142 { 4, DW_SIGNAL_BUTTON_RELEASE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	143 { 5, DW_SIGNAL_MOTION_NOTIFY },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	144 { 6, DW_SIGNAL_DELETE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	145 { 7, DW_SIGNAL_EXPOSE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	146 { 8, DW_SIGNAL_CLICKED },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	147 { 9, DW_SIGNAL_ITEM_ENTER },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	148 { 10, DW_SIGNAL_ITEM_CONTEXT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	149 { 11, DW_SIGNAL_LIST_SELECT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	150 { 12, DW_SIGNAL_ITEM_SELECT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	151 { 13, DW_SIGNAL_SET_FOCUS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	152 { 14, DW_SIGNAL_VALUE_CHANGED },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	153 { 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	154 { 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	155 { 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	156 };
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	157
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	158 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	159 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	160 SignalHandler *handler = _get_handler(object, message);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	161 /* 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	162
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	163 if(handler)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	164 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	165 switch(message)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	166 {
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	167 /* Timer event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	168 case 0:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	169 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	170 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	171
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	172 if(!timerfunc(handler->data))
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	173 dw_timer_disconnect(handler->id);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	174 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	175 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	176 /* Configure/Resize event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	177 case 1:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	178 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	179 int (sizefunc)(HWND, int, int, void ) = handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	180 NSSize size;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	181
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	182 if([object isKindOfClass:[NSWindow class]])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	183 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	184 NSWindow *window = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	185 size = [[window contentView] frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	186 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	187 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	188 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	189 NSView *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	190 size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	191 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	192
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	193 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	194 {
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 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	196 }
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	197 return 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	198 }
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	199 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	200 {
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 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	202 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	203 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	204 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	205 char ch = '\0';
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	206
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	207 /* 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	208 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	209 {
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	210 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	211 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	212 {
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 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	214 }
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	215 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	216
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	217 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	218 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	219 /* Button press and release event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	220 case 3:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	221 case 4:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	222 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	223 int (* API buttonfunc)(HWND, int, int, int, void ) = (int ( API)(HWND, int, int, int, void *))handler->signalfunction;
922 07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	224 NSPoint p = [object convertPoint:[event locationInWindow] fromView:nil];
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	225 NSEventType type = [event type];
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	226 int button = 1;
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	227
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	228 if(type == NSRightMouseDown \|\| type == NSRightMouseUp)
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	229 {
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	230 button = 2;
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	231 }
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	232 else if(type == NSOtherMouseDown \|\| type == NSOtherMouseUp)
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	233 {
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	234 button = 3;
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	235 }
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	236
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	237 return buttonfunc(object, (int)p.x, (int)[object frame].size.height - p.y, button, handler->data);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	238 }
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	239 /* 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	240 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	241 {
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	242 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	243 int buttonmask = (int)[NSEvent pressedMouseButtons];
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	244 NSPoint point = [object convertPoint:[event locationInWindow] fromView:nil];
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	245
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	246 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	247 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	248 /* Window close event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	249 case 6:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	250 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	251 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	252 return closefunc(object, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	253 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	254 /* Window expose/draw event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	255 case 7:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	256 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	257 DWExpose exp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	258 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	259 NSRect rect = [object frame];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	260
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	261 exp.x = rect.origin.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	262 exp.y = rect.origin.y;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	263 exp.width = rect.size.width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	264 exp.height = rect.size.height;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	265 int result = exposefunc(object, &exp, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	266 [[object window] flushWindow];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	267 return result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	268 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	269 /* Clicked event for buttons and menu items */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	270 case 8:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	271 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	272 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	273
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	274 return clickfunc(object, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	275 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	276 /* 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	277 case 9:
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	278 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	279 int (containerselectfunc)(HWND, char , void *) = handler->signalfunction;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	280
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	281 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	282 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	283 /* Container context menu event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	284 case 10:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	285 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	286 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	287 char text = (char )event;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	288 void *user = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	289 LONG x,y;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	290
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	291 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	292
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	293 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	294 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	295 /* 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	296 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	297 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	298 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	299 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	300 int selected = (int)event;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	301
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	302 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	303 }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	304 /* Tree class selection event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	305 case 12:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	306 {
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	307 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	308 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	309 void *user = NULL;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	310 id item = nil;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	311
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	312 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	313 {
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	314 item = (id)event;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	315 NSString *nstr = [item pointerAtIndex:1];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	316
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	317 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	318 {
01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	319 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	320 }
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	321 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	322 {
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	323 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	324 }
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	325 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	326 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	327 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	328 {
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	329 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	330 }
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	331 return result;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	332 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	333
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	334 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	335 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	336 /* 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	337 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	338 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	339 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	340
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	341 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	342 }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	343 /* 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	344 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	345 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	346 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	347 int pageid = (int)event;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	348
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	349 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	350 }
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	351 case 16:
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	352 {
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	353 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	354
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	355 return treeexpandfunc(handler->window, (HTREEITEM)event, handler->data);
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	356 }
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	357 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	358 {
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	359 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	360 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	361
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	362 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	363 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	364 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	365 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	366 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	367 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	368
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	369 /* Subclass for the Timer type */
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	370 @interface DWTimerHandler : NSObject { }
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	371 -(void)runTimer:(id)sender;
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	372 @end
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	373
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	374 @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	375 -(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	376 @end
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	377
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	378 NSApplication *DWApp;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	379 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	380 NSFont *DWDefaultFont;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	381 DWTimerHandler *DWHandler;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	382 #if !defined(GARBAGE_COLLECT)
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	383 NSAutoreleasePool *pool;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	384 #endif
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	385 HWND _DWLastDrawable;
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	386 id _DWCapture;
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	387 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	388 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	389 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	390 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	391 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	392 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	393
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	394 /* 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	395 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	396 {
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	397 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	398 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	399 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	400 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	401 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	402 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	403 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	404 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	405 } DWBitBlt;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	406
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 /* 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	408 @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	409 -(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	410 -(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	411 -(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	412 -(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	413 @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	414
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	415 @implementation DWObject
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	416 -(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	417 -(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	418 {
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	419 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	420 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	421 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	422 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	423 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	424 -(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	425 {
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	426 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	427 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	428 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	429 id bltsrc = bltinfo->src;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	430
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	431 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	432 {
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	433 [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	434 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
915 361d80388dc9 Test fix at the partial bitblt issue on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 911 diff changeset	435 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:bltdest] graphicsPort] flipped:YES]];
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	436 [[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	437 }
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	438 else
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	439 {
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	440 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	441 {
917 8567c9ac089d Switched back to using the dealloc() method in dw_pixmap_destroy() to stop a memory leak on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 916 diff changeset	442 free(bltinfo);
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	443 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	444 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	445 _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	446 }
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	447 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	448 {
910 329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	449 NSBitmapImageRep *rep = bltsrc;
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	450 NSImage *image;
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	451
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	452 if(DWOSMinor > 5)
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	453 {
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	454 image = [[NSImage alloc] initWithCGImage:[rep CGImage] size:NSZeroSize];
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	455 }
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	456 else
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	457 {
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	458 image = [[NSImage alloc] initWithSize:[rep size]];
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	459 [image addRepresentation:rep];
329f2ca62f1b Switched to using a different potentially slower NSImage conversion to support Leopard. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 909 diff changeset	460 }
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	461 // 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	462 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	463
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 // 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	465 [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	466
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	467 // but we also have to translate it back by its height:
915 361d80388dc9 Test fix at the partial bitblt issue on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 911 diff changeset	468 [t translateXBy:0.0 yBy:-[rep size].height];
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	469
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	470 // 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	471 [t concat];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	472 [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	473 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	474 [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	475 [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	476 }
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	477 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	478 {
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	479 [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	480 }
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	481 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	482 {
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	483 [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	484 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	485 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	486 }
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	487 -(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	488 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	489 if(_DWLastDrawable)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	490 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	491 id object = _DWLastDrawable;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	492 NSWindow *window = [object window];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	493 [window flushWindow];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	494 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	495 }
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	496 -(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	497 {
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	498 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	499 void params = (void )[v pointerValue];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	500 void (* windowfunc)(void *);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	501
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	502 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	503 {
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	504 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	505 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	506 {
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	507 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	508 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	509 }
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	510 }
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	511 @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	512
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	513 DWObject *DWObj;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	514
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	515 /* 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	516 * 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	517 * basically everything. Was hoping to add methods
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	518 * 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	519 * 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	520 * going to work. -Brian
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	521 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	522
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	523 /* Subclass for a box type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	524 @interface DWBox : NSView
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	525 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	526 Box *box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	527 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	528 NSColor *bgcolor;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	529 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	530 -(id)init;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	531 -(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	532 -(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	533 -(id)contentView;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	534 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	535 -(void)setUserdata:(void *)input;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	536 -(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	537 -(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	538 -(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	539 -(void)mouseUp:(NSEvent *)theEvent;
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	540 -(NSMenu )menuForEvent:(NSEvent )theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	541 -(void)rightMouseUp:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	542 -(void)otherMouseDown:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	543 -(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	544 -(void)keyDown:(NSEvent *)theEvent;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	545 -(void)setColor:(unsigned long)input;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	546 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	547
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	548 @implementation DWBox
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	549 -(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	550 {
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	551 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	552
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	553 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	554 {
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	555 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	556 }
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	557 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	558 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	559 -(void)dealloc
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	560 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	561 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	562 free(box);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	563 _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	564 [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	565 }
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	566 -(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	567 -(id)contentView { return self; }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	568 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	569 -(void)setUserdata:(void *)input { userdata = input; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	570 -(void)drawRect:(NSRect)rect
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	571 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	572 if(bgcolor)
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 [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	575 NSRectFill([self bounds]);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	576 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	577 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	578 -(BOOL)isFlipped { return YES; }
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	579 -(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	580 -(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	581 -(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	582 -(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	583 -(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	584 -(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	585 -(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	586 -(void)setColor:(unsigned long)input
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	587 {
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	588 id orig = bgcolor;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	589
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	590 if(input == _colors[DW_CLR_DEFAULT])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	591 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	592 bgcolor = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	593 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	594 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	595 {
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	596 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	597 [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	598 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	599 [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	600 }
f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	601 [orig release];
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	602 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	603 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	604
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	605 /* 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	606 @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	607 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	608 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	609 NSColor *bgcolor;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	610 NSSize borderSize;
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	611 }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	612 -(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	613 -(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	614 -(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	615 @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	616
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	617 @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	618 -(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	619 -(void *)userdata { return userdata; }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	620 -(NSSize)borderSize { return borderSize; }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	621 -(NSSize)initBorder
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	622 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	623 NSSize frameSize = [self frame].size;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	624
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	625 if(frameSize.height < 20 \|\| frameSize.width < 20)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	626 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	627 frameSize.width = frameSize.height = 100;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	628 [self setFrameSize:frameSize];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	629 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	630 NSSize contentSize = [[self contentView] frame].size;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	631 NSSize titleSize = [self titleRect].size;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	632
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	633 borderSize.width = 100-contentSize.width;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	634 borderSize.height = (100-contentSize.height)-titleSize.height;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	635 return borderSize;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	636 }
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	637 -(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	638 @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	639
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	640 @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	641 -(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	642 -(void)keyDown:(NSEvent *)theEvent;
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	643 -(void)mouseDragged:(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	644 @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	645
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	646 @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	647 -(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	648 -(void)keyDown:(NSEvent *)theEvent { }
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	649 -(void)mouseDragged:(NSEvent *)theEvent { if(_DWCapture == self) { _event_handler(self, theEvent, 5); } }
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	650 @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	651
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	652 /* Subclass for a top-level window */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	653 @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	654 #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	655 <NSWindowDelegate>
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	656 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	657 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	658 NSMenu *windowmenu;
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	659 NSSize oldsize;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	660 }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	661 -(BOOL)windowShouldClose:(id)sender;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	662 -(void)setMenu:(NSMenu *)input;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	663 -(void)windowDidBecomeMain:(id)sender;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	664 -(void)menuHandler:(id)sender;
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	665 -(void)mouseDragged:(NSEvent *)theEvent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	666 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	667
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	668 @implementation DWView
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	669 -(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	670 {
854 d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	671 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	672 return YES;
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	673 return NO;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	674 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	675 - (void)viewDidMoveToWindow
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	676 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	677 [[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	678 [[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	679 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	680 - (void)dealloc
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	681 {
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	682 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	683 {
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	684 [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	685 }
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	686 [[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	687 [super dealloc];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	688 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	689 - (void)windowResized:(NSNotification *)notification;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	690 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	691 NSSize size = [self frame].size;
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	692
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	693 if(oldsize.width != size.width \|\| oldsize.height != size.height)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	694 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	695 _do_resize(box, size.width, size.height);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	696 _event_handler([self window], nil, 1);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	697 oldsize.width = size.width;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	698 oldsize.height = size.height;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	699 _handle_resize_events(box);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	700 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	701 }
930 b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	702 -(void)showWindow
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	703 {
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	704 NSSize size = [self frame].size;
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	705
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	706 if(oldsize.width == size.width && oldsize.height == size.height)
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	707 {
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	708 _do_resize(box, size.width, size.height);
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	709 _handle_resize_events(box);
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	710 }
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	711
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	712 }
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	713 -(void)windowDidBecomeMain:(id)sender
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	714 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	715 if(windowmenu)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	716 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	717 [DWApp setMainMenu:windowmenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	718 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	719 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	720 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	721 [DWApp setMainMenu:DWMainMenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	722 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	723 _event_handler(self, nil, 13);
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	724 }
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	725 -(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	726 -(void)menuHandler:(id)sender { _event_handler(sender, nil, 8); }
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	727 -(void)mouseDragged:(NSEvent *)theEvent { if(_DWCapture == self) { _event_handler(self, theEvent, 5); } }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	728 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	729
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	730 /* Subclass for a button type */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	731 @interface DWButton : NSButton
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	732 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	733 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	734 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	735 DWBox *parent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	736 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	737 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	738 -(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	739 -(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	740 -(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	741 -(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	742 -(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	743 -(DWBox *)parent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	744 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	745
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	746 @implementation DWButton
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	747 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	748 -(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	749 -(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	750 {
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	751 _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	752 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	753 {
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	754 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	755 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	756 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	757
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	758 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	759 {
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	760 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	761 {
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	762 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	763
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	764 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	765 {
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	766 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	767
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	768 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	769 {
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	770 [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	771 }
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	772 }
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	773 }
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	774 }
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	775 }
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	776 }
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	777 -(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	778 -(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	779 -(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	780 -(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	781 -(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	782 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	783
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	784 /* Subclass for a progress type */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	785 @interface DWPercent : NSProgressIndicator
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	786 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	787 void *userdata;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	788 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	789 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	790 -(void)setUserdata:(void *)input;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	791 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	792
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	793 @implementation DWPercent
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	794 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	795 -(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	796 -(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	797 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	798
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	799 /* 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	800 @interface DWScrollBox : NSScrollView
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	801 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	802 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	803 id box;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	804 }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	805 -(void *)userdata;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	806 -(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	807 -(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	808 -(id)box;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	809 @end
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	810
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	811 @implementation DWScrollBox
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	812 -(void *)userdata { return userdata; }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	813 -(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	814 -(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	815 -(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	816 -(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	817 @end
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	818
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	819 /* 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	820 @interface DWTextFieldCell : NSTextFieldCell
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	821 {
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	822 BOOL vcenter;
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	823 }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	824 -(NSRect)drawingRectForBounds:(NSRect)theRect;
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	825 -(void)setVCenter:(BOOL)input;
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	826 @end
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	827
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	828 @implementation DWTextFieldCell
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	829 -(NSRect)drawingRectForBounds:(NSRect)theRect
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	830 {
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	831 /* Get the parent's idea of where we should draw */
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	832 NSRect newRect = [super drawingRectForBounds:theRect];
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	833
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	834 /* If we are being vertically centered */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	835 if(vcenter)
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	836 {
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	837 /* Get our ideal size for current text */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	838 NSSize textSize = [self cellSizeForBounds:theRect];
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	839
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	840 /* Center that in the proposed rect */
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	841 float heightDelta = newRect.size.height - textSize.height;
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	842 if (heightDelta > 0)
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	843 {
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	844 newRect.size.height -= heightDelta;
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	845 newRect.origin.y += (heightDelta / 2);
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	846 }
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	847 }
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	848
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	849 return newRect;
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	850 }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	851 -(void)setVCenter:(BOOL)input { vcenter = input; }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	852 @end
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	853
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	854 @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	855 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	856 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	857 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	858 - (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	859 - (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	860 @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	861
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	862 /* 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	863 * 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	864 */
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	865 @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	866 -(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	867 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	868 [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	869 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	870 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	871 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	872 -(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	873 -(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	874 -(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	875 -(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	876 -(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	877 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	878 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	879 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	880 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	881 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	882 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	883 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	884 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	885 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	886 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	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	888 -(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	889 @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	890
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	891 /* Subclass for a entryfield type */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	892 @interface DWEntryField : NSTextField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	893 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	894 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	895 id clickDefault;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	896 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	897 -(void *)userdata;
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	898 -(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	899 -(void)setClickDefault:(id)input;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	900 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	901
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	902 @implementation DWEntryField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	903 -(void *)userdata { return userdata; }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	904 -(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	905 -(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	906 -(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	907 {
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	908 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	909 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	910 {
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	911 [[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	912 } 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	913 {
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	914 [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	915 }
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	916 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	917 -(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	918 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	919
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	920 /* Subclass for a entryfield password type */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	921 @interface DWEntryFieldPassword : NSSecureTextField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	922 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	923 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	924 id clickDefault;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	925 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	926 -(void *)userdata;
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	927 -(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	928 -(void)setClickDefault:(id)input;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	929 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	930
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	931 @implementation DWEntryFieldPassword
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	932 -(void *)userdata { return userdata; }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	933 -(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	934 -(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	935 -(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	936 {
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	937 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	938 {
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	939 [[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	940 } 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	941 {
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	942 [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	943 }
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	944 }
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]; }
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	946 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	947
652 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 Notebook control type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	949 @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	950 #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	951 <NSTabViewDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	952 #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	953 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	954 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	955 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	956 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	957 -(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	958 -(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	959 -(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	960 -(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	961 -(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	962 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	963
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	964 /* 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	965 @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	966 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	967 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	968 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	969 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	970 -(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	971 -(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	972 -(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	973 -(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	974 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	975
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	976 @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	977 -(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	978 -(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	979 -(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	980 -(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	981 -(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	982 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	983 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	984 DWNotebookPage page = (DWNotebookPage )notepage;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	985
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	986 if([object isMemberOfClass:[DWBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	987 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	988 DWBox *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	989 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	990 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	991 _do_resize(box, size.width, size.height);
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	992 _handle_resize_events(box);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	993 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	994 _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	995 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	996 -(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	997 @end
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	998
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	999 @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	1000 -(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	1001 -(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	1002 -(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	1003 -(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	1004 -(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	1005 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1006
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1007 /* Subclass for a color chooser type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1008 @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	1009 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1010 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	1011 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	1012 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1013 -(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	1014 -(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	1015 -(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	1016 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1017
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1018 @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	1019 -(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	1020 -(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	1021 -(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	1022 -(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	1023 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1024
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1025 /* Subclass for a splitbar type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1026 @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	1027 #ifdef BUILDING_FOR_SNOW_LEOPARD
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1028 <NSSplitViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1029 #endif
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1030 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1031 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	1032 float percent;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	1033 }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	1034 -(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	1035 -(void *)userdata;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	1036 -(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	1037 -(float)percent;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	1038 -(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	1039 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1040
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1041 @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	1042 -(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	1043 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1044 NSArray *views = [self subviews];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1045 id object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1046
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1047 for(object in views)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1048 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1049 if([object isMemberOfClass:[DWBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1050 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1051 DWBox *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1052 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1053 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1054 _do_resize(box, size.width, size.height);
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1055 _handle_resize_events(box);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1056 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1057 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1058 }
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	1059 -(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	1060 -(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	1061 -(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	1062 -(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	1063 -(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	1064 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1065
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1066 /* 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	1067 @interface DWSlider : NSSlider
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1068 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1069 void *userdata;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1070 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1071 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1072 -(void)setUserdata:(void *)input;
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	1073 -(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	1074 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1075
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1076 @implementation DWSlider
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1077 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1078 -(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	1079 -(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	1080 -(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	1081 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1082
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1083 /* 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	1084 @interface DWScrollbar : NSScroller
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1085 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1086 void *userdata;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1087 double range;
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1088 double visible;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1089 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1090 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1091 -(void)setUserdata:(void *)input;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1092 -(float)range;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1093 -(float)visible;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1094 -(void)setRange:(double)input1 andVisible:(double)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	1095 -(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	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 @implementation DWScrollbar
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1099 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1100 -(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	1101 -(float)range { return range; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1102 -(float)visible { return visible; }
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1103 -(void)setRange:(double)input1 andVisible:(double)input2 { range = input1; visible = input2; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1104 -(void)scrollerChanged:(id)sender
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1105 {
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1106 double max = (range - visible);
923 0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	1107 double result = ([self doubleValue] * max);
0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	1108 double newpos = result;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1109
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1110 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	1111 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1112
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	1113 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	1114 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	1115 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1116 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	1117 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1118 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1119
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	1120 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	1121 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	1122 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1123 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	1124 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1125 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1126
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	1127 case NSScrollerDecrementPage:
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1128 newpos -= visible;
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	1129 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	1130 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1131 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	1132 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1133 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1134
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	1135 case NSScrollerIncrementPage:
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1136 newpos += visible;
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	1137 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	1138 {
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	1139 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	1140 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	1141 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1142
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	1143 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	1144 ; /* 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	1145 }
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1146 int newposi = (int)newpos;
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	1147 newpos = (newpos - (double)newposi) > 0.5 ? (double)(newposi + 1) : (double)newposi;
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	1148 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	1149 {
923 0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	1150 [self setDoubleValue:(newpos/max)];
0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	1151 }
0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	1152 _event_handler(self, (void *)(int)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	1153 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1154 -(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	1155 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1156
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1157 /* 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	1158 @interface DWRender : NSControl
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1159 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1160 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	1161 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	1162 NSSize size;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1163 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1164 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1165 -(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	1166 -(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	1167 -(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	1168 -(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	1169 -(NSSize)size;
660 2784e7ee8bcb Fixes for pixmaps and drawing to the screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 659 diff changeset	1170 -(void)mouseDown:(NSEvent *)theEvent;
2784e7ee8bcb Fixes for pixmaps and drawing to the screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 659 diff changeset	1171 -(void)mouseUp:(NSEvent *)theEvent;
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1172 -(NSMenu )menuForEvent:(NSEvent )theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1173 -(void)rightMouseUp:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1174 -(void)otherMouseDown:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1175 -(void)otherMouseUp:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	1176 -(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	1177 -(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	1178 -(BOOL)isFlipped;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1179 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1180
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1181 @implementation DWRender
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1182 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1183 -(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	1184 -(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	1185 -(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	1186 -(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	1187 -(NSSize)size { return size; }
922 07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	1188 -(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); }
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	1189 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	1190 -(NSMenu )menuForEvent:(NSEvent )theEvent { _event_handler(self, theEvent, 3); return nil; }
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	1191 -(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	1192 -(void)otherMouseDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); }
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	1193 -(void)otherMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	1194 -(void)mouseDragged:(NSEvent *)theEvent { if(_DWCapture == self) { _event_handler(self, theEvent, 5); } }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1195 -(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	1196 -(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	1197 -(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	1198 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [font release]; [super dealloc]; }
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	1199 -(BOOL)acceptsFirstResponder { return YES; }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1200 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1201
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1202 /* Subclass for a MLE type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1203 @interface DWMLE : NSTextView
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1204 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1205 void *userdata;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1206 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1207 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1208 -(void)setUserdata:(void *)input;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1209 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1210
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1211 @implementation DWMLE
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1212 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1213 -(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	1214 -(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	1215 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1216
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1217 /* Subclass for a Container/List type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1218 @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	1219 #ifdef BUILDING_FOR_SNOW_LEOPARD
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1220 <NSTableViewDataSource,NSTableViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1221 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1222 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1223 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1224 NSMutableArray *tvcols;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1225 NSMutableArray *data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1226 NSMutableArray *types;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1227 NSPointerArray *titles;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1228 NSColor *fgcolor;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1229 int lastAddPoint, lastQueryPoint;
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	1230 id scrollview;
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1231 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	1232 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	1233 -(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	1234 -(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	1235 -(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	1236 -(void *)userdata;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1237 -(void)setUserdata:(void *)input;
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1238 -(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	1239 -(int)filesystem;
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	1240 -(id)scrollview;
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	1241 -(void)setScrollview:(id)input;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1242 -(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	1243 -(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	1244 -(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	1245 -(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	1246 -(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	1247 -(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	1248 -(void)removeRow:(int)row;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1249 -(void)setRow:(int)row title:(void *)input;
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1250 -(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	1251 -(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	1252 -(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	1253 -(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	1254 -(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	1255 -(void)setLastQueryPoint:(int)input;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1256 -(void)clear;
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1257 -(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	1258 -(void)optimize;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1259 -(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	1260 -(void)doubleClicked:(id)sender;
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1261 -(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	1262 -(void)tableView:(NSTableView )tableView didClickTableColumn:(NSTableColumn )tableColumn;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1263 -(void)selectionChanged:(id)sender;
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1264 -(NSMenu )menuForEvent:(NSEvent )event;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1265 @end
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1266
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1267 @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	1268 -(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	1269 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1270 if(tvcols && data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1271 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1272 int cols = (int)[tvcols count];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1273 if(cols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1274 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1275 return [data count] / cols;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1276 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1277 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1278 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	1279 }
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 -(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	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 z, col = -1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1285 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	1286
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1287 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1288 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1289 if([tvcols objectAtIndex:z] == aCol)
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 col = z;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1292 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1293 }
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 if(col != -1)
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 int index = (int)(aRow * count) + col;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1298 id this = [data objectAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1299 return ([this isKindOfClass:[NSNull class]]) ? nil : this;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1300 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1301 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1302 return nil;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1303 }
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1304 -(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	1305 -(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	1306 -(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	1307 -(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	1308 -(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	1309 -(id)scrollview { return scrollview; }
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1310 -(void)setScrollview:(id)input { scrollview = input; }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1311 -(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	1312 -(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	1313 -(int)insertRow:(NSArray *)input at:(int)index
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1314 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1315 if(data)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1316 {
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1317 unsigned long start = [tvcols count] * index;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1318 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	1319 if(index < lastAddPoint)
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1320 {
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1321 lastAddPoint++;
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1322 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1323 [data insertObjects:input atIndexes:set];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1324 [titles insertPointer:NULL atIndex:index];
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	1325 [set release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1326 return (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1327 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1328 return 0;
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1329 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1330 -(int)addRow:(NSArray *)input
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1331 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1332 if(data)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1333 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1334 lastAddPoint = (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1335 [data addObjectsFromArray:input];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1336 [titles addPointer:NULL];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1337 return (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1338 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1339 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	1340 }
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	1341 -(int)addRows:(int)number
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1342 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1343 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1344 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1345 int count = (int)(number * [tvcols count]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1346 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1347
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1348 lastAddPoint = (int)[titles count];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1349
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1350 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1351 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1352 [data addObject:[NSNull null]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1353 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1354 for(z=0;z<number;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1355 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1356 [titles addPointer:NULL];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1357 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1358 return (int)[titles count];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1359 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1360 return 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1361 }
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	1362 -(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	1363 {
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	1364 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	1365 {
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	1366 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	1367 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	1368 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	1369 [(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	1370 }
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	1371 }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1372 -(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	1373 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1374 if(tvcols && input)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1375 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1376 int index = (int)(row * [tvcols count]) + col;
934 13384e89964c Put in a bounds check just on a hunch when editing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 933 diff changeset	1377 if(index < [data count])
13384e89964c Put in a bounds check just on a hunch when editing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 933 diff changeset	1378 {
13384e89964c Put in a bounds check just on a hunch when editing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 933 diff changeset	1379 [data replaceObjectAtIndex:index withObject:input];
13384e89964c Put in a bounds check just on a hunch when editing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 933 diff changeset	1380 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1381 }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	1382 }
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	1383 -(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	1384 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1385 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1386 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1387 int z, start, end;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1388 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	1389
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1390 start = count * row;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1391 end = start + count;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1392
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1393 for(z=start;z<end;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1394 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1395 [data removeObjectAtIndex:z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1396 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1397 [titles removePointerAtIndex:row];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1398 if(lastAddPoint > 0 && lastAddPoint < row)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1399 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1400 lastAddPoint--;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1401 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1402 }
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	1403 }
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1404 -(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	1405 -(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	1406 -(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	1407 -(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	1408 -(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	1409 -(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	1410 -(void)setLastQueryPoint:(int)input { lastQueryPoint = input; }
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1411 -(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	1412 -(void)setup
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1413 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1414 tvcols = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1415 data = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1416 types = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1417 titles = [[NSPointerArray pointerArrayWithWeakObjects] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1418 [[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	1419 }
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	1420 -(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	1421 {
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	1422 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	1423 {
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	1424 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	1425 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	1426 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	1427
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	1428 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	1429 {
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	1430 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	1431 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	1432 {
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	1433 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	1434 {
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	1435 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	1436 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	1437
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	1438 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	1439 {
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	1440 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	1441 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	1442
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1443 /* 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	1444 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	1445 {
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1446 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	1447 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	1448 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	1449 {
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1450 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	1451 }
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1452 }
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	1453
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	1454 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	1455 {
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	1456 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	1457 }
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	1458 }
866 ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	1459 /* 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	1460 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	1461 {
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	1462 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	1463 }
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	1464 /* 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	1465 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	1466 {
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	1467 [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	1468 }
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	1469 }
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	1470 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	1471 {
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	1472 [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	1473 }
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	1474 }
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	1475 }
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	1476 }
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	1477 }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1478 -(void)setForegroundColor:(NSColor *)input
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1479 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1480 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	1481
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1482 fgcolor = input;
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1483 [fgcolor retain];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1484
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1485 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	1486 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1487 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	1488 NSTextFieldCell *cell = [tableColumn dataCell];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1489 [cell setTextColor:fgcolor];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1490 }
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1491 }
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1492 -(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	1493 {
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	1494 /* Handler for container class */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1495 _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	1496 }
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1497 -(void)keyUp:(NSEvent *)theEvent
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1498 {
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1499 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	1500 {
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1501 _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	1502 }
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1503 [super keyUp:theEvent];
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1504 }
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	1505
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	1506 -(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	1507 {
7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1508 NSUInteger index = [tvcols indexOfObject:tableColumn];
7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1509
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	1510 /* Handler for column click class */
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1511 _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	1512 }
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1513 -(void)selectionChanged:(id)sender
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1514 {
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1515 /* Handler for container class */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1516 _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	1517 /* Handler for listbox class */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1518 _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	1519 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1520 -(NSMenu )menuForEvent:(NSEvent )event
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1521 {
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1522 int row;
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1523 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	1524 row = (int)[self rowAtPoint:where];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1525 _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	1526 return nil;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	1527 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1528 -(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	1529 @end
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1530
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	1531 /* 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	1532 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	1533 {
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	1534 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	1535 {
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	1536 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	1537 int z;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1538
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	1539 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	1540 {
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	1541 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	1542 NSMutableArray children = (NSMutableArray )[pnt pointerAtIndex:3];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1543
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	1544 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	1545 {
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	1546 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	1547 {
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	1548 NSString *oldstr = [item pointerAtIndex:1];
114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	1549 [oldstr release];
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	1550 _free_tree_recurse(children, NULL);
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	1551 [node removeObjectAtIndex:z];
114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	1552 count = (int)[node count];
114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	1553 z--;
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	1554 }
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	1555 else if(item == NULL)
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	1556 {
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	1557 NSString *oldstr = [pnt pointerAtIndex:1];
114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	1558 [oldstr release];
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	1559 _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	1560 }
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	1561 }
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	1562 }
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	1563 }
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	1564 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	1565 {
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	1566 [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	1567 }
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	1568 }
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	1569
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1570 /* Subclass for a Tree type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1571 @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	1572 #ifdef BUILDING_FOR_SNOW_LEOPARD
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	1573 <NSOutlineViewDataSource,NSOutlineViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1574 #endif
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1575 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1576 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	1577 NSTableColumn *treecol;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1578 NSMutableArray *data;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1579 /* 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	1580 * 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	1581 */
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1582 id scrollview;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1583 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	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 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	1586 -(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	1587 -(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	1588 -(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	1589 -(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	1590 -(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	1591 -(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	1592 -(void *)userdata;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1593 -(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	1594 -(void)treeSelectionChanged:(id)sender;
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1595 -(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	1596 -(NSScrollView *)scrollview;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1597 -(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	1598 -(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	1599 -(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	1600 -(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	1601 @end
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1602
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1603 @implementation DWTree
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1604 -(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	1605 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1606 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1607
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1608 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	1609 {
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	1610 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	1611 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	1612 [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	1613 [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	1614 [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	1615 [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	1616 [[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	1617 [[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	1618 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1619 return self;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1620 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1621 -(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	1622 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1623 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	1624 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1625 NSMutableArray *array = [item pointerAtIndex:3];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1626 return array ? [array objectAtIndex:index] : nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1627 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1628 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1629 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1630 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	1631 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1632 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1633 -(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	1634 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1635 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	1636 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1637 -(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	1638 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1639 if(item)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1640 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1641 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	1642 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1643 NSMutableArray *array = [item pointerAtIndex:3];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1644 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	1645 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1646 else
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1647 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1648 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	1649 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1650 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1651 else
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1652 {
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1653 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	1654 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1655 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1656 -(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	1657 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1658 if(item)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1659 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1660 if([item isKindOfClass:[NSPointerArray class]])
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1661 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1662 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	1663 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	1664 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1665 else
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1666 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1667 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	1668 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1669 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1670 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	1671 }
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	1672 -(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	1673 {
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	1674 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	1675 {
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	1676 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	1677 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	1678 [(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	1679 }
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	1680 }
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1681 -(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	1682 -(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	1683 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1684 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	1685 if(parent)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1686 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1687 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	1688 if(!children)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1689 {
692 bd909322f40d Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 691 diff changeset	1690 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	1691 [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	1692 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1693 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1694 else
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1695 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1696 if(!data)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1697 {
692 bd909322f40d Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 691 diff changeset	1698 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	1699 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1700 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1701 [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	1702 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1703 -(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	1704 -(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	1705 -(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	1706 {
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1707 /* 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	1708 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	1709
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	1710 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	1711 {
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	1712 _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	1713 }
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1714 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1715 -(void)treeItemExpanded:(NSNotification *)notification
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1716 {
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1717 id item = [[notification userInfo ] objectForKey: @"NSObject"];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1718
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1719 if(item)
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1720 {
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1721 _event_handler(self, (void *)item, 16);
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1722 }
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	1723 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1724 -(NSMenu )menuForEvent:(NSEvent )event
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1725 {
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1726 int row;
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1727 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	1728 row = (int)[self rowAtPoint:where];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1729 id item = [self itemAtRow:row];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1730 NSString *nstr = [item pointerAtIndex:1];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1731 _event_handler(self, (NSEvent *)[nstr UTF8String], 10);
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	1732 return nil;
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	1733 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1734 -(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	1735 -(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	1736 -(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	1737 -(void)setForegroundColor:(NSColor *)input
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1738 {
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	1739 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	1740 fgcolor = input;
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1741 [fgcolor retain];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1742 [cell setTextColor:fgcolor];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	1743 }
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	1744 -(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	1745 -(void)dealloc
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1746 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1747 UserData *root = userdata;
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1748 _remove_userdata(&root, NULL, TRUE);
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1749 _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	1750 [treecol release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1751 [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	1752 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1753 @end
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	1754
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1755 /* Subclass for a Calendar type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1756 @interface DWCalendar : NSDatePicker
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1757 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1758 void *userdata;
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1759 }
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1760 -(void *)userdata;
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1761 -(void)setUserdata:(void *)input;
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1762 @end
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1763
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1764 @implementation DWCalendar
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1765 -(void *)userdata { return userdata; }
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1766 -(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	1767 -(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	1768 @end
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	1769
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1770 /* Subclass for a Combobox type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1771 @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	1772 #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	1773 <NSComboBoxDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1774 #endif
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1775 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1776 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	1777 id clickDefault;
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1778 }
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1779 -(void *)userdata;
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1780 -(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	1781 -(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	1782 -(void)setClickDefault:(id)input;
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1783 @end
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1784
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1785 @implementation DWComboBox
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1786 -(void *)userdata { return userdata; }
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1787 -(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	1788 -(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	1789 -(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	1790 -(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	1791 {
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	1792 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	1793 {
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	1794 [[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	1795 } 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	1796 {
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	1797 [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	1798 }
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	1799 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1800 -(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	1801 @end
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1802
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	1803 /* 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	1804 /* 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	1805 @interface DWStepper : NSStepper
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1806 {
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	1807 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	1808 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	1809 }
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)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	1811 -(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	1812 -(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	1813 -(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	1814 -(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	1815 -(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	1816 @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	1817
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	1818 @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	1819 -(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	1820 -(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	1821 -(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	1822 -(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	1823 -(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	1824 {
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	1825 [super mouseDown:event];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1826 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	1827 {
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	1828 [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	1829 _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	1830 }
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	1831 }
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	1832 -(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	1833 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1834 [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	1835 _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	1836 }
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	1837 @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	1838
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1839 /* Subclass for a Spinbutton type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1840 @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	1841 #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	1842 <NSTextFieldDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1843 #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	1844 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1845 void *userdata;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1846 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	1847 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	1848 id clickDefault;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1849 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1850 -(id)init;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1851 -(void *)userdata;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1852 -(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	1853 -(NSTextField *)textfield;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1854 -(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	1855 -(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	1856 -(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	1857 @end
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1858
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1859 @implementation DWSpinButton
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1860 -(id)init
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1861 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1862 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1863
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1864 if(self)
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1865 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1866 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	1867 [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	1868 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	1869 [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	1870 [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	1871 [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	1872 [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	1873 [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	1874 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1875 return self;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1876 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	1877 -(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	1878 -(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	1879 -(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	1880 -(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	1881 -(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	1882 {
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	1883 [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	1884 [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	1885 _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	1886 }
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	1887 -(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	1888 -(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	1889 {
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	1890 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	1891 {
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	1892 [[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	1893 }
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	1894 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	1895 {
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	1896 [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	1897 }
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	1898 }
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	1899 -(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	1900 -(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	1901 @end
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	1902
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1903 /* 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	1904 * 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	1905 * 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	1906 */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1907 @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	1908 @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	1909
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	1910 @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	1911 @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	1912
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1913 /* 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	1914 */
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	1915 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	1916 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1917 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	1918
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1919 new->message = message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1920 new->window = window;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1921 new->id = msgid;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1922 new->signalfunction = signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1923 new->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1924 new->next = NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1925
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1926 if (!Root)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1927 Root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1928 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1929 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1930 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1931 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1932 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1933 if(tmp->message == message &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1934 tmp->window == window &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1935 tmp->id == msgid &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1936 tmp->signalfunction == signalfunction)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1937 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1938 tmp->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1939 free(new);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1940 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1941 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1942 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1943 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1944 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1945 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1946 prev->next = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1947 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1948 Root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1949 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1950 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1951
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1952 /* 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	1953 ULONG _findsigmessage(char *signame)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1954 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1955 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1956
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1957 for(z=0;z<SIGNALMAX;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1958 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1959 if(strcasecmp(signame, SignalTranslate[z].name) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1960 return SignalTranslate[z].message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1961 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1962 return 0L;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1963 }
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 unsigned long _foreground = 0xAAAAAA, _background = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1966
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1967 void _handle_resize_events(Box *thisbox)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1968 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1969 int z;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1970
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1971 for(z=0;z<thisbox->count;z++)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1972 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1973 id handle = thisbox->items[z].hwnd;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1974
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1975 if(thisbox->items[z].type == TYPEBOX)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1976 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1977 Box *tmp = [handle box];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1978
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1979 if(tmp)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1980 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1981 _handle_resize_events(tmp);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1982 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1983 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1984 else
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1985 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1986 if([handle isMemberOfClass:[DWRender class]])
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1987 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1988 DWRender render = (DWRender )handle;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1989 NSSize oldsize = [render size];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1990 NSSize newsize = [render frame].size;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1991 NSWindow *window = [render window];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1992
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1993 if([window preferredBackingLocation] != NSWindowBackingLocationVideoMemory)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1994 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1995 [window setPreferredBackingLocation:NSWindowBackingLocationVideoMemory];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1996 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1997
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1998 /* Eliminate duplicate configure requests */
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1999 if(oldsize.width != newsize.width \|\| oldsize.height != newsize.height)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2000 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2001 if(newsize.width > 0 && newsize.height > 0)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2002 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2003 [render setSize:newsize];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2004 _event_handler(handle, nil, 1);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2005 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2006 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2007 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2008 /* Special handling for notebook controls */
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2009 else if([handle isMemberOfClass:[DWNotebook class]])
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2010 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2011 DWNotebook notebook = (DWNotebook )handle;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2012 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2013 id view = [notepage view];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2014
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2015 if(view != nil)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2016 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2017 Box *box = [view box];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2018 _handle_resize_events(box);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2019 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2020 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2021 /* Handle laying out scrollviews... if required space is less
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2022 * than available space, then expand. Otherwise use required space.
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2023 */
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2024 else if([handle isMemberOfClass:[DWScrollBox class]])
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2025 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2026 DWScrollBox scrollbox = (DWScrollBox )handle;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2027 DWBox *contentbox = [scrollbox documentView];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2028 Box *thisbox = [contentbox box];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2029
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2030 /* Get the required space for the box */
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2031 _handle_resize_events(thisbox);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2032 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2033 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2034 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2035 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2036
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2037 /* 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	2038 * and does expansion as necessary.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2039 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2040 static int _resize_box(Box thisbox, int depth, int x, int y, int usedx, int usedy,
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2041 int pass, int usedpadx, int usedpady)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2042 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2043 int z, currentx = 0, currenty = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2044 int uymax = 0, uxmax = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2045 int upymax = 0, upxmax = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2046 /* Used for the SIZEEXPAND */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2047 int nux = usedx, nuy = usedy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2048 int nupx = usedpadx, nupy = usedpady;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2049 int thispadx = thisbox->pad * 2;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2050 int thispady = thisbox->pad * 2;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2051
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2052 /* Handle special groupbox case */
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2053 if(thisbox->grouphwnd)
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2054 {
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	2055 DWGroupBox *groupbox = thisbox->grouphwnd;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2056 NSSize borderSize = [groupbox borderSize];
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	2057 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	2058
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2059 if(borderSize.width == 0 \|\| borderSize.height == 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2060 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2061 borderSize = [groupbox initBorder];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2062 }
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	2063 /* 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	2064 titleRect = [groupbox titleRect];
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2065
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2066 thisbox->grouppadx = borderSize.width;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2067 thisbox->grouppady = borderSize.height + 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	2068
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	2069 (*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	2070 (*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	2071 (*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	2072 (*usedpady) += thisbox->grouppady;
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2073 }
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	2074
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2075 (*usedx) += thispadx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2076 (*usedy) += thispady;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2077
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2078 for(z=0;z<thisbox->count;z++)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2079 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2080 if(thisbox->items[z].type == TYPEBOX)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2081 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2082 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	2083 id box = thisbox->items[z].hwnd;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2084 Box *tmp = [box box];
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2085
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2086 initialx = x - (*usedx);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2087 initialy = y - (*usedy);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2088
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2089 if(tmp)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2090 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2091 int newx, newy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2092 int nux = usedx, nuy = usedy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2093 int tmppadx = tmp->pad*2;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2094 int tmppady = tmp->pad*2;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2095 int upx, upy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2096
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2097 upx = *usedpadx + tmppadx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2098 upy = *usedpady + tmppady;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2099
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2100 /* On the second pass we know how big the box needs to be and how
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2101 * much space we have, so we can calculate a ratio for the new box.
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2102 */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2103 if(pass > 1)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2104 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2105 int deep = *depth + 1;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2106 int tux = nux, tuy = nuy, tupx = upx, tupy = upy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2107
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2108 _resize_box(tmp, &deep, x, y, &tux, &tuy, 1, &tupx, &tupy);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2109
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2110 tmp->upx = tupx - *usedpadx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2111 tmp->upy = tupy - *usedpady;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2112
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2113 newx = x - tux;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2114 newy = y - tuy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2115
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2116 tmp->width = thisbox->items[z].width = initialx - newx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2117 tmp->height = thisbox->items[z].height = initialy - newy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2118
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2119 tmp->parentxratio = thisbox->xratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2120 tmp->parentyratio = thisbox->yratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2121
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2122 tmp->parentpad = tmp->pad;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2123
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2124 /* Just in case */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2125 tmp->xratio = thisbox->xratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2126 tmp->yratio = thisbox->yratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2127
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2128 if(thisbox->type == DW_VERT)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2129 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2130 int tmppad = (thisbox->items[z].pad2)+(tmp->pad2)+tmp->grouppady;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2131
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2132 if((thisbox->items[z].width - tmppad)!=0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2133 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-tmppad))/((float)(thisbox->items[z].width-tmppad));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2134 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2135 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2136 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2137 if((thisbox->items[z].width-tmp->upx)!=0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2138 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-tmp->upx))/((float)(thisbox->items[z].width-tmp->upx));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2139 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2140 if(thisbox->type == DW_HORZ)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2141 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2142 int tmppad = (thisbox->items[z].pad2)+(tmp->pad2)+tmp->grouppadx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2143
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2144 if((thisbox->items[z].height-tmppad)!=0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2145 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-tmppad))/((float)(thisbox->items[z].height-tmppad));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2146 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2147 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2148 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2149 if((thisbox->items[z].height-tmp->upy)!=0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2150 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-tmp->upy))/((float)(thisbox->items[z].height-tmp->upy));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2151 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2152 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2153
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2154 (*depth)++;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2155
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2156 _resize_box(tmp, depth, x, y, &nux, &nuy, pass, &upx, &upy);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2157
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2158 (*depth)--;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2159
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2160 newx = x - nux;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2161 newy = y - nuy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2162
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2163 tmp->minwidth = thisbox->items[z].width = initialx - newx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2164 tmp->minheight = thisbox->items[z].height = initialy - newy;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2165 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2166 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2167
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2168 if(pass > 1 && *depth > 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2169 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2170 if(thisbox->type == DW_VERT)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2171 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2172 int tmppad = (thisbox->items[z].pad2)+(thisbox->parentpad2)+thisbox->grouppadx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2173
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2174 if((thisbox->minwidth-tmppad) == 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2175 thisbox->items[z].xratio = 1.0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2176 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2177 thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-tmppad))/((float)(thisbox->minwidth-tmppad));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2178 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2179 else
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2180 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2181 if(thisbox->minwidth-thisbox->upx == 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2182 thisbox->items[z].xratio = 1.0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2183 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2184 thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2185 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2186
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2187 if(thisbox->type == DW_HORZ)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2188 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2189 int tmppad = (thisbox->items[z].pad2)+(thisbox->parentpad2)+thisbox->grouppady;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2190
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2191 if((thisbox->minheight-tmppad) == 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2192 thisbox->items[z].yratio = 1.0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2193 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2194 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-tmppad))/((float)(thisbox->minheight-tmppad));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2195 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2196 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2197 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2198 if(thisbox->minheight-thisbox->upy == 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2199 thisbox->items[z].yratio = 1.0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2200 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2201 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2202 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2203
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2204 if(thisbox->items[z].type == TYPEBOX)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2205 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2206 id box = thisbox->items[z].hwnd;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2207 Box *tmp = [box box];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2208
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2209 if(tmp)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2210 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2211 tmp->parentxratio = thisbox->items[z].xratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2212 tmp->parentyratio = thisbox->items[z].yratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2213 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2214 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2215 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2216 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2217 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2218 thisbox->items[z].xratio = thisbox->xratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2219 thisbox->items[z].yratio = thisbox->yratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2220 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2221
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2222 if(thisbox->type == DW_VERT)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2223 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2224 if((thisbox->items[z].width + (thisbox->items[z].pad*2)) > uxmax)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2225 uxmax = (thisbox->items[z].width + (thisbox->items[z].pad*2));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2226 if(thisbox->items[z].hsize != SIZEEXPAND)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2227 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2228 if(((thisbox->items[z].pad*2) + thisbox->items[z].width) > upxmax)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2229 upxmax = (thisbox->items[z].pad*2) + thisbox->items[z].width;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2230 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2231 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2232 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2233 if(thisbox->items[z].pad*2 > upxmax)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2234 upxmax = thisbox->items[z].pad*2;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2235 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2236 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2237 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2238 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2239 if(thisbox->items[z].width == -1)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2240 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2241 /* figure out how much space this item requires */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2242 /* thisbox->items[z].width = */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2243 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2244 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2245 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2246 (usedx) += thisbox->items[z].width + (thisbox->items[z].pad2);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2247 if(thisbox->items[z].hsize != SIZEEXPAND)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2248 (usedpadx) += (thisbox->items[z].pad2) + thisbox->items[z].width;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2249 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2250 (usedpadx) += thisbox->items[z].pad2;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2251 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2252 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2253 if(thisbox->type == DW_HORZ)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2254 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2255 if((thisbox->items[z].height + (thisbox->items[z].pad*2)) > uymax)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2256 uymax = (thisbox->items[z].height + (thisbox->items[z].pad*2));
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2257 if(thisbox->items[z].vsize != SIZEEXPAND)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2258 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2259 if(((thisbox->items[z].pad*2) + thisbox->items[z].height) > upymax)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2260 upymax = (thisbox->items[z].pad*2) + thisbox->items[z].height;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2261 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2262 else
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2263 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2264 if(thisbox->items[z].pad*2 > upymax)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2265 upymax = thisbox->items[z].pad*2;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2266 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2267 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2268 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2269 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2270 if(thisbox->items[z].height == -1)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2271 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2272 /* figure out how much space this item requires */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2273 /* thisbox->items[z].height = */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2274 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2275 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2276 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2277 (usedy) += thisbox->items[z].height + (thisbox->items[z].pad2);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2278 if(thisbox->items[z].vsize != SIZEEXPAND)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2279 (usedpady) += (thisbox->items[z].pad2) + thisbox->items[z].height;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2280 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2281 (usedpady) += thisbox->items[z].pad2;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2282 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2283 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2284 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2285
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2286 (*usedx) += uxmax;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2287 (*usedy) += uymax;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2288 (*usedpadx) += upxmax;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2289 (*usedpady) += upymax;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2290
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	2291 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	2292 currenty += thisbox->pad;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2293
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2294 /* The second pass is for expansion. */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2295 if(pass > 1)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2296 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2297 /* Any SIZEEXPAND items should be set to uxmax/uymax */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2298 for(z=0;z<thisbox->count;z++)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2299 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2300 if(thisbox->items[z].hsize == SIZEEXPAND && thisbox->type == DW_VERT)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2301 thisbox->items[z].width = uxmax-(thisbox->items[z].pad*2);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2302 if(thisbox->items[z].vsize == SIZEEXPAND && thisbox->type == DW_HORZ)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2303 thisbox->items[z].height = uymax-(thisbox->items[z].pad*2);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2304 /* Run this code segment again to finalize the sized after setting uxmax/uymax values. */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2305 if(thisbox->items[z].type == TYPEBOX)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2306 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2307 int tux = nux, tuy = nuy, tupx = nupx, tupy = nupy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2308 id box = thisbox->items[z].hwnd;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2309 Box *tmp = [box box];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2310
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2311 if(tmp)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2312 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2313 if(*depth > 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2314 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2315 float calcval;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2316
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2317 if(thisbox->type == DW_VERT)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2318 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2319 calcval = (float)(tmp->minwidth-((thisbox->items[z].pad*2)+thispadx));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2320 if(calcval == 0.0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2321 tmp->xratio = thisbox->xratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2322 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2323 tmp->xratio = ((float)((thisbox->items[z].width * thisbox->xratio)-((thisbox->items[z].pad*2)+thispadx)))/calcval;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2324 tmp->width = thisbox->items[z].width;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2325 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2326 if(thisbox->type == DW_HORZ)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2327 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2328 calcval = (float)(tmp->minheight-((thisbox->items[z].pad*2)+thispady));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2329 if(calcval == 0.0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2330 tmp->yratio = thisbox->yratio;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2331 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2332 tmp->yratio = ((float)((thisbox->items[z].height * thisbox->yratio)-((thisbox->items[z].pad*2)+thispady)))/calcval;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2333 tmp->height = thisbox->items[z].height;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2334 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2335 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2336
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2337
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2338 (*depth)++;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2339
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2340 _resize_box(tmp, depth, x, y, &tux, &tuy, pass, &tupx, &tupy);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2341
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2342 (*depth)--;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2343
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2344 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2345 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2346 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2347 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2348
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2349 /* The third pass is for actual placement. */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2350 if(pass > 2)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2351 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2352 for(z=0;z<(thisbox->count);z++)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2353 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2354 int height = thisbox->items[z].height;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2355 int width = thisbox->items[z].width;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2356 int pad = thisbox->items[z].pad;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2357 NSView *handle = thisbox->items[z].hwnd;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2358 NSPoint point;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2359 NSSize size;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2360 int vectorx, vectory;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2361
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2362 /* When upxmax != pad2 then ratios are incorrect. /
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2363 vectorx = (int)((width*thisbox->items[z].xratio)-width);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2364 vectory = (int)((height*thisbox->items[z].yratio)-height);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2365
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2366 if(width > 0 && height > 0)
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2367 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2368 /* This is a hack to fix rounding of the sizing */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2369 if(*depth == 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2370 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2371 vectorx++;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2372 vectory++;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2373 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2374
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2375 /* If this item isn't going to expand... reset the vectors to 0 */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2376 if(thisbox->items[z].vsize != SIZEEXPAND)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2377 vectory = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2378 if(thisbox->items[z].hsize != SIZEEXPAND)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2379 vectorx = 0;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2380
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2381 point.x = currentx + pad;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2382 point.y = currenty + pad;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2383 size.width = width + vectorx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2384 size.height = height + vectory;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2385 [handle setFrameOrigin:point];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2386 [handle setFrameSize:size];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2387
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2388 /* After placing a box... place its components */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2389 if(thisbox->items[z].type == TYPEBOX)
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2390 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2391 id box = thisbox->items[z].hwnd;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2392 Box *tmp = [box box];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2393
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2394 if(tmp)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2395 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2396 (*depth)++;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2397 _resize_box(tmp, depth, x, y, &nux, &nuy, pass, &nupx, &nupy);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2398 (*depth)--;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2399 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2400 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2401
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2402 /* Special handling for notebook controls */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2403 if([handle isMemberOfClass:[DWNotebook class]])
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2404 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2405 DWNotebook notebook = (DWNotebook )handle;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2406 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2407 id view = [notepage view];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2408
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2409 if(view != nil)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2410 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2411 Box *box = [view box];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2412 NSSize size = [view frame].size;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2413 _do_resize(box, size.width, size.height);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2414 _handle_resize_events(box);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2415 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2416 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2417 /* Handle laying out scrollviews... if required space is less
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2418 * than available space, then expand. Otherwise use required space.
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2419 */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2420 else if([handle isMemberOfClass:[DWScrollBox class]])
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2421 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2422 int usedx = 0, usedy = 0, usedpadx = 0, usedpady = 0, depth = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2423 DWScrollBox scrollbox = (DWScrollBox )handle;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2424 DWBox *contentbox = [scrollbox documentView];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2425 Box *thisbox = [contentbox box];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2426 NSSize contentsize = [scrollbox contentSize];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2427
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2428 /* Get the required space for the box */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2429 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 1, &usedpadx, &usedpady);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2430
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2431 if(contentsize.width < usedx)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2432 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2433 contentsize.width = usedx;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2434 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2435 if(contentsize.height < usedy)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2436 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2437 contentsize.height = usedy;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2438 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2439 [contentbox setFrameSize:contentsize];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2440
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2441 /* Layout the content of the scrollbox */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2442 _do_resize(thisbox, contentsize.width, contentsize.height);
929 d7e88ac1647c Removed some code that had been used for debugging the layout code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 928 diff changeset	2443 _handle_resize_events(thisbox);
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2444 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2445 /* Special handling for spinbutton controls */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2446 else if([handle isMemberOfClass:[DWSpinButton class]])
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2447 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2448 DWSpinButton spinbutton = (DWSpinButton )handle;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2449 NSTextField *textfield = [spinbutton textfield];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2450 NSStepper *stepper = [spinbutton stepper];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2451 [textfield setFrameOrigin:NSMakePoint(0,0)];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2452 [textfield setFrameSize:NSMakeSize(size.width-20,size.height)];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2453 [stepper setFrameOrigin:NSMakePoint(size.width-20,0)];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2454 [stepper setFrameSize:NSMakeSize(20,size.height)];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2455 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2456 else if([handle isMemberOfClass:[DWSplitBar class]] && size.width > 20 && size.height > 20)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2457 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2458 DWSplitBar split = (DWSplitBar )handle;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2459 float percent = [split percent];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2460
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2461 if(percent > 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2462 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2463 dw_splitbar_set(handle, percent);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2464 [split setPercent:0];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2465 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2466 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2467 if(thisbox->type == DW_HORZ)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2468 currentx += width + vectorx + (pad * 2);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2469 if(thisbox->type == DW_VERT)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2470 currenty += height + vectory + (pad * 2);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	2471 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2472 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2473 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2474 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2475 }
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 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	2478 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2479 if(x != 0 && y != 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2480 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2481 if(thisbox)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2482 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2483 int usedx = 0, usedy = 0, usedpadx = 0, usedpady = 0, depth = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2484
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2485 /* Calculate space requirements */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2486 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 1, &usedpadx, &usedpady);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2487
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2488 if(usedx-usedpadx == 0 \|\| usedy-usedpady == 0)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2489 return;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2490
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2491 thisbox->xratio = ((float)(x-usedpadx))/((float)(usedx-usedpadx));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2492 thisbox->yratio = ((float)(y-usedpady))/((float)(usedy-usedpady));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2493
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2494 usedx = usedy = usedpadx = usedpady = depth = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2495
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2496 /* Calculate sub-box ratios for expansion */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2497 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 2, &usedpadx, &usedpady);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2498
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2499 thisbox->xratio = ((float)(x-usedpadx))/((float)(usedx-usedpadx));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2500 thisbox->yratio = ((float)(y-usedpady))/((float)(usedy-usedpady));
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2501
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2502 usedx = usedy = usedpadx = usedpady = depth = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2503
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2504 /* Finally place all the boxes and controls */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2505 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 3, &usedpadx, &usedpady);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2506 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	2507 }
650 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
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2510 NSMenu *_generate_main_menu()
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2511 {
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	2512 NSString *applicationName = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2513
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	2514 /* 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	2515 #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	2516 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	2517 #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	2518 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	2519 {
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2520 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	2521 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2522
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2523 /* Create the main menu */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2524 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	2525
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2526 NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2527 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	2528
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2529 [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	2530
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2531 /* Setup the Application menu */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2532 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	2533 action:@selector(orderFrontStandardAboutPanel:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2534 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2535 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2536
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2537 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2538
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2539 item = [menu addItemWithTitle:NSLocalizedString(@"Services", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2540 action:NULL
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2541 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2542 NSMenu * servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2543 [menu setSubmenu:servicesMenu forItem:item];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2544 [DWApp setServicesMenu:servicesMenu];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2545
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2546 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2547
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2548 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Hide", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2549 action:@selector(hide:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2550 keyEquivalent:@"h"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2551 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2552
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2553 item = [menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2554 action:@selector(hideOtherApplications:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2555 keyEquivalent:@"h"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2556 [item setKeyEquivalentModifierMask:NSCommandKeyMask \| NSAlternateKeyMask];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2557 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2558
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2559 item = [menu addItemWithTitle:NSLocalizedString(@"Show All", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2560 action:@selector(unhideAllApplications:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2561 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2562 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2563
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2564 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2565
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2566 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Quit", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2567 action:@selector(terminate:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2568 keyEquivalent:@"q"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2569 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2570
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2571 [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	2572
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2573 return mainMenu;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2574 }
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2575
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2576 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2577 * 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	2578 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2579 void API dw_main(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2580 {
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	2581 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	2582 DWThread = dw_thread_id();
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2583 [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	2584 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	2585 dw_mutex_unlock(DWRunMutex);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2586 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2587
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2588 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2589 * 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	2590 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2591 * 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	2592 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2593 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	2594 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2595 DWTID curr = pthread_self();
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2596
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2597 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	2598 {
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2599 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	2600 NSDate *until = [NSDate dateWithTimeIntervalSinceNow:(milliseconds/1000.0)];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2601
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2602 if(orig == (DWTID)-1)
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2603 {
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	2604 dw_mutex_lock(DWRunMutex);
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2605 DWThread = curr;
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2606 }
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	2607 /* 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	2608 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	2609 {
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	2610 /* Just loop */
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2611 }
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2612 if(orig == (DWTID)-1)
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2613 {
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	2614 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	2615 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	2616 }
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2617 }
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2618 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	2619 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2620 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	2621 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2622 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2623
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2624 /* 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	2625 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	2626 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2627 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	2628 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	2629 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	2630 dequeue:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2631 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	2632 {
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	2633 [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	2634 [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	2635 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	2636 }
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	2637 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2638 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2639
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2640 /*
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2641 * 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	2642 */
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2643 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	2644 {
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	2645 DWTID curr = pthread_self();
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2646
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	2647 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	2648 {
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	2649 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	2650 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	2651 _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	2652 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	2653 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	2654 }
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	2655 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	2656 {
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	2657 _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	2658 }
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2659 }
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2660
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	2661 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2662 * 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	2663 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2664 * 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	2665 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2666 void API dw_exit(int exitcode)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2667 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2668 exit(exitcode);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2669 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2670
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2671 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2672 * 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	2673 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2674 * ptr: Pointer to dynamic windows allocated
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2675 * memory to be free()'d.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2676 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2677 void API dw_free(void *ptr)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2678 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2679 free(ptr);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2680 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2681
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2682 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2683 * 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	2684 * 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	2685 * OS/2 and Windows).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2686 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2687 char *dw_user_dir(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2688 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2689 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	2690
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2691 if(!_user_dir[0])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2692 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2693 char *home = getenv("HOME");
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2694
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2695 if(home)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2696 strcpy(_user_dir, home);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2697 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2698 strcpy(_user_dir, "/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2699 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2700 return _user_dir;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2701 }
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 * 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	2705 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2706 * 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	2707 * 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	2708 * format: printf style format string.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2709 * ...: 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	2710 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2711 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	2712 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2713 int iResponse;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2714 NSString *button1 = @"OK";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2715 NSString *button2 = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2716 NSString *button3 = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2717 va_list args;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2718 char outbuf[1000];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2719
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2720 va_start(args, format);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2721 vsprintf(outbuf, format, args);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2722 va_end(args);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2723
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2724 if(flags & DW_MB_OKCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2725 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2726 button2 = @"Cancel";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2727 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2728 else if(flags & DW_MB_YESNO)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2729 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2730 button1 = @"Yes";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2731 button2 = @"No";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2732 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2733 else if(flags & DW_MB_YESNOCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2734 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2735 button1 = @"Yes";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2736 button2 = @"No";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2737 button3 = @"Cancel";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2738 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2739
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2740 if(flags & DW_MB_ERROR)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2741 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2742 iResponse = (int)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2743 NSRunCriticalAlertPanel([ NSString stringWithUTF8String:title ],
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2744 [ NSString stringWithUTF8String:outbuf ],
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2745 button1, button2, button3); }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2746 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2747 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2748 iResponse = (int)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2749 NSRunAlertPanel([ NSString stringWithUTF8String:title ],
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2750 [ NSString stringWithUTF8String:outbuf ],
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2751 button1, button2, button3);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2752 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2753
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2754 switch(iResponse)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2755 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2756 case NSAlertDefaultReturn: /* user pressed OK */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2757 if(flags & DW_MB_YESNO \|\| flags & DW_MB_YESNOCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2758 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2759 return DW_MB_RETURN_YES;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2760 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2761 return DW_MB_RETURN_OK;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2762 case NSAlertAlternateReturn: /* user pressed Cancel */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2763 if(flags & DW_MB_OKCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2764 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2765 return DW_MB_RETURN_CANCEL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2766 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2767 return DW_MB_RETURN_NO;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2768 case NSAlertOtherReturn: /* user pressed the third button */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2769 return DW_MB_RETURN_CANCEL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2770 case NSAlertErrorReturn: /* an error occurred */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2771 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2772 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2773 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2774 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2775
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 * 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	2778 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2779 * title: Title bar text for dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2780 * 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	2781 * ext: Default file extention.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2782 * 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	2783 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2784 * 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	2785 * the file path on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2786 *
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2787 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2788 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	2789 {
825 8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2790 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	2791 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2792 /* Create the File Open Dialog class. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2793 NSOpenPanel* openDlg = [NSOpenPanel openPanel];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2794
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2795 /* 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	2796 if(flags == DW_FILE_OPEN)
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2797 {
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2798 [openDlg setCanChooseFiles:YES];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2799 [openDlg setCanChooseDirectories:NO];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2800 }
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2801 else
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2802 {
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2803 [openDlg setCanChooseFiles:NO];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2804 [openDlg setCanChooseDirectories:YES];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	2805 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2806
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2807 /* Disable multiple selection */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2808 [openDlg setAllowsMultipleSelection:NO];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2809
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2810 /* Display the dialog. If the OK button was pressed,
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2811 * process the files.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2812 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2813 if([openDlg runModal] == NSOKButton)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2814 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2815 /* Get an array containing the full filenames of all
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2816 * files and directories selected.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2817 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2818 NSArray* files = [openDlg filenames];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2819 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	2820 return strdup([ fileName UTF8String ]);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2821 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2822 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2823 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2824 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2825 /* Create the File Save Dialog class. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2826 NSSavePanel* saveDlg = [NSSavePanel savePanel];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2827
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2828 /* Enable the creation of directories in the dialog. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2829 [saveDlg setCanCreateDirectories:YES];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2830
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2831 /* Display the dialog. If the OK button was pressed,
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2832 * process the files.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2833 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2834 if([saveDlg runModal] == NSFileHandlingPanelOKButton)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2835 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2836 /* Get an array containing the full filenames of all
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2837 * files and directories selected.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2838 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2839 NSString* fileName = [saveDlg filename];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2840 return strdup([ fileName UTF8String ]);
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2841 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2842 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2843
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2844 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2845 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2846
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2847 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2848 * 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	2849 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2850 * None.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2851 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2852 * 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	2853 * be converted to text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2854 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2855 char *dw_clipboard_get_text()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2856 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2857 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2858 NSString *str = [pasteboard stringForType:NSStringPboardType];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2859 if(str != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2860 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2861 return strdup([ str UTF8String ]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2862 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2863 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2864 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2865
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2866 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2867 * 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	2868 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2869 * Text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2870 */
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	2871 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	2872 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2873 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2874
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	2875 /* 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	2876 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	2877 {
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	2878 [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	2879 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2880
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2881 [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	2882 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2883
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2884
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2885 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2886 * Allocates and initializes a dialog struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2887 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2888 * 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	2889 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2890 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	2891 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2892 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	2893
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2894 if(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2895 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2896 tmp->eve = dw_event_new();
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2897 dw_event_reset(tmp->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2898 tmp->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2899 tmp->done = FALSE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2900 tmp->result = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2901 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2902 return tmp;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2903 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2904
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2905 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2906 * 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	2907 * initial called of dw_dialog_wait().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2908 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2909 * 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	2910 * 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	2911 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2912 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	2913 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2914 dialog->result = result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2915 dw_event_post(dialog->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2916 dialog->done = TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2917 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2918 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2919
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2920 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2921 * 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	2922 * 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	2923 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2924 * 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	2925 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2926 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	2927 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2928 void *tmp;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2929
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2930 while(!dialog->done)
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 _dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2933 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2934 dw_event_close(&dialog->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2935 tmp = dialog->result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2936 free(dialog);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2937 return tmp;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2938 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2939
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2940 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2941 * 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	2942 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2943 * 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	2944 * 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	2945 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2946 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	2947 {
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	2948 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	2949 DW_MUTEX_LOCK;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2950 DWBox *view = [[DWBox alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2951 Box *newbox = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2952 memset(newbox, 0, sizeof(Box));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2953 newbox->pad = pad;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2954 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	2955 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2956 return view;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2957 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2958
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2959 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2960 * 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	2961 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2962 * 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	2963 * 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	2964 * 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	2965 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2966 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	2967 {
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	2968 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	2969 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	2970 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	2971
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	2972 [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	2973 [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	2974 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	2975 [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	2976 return groupbox;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2977 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2978
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2979 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2980 * Create a new scrollable Box to be packed.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2981 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2982 * 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	2983 * 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	2984 */
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	2985 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	2986 {
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2987 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	2988 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	2989 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	2990 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	2991 [scrollbox setHasVerticalScroller:YES];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2992 [scrollbox setHasHorizontalScroller:YES];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2993 [scrollbox setBorderType:NSNoBorder];
838 8e0405435d0a Minor scrollbox fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 837 diff changeset	2994 [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	2995 [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	2996 [scrollbox setDocumentView:tmpbox];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	2997 return scrollbox;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2998 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2999
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3000 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3001 * 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	3002 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3003 * handle: Handle to the scrollbox to be queried.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3004 * orient: The vertical or horizontal scrollbar.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3005 */
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	3006 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	3007 {
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	3008 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	3009 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	3010 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	3011 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	3012 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	3013 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	3014 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	3015 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3016 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	3017 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	3018 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3019 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	3020 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3021 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	3022 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	3023 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3024 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	3025 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3026 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	3027 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3028 return val;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3029 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3030
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3031 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3032 * 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	3033 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3034 * handle: Handle to the scrollbox to be queried.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3035 * orient: The vertical or horizontal scrollbar.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3036 */
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3037 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	3038 {
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	3039 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	3040 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	3041 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	3042 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	3043 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3044 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	3045 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3046 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	3047 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3048 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	3049 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	3050 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	3051 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3052
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 * 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	3055 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3056 * 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	3057 * 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	3058 * 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	3059 * 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	3060 * 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	3061 * 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	3062 * 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	3063 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3064 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	3065 {
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	3066 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	3067 DW_MUTEX_LOCK;
838 8e0405435d0a Minor scrollbox fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 837 diff changeset	3068 id object = box;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3069 DWBox *view = box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3070 DWBox *this = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3071 Box *thisbox;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3072 int z;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3073 Item tmpitem, thisitem;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3074
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3075 /* Query the objects */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3076 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3077 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3078 NSWindow *window = box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3079 view = [window contentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3080 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3081 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	3082 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3083 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	3084 view = [scrollbox box];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3085 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3086
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3087 thisbox = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3088 thisitem = thisbox->items;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3089 object = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3090
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3091 /* Query the objects */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3092 if([ object isKindOfClass:[ DWContainer class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3093 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3094 DWContainer *cont = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3095 this = item = [cont scrollview];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3096 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3097 else if([ object isKindOfClass:[ DWTree class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3098 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3099 DWTree *tree = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3100 this = item = [tree scrollview];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3101 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3102
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3103 /* 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	3104 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	3105
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3106 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	3107 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3108 tmpitem[z+1] = thisitem[z];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3109 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3110
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3111 /* Sanity checks */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3112 if(vsize && !height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3113 height = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3114 if(hsize && !width)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3115 width = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3116
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3117 /* 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	3118 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	3119 tmpitem[0].type = TYPEBOX;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3120 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3121 tmpitem[0].type = TYPEITEM;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3122
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3123 tmpitem[0].hwnd = item;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3124 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	3125 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	3126 tmpitem[0].pad = pad;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3127 if(hsize)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3128 tmpitem[0].hsize = SIZEEXPAND;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3129 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3130 tmpitem[0].hsize = SIZESTATIC;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3131
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3132 if(vsize)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3133 tmpitem[0].vsize = SIZEEXPAND;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3134 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3135 tmpitem[0].vsize = SIZESTATIC;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3136
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3137 thisbox->items = tmpitem;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3138
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3139 /* 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	3140 thisbox->count++;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3141
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3142 /* Add the item to the box */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3143 [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	3144 /* 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	3145 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	3146 {
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	3147 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	3148
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	3149 /* 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	3150 * 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	3151 */
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	3152 [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	3153 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3154
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3155 /* 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	3156 if(thisbox->count)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3157 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	3158 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3159 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3160
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3161 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3162 * 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	3163 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3164 * 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	3165 * 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	3166 * 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	3167 * 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	3168 * 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	3169 * 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	3170 * 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	3171 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3172 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	3173 {
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	3174 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	3175 DW_MUTEX_LOCK;
838 8e0405435d0a Minor scrollbox fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 837 diff changeset	3176 id object = box;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3177 DWBox *view = box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3178 DWBox *this = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3179 Box *thisbox;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3180 int z;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3181 Item tmpitem, thisitem;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3182
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3183 /* Query the objects */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3184 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3185 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3186 NSWindow *window = box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3187 view = [window contentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3188 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3189 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	3190 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3191 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	3192 view = [scrollbox box];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3193 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3194
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3195 thisbox = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3196 thisitem = thisbox->items;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3197 object = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3198
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3199 /* Query the objects */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3200 if([ object isKindOfClass:[ DWContainer class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3201 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3202 DWContainer *cont = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3203 this = item = [cont scrollview];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3204 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3205 else if([ object isKindOfClass:[ DWTree class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3206 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3207 DWTree *tree = item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3208 this = item = [tree scrollview];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3209 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3210
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3211 /* 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	3212 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	3213
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3214 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	3215 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3216 tmpitem[z] = thisitem[z];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3217 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3218
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3219 /* Sanity checks */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3220 if(vsize && !height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3221 height = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3222 if(hsize && !width)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3223 width = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3224
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3225 /* 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	3226 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	3227 tmpitem[thisbox->count].type = TYPEBOX;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3228 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	3229 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	3230
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	3231 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	3232 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	3233 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	3234 tmpitem[thisbox->count].pad = pad;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3235 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	3236 tmpitem[thisbox->count].hsize = SIZEEXPAND;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3237 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	3238 tmpitem[thisbox->count].hsize = SIZESTATIC;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3239
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3240 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	3241 tmpitem[thisbox->count].vsize = SIZEEXPAND;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3242 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	3243 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	3244
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3245 thisbox->items = tmpitem;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3246
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3247 /* 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	3248 thisbox->count++;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3249
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3250 /* Add the item to the box */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3251 [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	3252 /* 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	3253 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	3254 {
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	3255 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	3256
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	3257 /* 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	3258 * 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	3259 */
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	3260 [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	3261 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3262
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3263 /* 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	3264 if(thisbox->count)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3265 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	3266 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3267 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3268
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3269 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	3270 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3271 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	3272 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	3273 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3274 [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	3275 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3276 [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	3277 [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	3278 [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	3279 [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	3280 [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	3281 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	3282 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	3283 [[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	3284 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3285 return button;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3286 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3287
650 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 * 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	3290 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3291 * 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	3292 * 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	3293 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3294 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	3295 {
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3296 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	3297 [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	3298 [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	3299 [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	3300 [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	3301 [[button cell] setControlTint:NSBlueControlTint];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3302 return button;
650 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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3306 * 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	3307 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3308 * 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	3309 * 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	3310 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3311 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	3312 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3313 DWEntryField *entry = [[DWEntryField alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3314 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3315 [entry setTag:cid];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3316 return entry;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3317 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3318
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3319 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3320 * 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	3321 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3322 * 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	3323 * 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	3324 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3325 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	3326 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3327 DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3328 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3329 [entry setTag:cid];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3330 return entry;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3331 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3332
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3333 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3334 * Sets the entryfield character limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3335 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3336 * 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	3337 * 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	3338 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3339 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	3340 {
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	3341 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	3342 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	3343
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	3344 [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	3345 [[entry cell] setFormatter:formatter];
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 * 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	3350 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3351 * 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	3352 * 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	3353 */
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3354 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	3355 {
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3356 NSBundle *bundle = [NSBundle mainBundle];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3357 NSString *respath = [bundle resourcePath];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3358 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3359 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3360 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	3361 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	3362 {
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	3363 [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	3364 }
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	3365 [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	3366 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3367 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3368 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3369
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 * 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	3372 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3373 * 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	3374 * 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	3375 * 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	3376 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3377 * (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	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_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	3380 {
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	3381 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	3382 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	3383 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	3384 {
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	3385 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	3386 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	3387 }
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3388 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	3389 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	3390 {
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	3391 [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	3392 }
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	3393 [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	3394 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3395 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3396 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3397
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3398 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3399 * 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	3400 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3401 * 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	3402 * 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	3403 * data: The contents of the image
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3404 * (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	3405 * len: length of str
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3406 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3407 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	3408 {
760 2fb17622a455 Possible fix for exception in dw_bitmapbutton_new_from_data() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 755 diff changeset	3409 NSData *thisdata = [NSData dataWithBytes:data length:len];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3410 NSImage *image = [[NSImage alloc] initWithData:thisdata];
9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3411 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	3412 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	3413 {
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	3414 [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	3415 }
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	3416 [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	3417 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	3418 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3419 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3422 * 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	3423 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3424 * 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	3425 * 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	3426 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3427 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	3428 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3429 DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3430 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	3431 [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	3432 [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	3433 return spinbutton;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3434 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3437 * Sets the spinbutton value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3438 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3439 * 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	3440 * position: Current value of the spinbutton.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3441 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3442 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	3443 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3444 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3445 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	3446 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	3447 [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	3448 [textfield takeIntValueFrom:stepper];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3449 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3450
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3451 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3452 * Sets the spinbutton limits.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3453 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3454 * 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	3455 * upper: Upper limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3456 * lower: Lower limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3457 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3458 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	3459 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3460 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3461 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	3462 [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	3463 [stepper setMaxValue:(double)upper];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3464 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3465
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3466 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3467 * 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	3468 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3469 * 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	3470 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3471 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	3472 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3473 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3474 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	3475 return (long)[stepper integerValue];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3476 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3477
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3478 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3479 * 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	3480 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3481 * 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	3482 * 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	3483 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3484 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	3485 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3486 DWButton *button = _button_new(text, cid);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3487 [button setButtonType:NSRadioButton];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3488 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3489 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3490
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3491 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3492 * 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	3493 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3494 * 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	3495 * increments: Number of increments available.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3496 * 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	3497 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3498 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	3499 {
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3500 DWSlider *slider = [[DWSlider alloc] init];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3501 [slider setMaxValue:(double)increments];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3502 [slider setMinValue:0];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3503 [slider setContinuous:YES];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3504 [slider setTarget:slider];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3505 [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	3506 [slider setTag:cid];
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	3507 return slider;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3510 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3511 * Returns the position of the slider.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3512 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3513 * 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	3514 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3515 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	3516 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3517 DWSlider *slider = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3518 double val = [slider doubleValue];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3519 return (int)val;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3520 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3523 * Sets the slider position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3524 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3525 * 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	3526 * 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	3527 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3528 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	3529 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3530 DWSlider *slider = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3531 [slider setDoubleValue:(double)position];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3532 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3533
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3534 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3535 * 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	3536 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3537 * 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	3538 * increments: Number of increments available.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3539 * 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	3540 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3541 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	3542 {
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	3543 DWScrollbar *scrollbar;
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3544 if(vertical)
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3545 {
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 scrollbar = [[DWScrollbar alloc] init];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3547 }
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3548 else
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3549 {
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	3550 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	3551 }
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3552 [scrollbar setArrowsPosition:NSScrollerArrowsDefaultSetting];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3553 [scrollbar setTarget:scrollbar];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3554 [scrollbar setAction:@selector(changed:)];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3555 [scrollbar setRange:0.0 andVisible:0.0];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3556 [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	3557 [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	3558 [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	3559 [scrollbar setTag:cid];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3560 [scrollbar setEnabled:YES];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	3561 return scrollbar;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3562 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3563
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3564 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3565 * Returns the position of the scrollbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3566 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3567 * 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	3568 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3569 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	3570 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3571 DWScrollbar *scrollbar = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3572 float range = [scrollbar range];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3573 float fresult = [scrollbar doubleValue] * range;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3574 return (int)fresult;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3575 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3576
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3577 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3578 * Sets the scrollbar position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3579 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3580 * 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	3581 * 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	3582 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3583 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	3584 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3585 DWScrollbar *scrollbar = handle;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	3586 double range = [scrollbar range];
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	3587 double visible = [scrollbar visible];
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	3588 double newpos = (double)position/(range-visible);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3589 [scrollbar setDoubleValue:newpos];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3590 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3591
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3592 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3593 * Sets the scrollbar range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3594 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3595 * 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	3596 * range: Maximum range value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3597 * 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	3598 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3599 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	3600 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3601 DWScrollbar *scrollbar = handle;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	3602 double knob = (double)visible/(double)range;
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	3603 [scrollbar setRange:(double)range andVisible:(double)visible];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3604 [scrollbar setKnobProportion:knob];
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 * 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	3609 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3610 * 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	3611 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3612 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	3613 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3614 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	3615 [percent setStyle:NSProgressIndicatorBarStyle];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3616 [percent setBezeled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3617 [percent setMaxValue:100];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3618 [percent setMinValue:0];
714 cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	3619 [percent incrementBy:1];
cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	3620 [percent setIndeterminate:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3621 /[percent setTag:cid]; Why doesn't this work? /
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3622 return percent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3623 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3624
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3625 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3626 * Sets the percent bar position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3627 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3628 * 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	3629 * 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	3630 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3631 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	3632 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3633 DWPercent *percent = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3634 [percent setDoubleValue:(double)position];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3635 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3636
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 * 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	3639 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3640 * 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	3641 * 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	3642 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3643 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	3644 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3645 DWButton *button = _button_new(text, cid);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3646 [button setButtonType:NSSwitchButton];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3647 [button setBezelStyle:NSRegularSquareBezelStyle];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3648 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3649 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3650
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3651 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3652 * Returns the state of the checkbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3653 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3654 * 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	3655 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3656 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	3657 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3658 DWButton *button = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3659 if([button state])
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 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3662 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3663 return FALSE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3664 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3665
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3666 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3667 * Sets the state of the checkbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3668 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3669 * 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	3670 * 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	3671 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3672 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	3673 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3674 DWButton *button = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3675 if(value)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3676 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3677 [button setState:NSOnState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3678 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3679 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3680 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3681 [button setState:NSOffState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3682 }
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3683
650 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
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	3686 /* 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	3687 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	3688 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3689 NSScrollView *scrollview = [[NSScrollView alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3690 DWContainer *cont = [[DWContainer alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3691
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3692 [cont setScrollview:scrollview];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3693 [scrollview setBorderType:NSBezelBorder];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3694 [scrollview setHasVerticalScroller:YES];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3695 [scrollview setAutohidesScrollers:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3696
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3697 if(multi)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3698 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3699 [cont setAllowsMultipleSelection:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3700 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3701 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3702 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3703 [cont setAllowsMultipleSelection:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3704 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3705 [cont setDataSource:cont];
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	3706 [cont setDelegate:cont];
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	3707 [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	3708 [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	3709 [scrollview release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3710 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	3711 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	3712
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3713 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3714 * 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	3715 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3716 * 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	3717 * multi: Multiple select TRUE or FALSE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3718 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	3719 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	3720 {
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	3721 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	3722 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3723 DWContainer *cont = _cont_new(cid, multi);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3724 [cont setHeaderView:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3725 int type = DW_CFA_STRING;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3726 [cont setup];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3727 NSTableColumn *column = [[NSTableColumn alloc] init];
795 f23cad02cfb3 Make listbox, container and tree cells uneditable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 794 diff changeset	3728 [column setEditable:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3729 [cont addTableColumn:column];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3730 [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	3731 [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	3732 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3733 return cont;
650 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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3737 * 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	3738 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3739 * 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	3740 * text: Text to append into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3741 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3742 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	3743 {
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	3744 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	3745 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3746 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3747
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3748 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3749 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3750 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3751
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3752 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3753 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3754 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	3755 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3756 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	3757 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	3758 NSArray *newrow = [NSArray arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3759
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3760 [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	3761 /*[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	3762 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	3763 waitUntilDone:YES];*/
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3764 [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	3765 [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	3766 }
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	3767 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3768 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3771 * 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	3772 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3773 * 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	3774 * text: Text to insert into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3775 * 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	3776 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3777 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	3778 {
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	3779 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	3780 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3781 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3782
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3783 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3784 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3785 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3786
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3787 [combo insertItemWithObjectValue:[ NSString stringWithUTF8String:text ] atIndex:pos];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3788 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3789 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	3790 {
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3791 DWContainer *cont = handle;
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3792 NSString *nstr = [ NSString stringWithUTF8String:text ];
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3793 NSArray *newrow = [NSArray arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3794
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3795 [cont insertRow:newrow at:pos];
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	3796 [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	3797 [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	3798 }
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	3799 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3800 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3801
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3802 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3803 * 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	3804 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3805 * 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	3806 * 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	3807 * 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	3808 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3809 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	3810 {
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	3811 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	3812 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3813 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3814
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3815 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3816 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3817 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3818 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3819
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3820 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	3821 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3822 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text[z] ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3823 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3824 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3825 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	3826 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3827 DWContainer *cont = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3828 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3829
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3830 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	3831 {
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3832 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	3833 NSArray *newrow = [[NSArray alloc] arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3834
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3835 [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	3836 }
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3837 [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	3838 [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	3839 }
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	3840 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3841 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3842
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3843 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3844 * 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	3845 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3846 * 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	3847 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3848 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	3849 {
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	3850 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	3851 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3852 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3853
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3854 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3855 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3856 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3857
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3858 [combo removeAllItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3859 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3860 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	3861 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3862 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3863
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3864 [cont clear];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	3865 [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	3866 [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	3867 }
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	3868 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3869 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3870
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3871 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3872 * Returns the listbox's item count.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3873 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3874 * 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	3875 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3876 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	3877 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3878 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3879
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3880 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3881 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3882 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3883
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3884 return (int)[combo numberOfItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3885 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3886 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	3887 {
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	3888 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	3889 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	3890 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	3891 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	3892 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	3893 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	3894 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3895 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3896 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3897
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3898 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3899 * 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	3900 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3901 * 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	3902 * top: Index to the top item.
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 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	3905 {
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	3906 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	3907 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3908 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3909
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3910 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3911 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3912 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3913
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3914 [combo scrollItemAtIndexToTop:top];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3915 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3916 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	3917 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3918 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3919
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3920 [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	3921 }
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	3922 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3923 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3924
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3925 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3926 * 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	3927 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3928 * 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	3929 * 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	3930 * 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	3931 * 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	3932 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3933 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	3934 {
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	3935 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	3936 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3937 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3938
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3939 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3940 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3941 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	3942 int count = (int)[combo numberOfItems];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3943
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	3944 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	3945 {
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	3946 *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	3947 }
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	3948 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	3949 {
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	3950 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	3951 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	3952 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3953 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3954 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	3955 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3956 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	3957 int count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3958
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	3959 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	3960 {
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	3961 *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	3962 }
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	3963 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	3964 {
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	3965 NSString *nstr = [cont getRow:index and:0];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3966
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	3967 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	3968 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3969 }
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	3970 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3971 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3972
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3973 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3974 * 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	3975 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3976 * 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	3977 * 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	3978 * 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	3979 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3980 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	3981 {
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	3982 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	3983 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3984 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3985
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3986 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3987 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3988 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	3989 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	3990
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	3991 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	3992 {
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	3993 [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	3994 [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	3995 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3996 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3997 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	3998 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	3999 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	4000 int count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4001
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	4002 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	4003 {
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	4004 NSString *nstr = [ NSString stringWithUTF8String:buffer ];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4005
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	4006 [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	4007 [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	4008 [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	4009 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4010 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4011 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4012 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4013
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4014 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4015 * 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	4016 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4017 * 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	4018 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4019 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	4020 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4021 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4022
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4023 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4024 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4025 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4026 return (int)[combo indexOfSelectedItem];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4027 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4028 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	4029 {
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	4030 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	4031 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	4032 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	4033 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	4034 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	4035 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	4036 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4037 return -1;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4038 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4039
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4040 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4041 * 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	4042 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4043 * 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	4044 * 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	4045 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4046 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	4047 {
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	4048 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	4049 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4050 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	4051 int retval = -1;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4052
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4053 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	4054 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4055 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	4056 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	4057 NSUInteger result = [selected indexGreaterThanIndex:where];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4058
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4059 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	4060 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4061 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	4062 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4063 }
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	4064 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4065 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4066 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4067
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4068 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4069 * 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	4070 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4071 * 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	4072 * index: Item index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4073 * 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	4074 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4075 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	4076 {
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	4077 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	4078 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4079 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4080
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4081 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4082 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4083 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4084 if(state)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4085 [combo selectItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4086 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4087 [combo deselectItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4088 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4089 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	4090 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4091 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	4092 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)index];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4093
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4094 [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	4095 [selected release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4096 }
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	4097 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4098 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4099
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4100 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4101 * 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	4102 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4103 * 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	4104 * index: Item index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4105 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4106 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	4107 {
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	4108 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	4109 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4110 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4111
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4112 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4113 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4114 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4115
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4116 [combo removeItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4117 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4118 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	4119 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4120 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4121
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	4122 [cont removeRow:index];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	4123 [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	4124 [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	4125 }
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	4126 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4127 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4128
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4129 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4130 * 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	4131 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4132 * 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	4133 * 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	4134 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4135 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	4136 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4137 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	4138 [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	4139 [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	4140 [combo setTag:cid];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4141 return combo;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4142 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4143
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4144 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4145 * 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	4146 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4147 * 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	4148 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4149 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	4150 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4151 DWMLE *mle = [[DWMLE alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4152 NSScrollView *scrollview = [[NSScrollView alloc] init];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4153
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4154 [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	4155 [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	4156 [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	4157 [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	4158 [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	4159 [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	4160 /* [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	4161 [mle release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4162 return scrollview;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4163 }
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 * 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	4167 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4168 * 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	4169 * buffer: Text buffer to be imported.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 * startpoint: Point to start entering text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4171 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4172 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	4173 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4174 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4175 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	4176 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	4177 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	4178 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	4179 [ms insertString:nstr atIndex:(startpoint+1)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4180 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	4181 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4182
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4183 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4184 * Grabs text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4185 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4186 * 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	4187 * buffer: Text buffer to be exported.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4188 * startpoint: Point to start grabbing text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4189 * 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	4190 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4191 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	4192 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4193 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4194 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	4195 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	4196 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	4197 strncpy(buffer, [ms UTF8String], length);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4198 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4199
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4201 * Obtains information about an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4202 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4203 * 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	4204 * 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	4205 * 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	4206 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4207 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	4208 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4209 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4210 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	4211 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	4212 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	4213 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	4214
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4215 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	4216 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	4217
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4218 *bytes = stringLength;
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	4219 *lines = numberOfLines;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4220 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4221
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4222 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4223 * Deletes text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4224 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4225 * 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	4226 * startpoint: Point to start deleting text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4227 * 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	4228 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4229 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	4230 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4231 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4232 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	4233 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	4234 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	4235 [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	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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4239 * 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	4240 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4241 * 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	4242 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4243 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	4244 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4245 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4246 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	4247 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	4248 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	4249 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	4250 [ms deleteCharactersInRange:NSMakeRange(0, length)];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4251 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4252
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4253 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4254 * 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	4255 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4256 * 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	4257 * line: Line to be visible.
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 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	4260 {
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4261 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4262 DWMLE *mle = [sv documentView];
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4263 NSTextStorage *ts = [mle textStorage];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4264 NSMutableString *ms = [ts mutableString];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4265 NSUInteger numberOfLines, index, stringLength = [ms length];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4266
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4267 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	4268 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	4269
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4270 if(line == numberOfLines)
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4271 {
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	4272 [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	4273 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4274 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4275
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4276 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4277 * 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	4278 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 * handle: Handle to the MLE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4280 * 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	4281 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4282 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	4283 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4284 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4285 DWMLE *mle = [sv documentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4286 if(state)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4287 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4288 [mle setEditable:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4289 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4290 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4291 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4292 [mle setEditable:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4293 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4294 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4295
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4296 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4297 * 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	4298 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4299 * handle: Handle to the MLE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4300 * 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	4301 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4302 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	4303 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	4304 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4305 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	4306 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	4307 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4308 [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	4309 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4310 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	4311 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	4312 [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	4313 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4314 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4315
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4316 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4317 * 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	4318 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4319 * 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	4320 * point: Point to position cursor.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4321 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4322 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	4323 {
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	4324 NSScrollView *sv = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4325 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	4326 [mle setSelectedRange: NSMakeRange(point,point)];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4327 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4328
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4329 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4330 * Finds text in an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4331 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4332 * 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	4333 * text: Text to search for.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4334 * point: Start point of search.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4335 * flags: Search specific flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4336 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4337 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	4338 {
888 cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4339 NSScrollView *sv = handle;
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4340 DWMLE *mle = [sv documentView];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4341 NSTextStorage *ts = [mle textStorage];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4342 NSMutableString *ms = [ts mutableString];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4343 NSString *searchForMe = [NSString stringWithUTF8String:text];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4344 NSRange searchRange = NSMakeRange(point, [ms length] - point);
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4345 NSRange range = NSMakeRange(NSNotFound, 0);
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4346 NSUInteger options = flags ? flags : NSCaseInsensitiveSearch;
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4347
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4348 if(ms)
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4349 {
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4350 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	4351 }
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4352
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4353 if(range.location != NSNotFound)
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4354 {
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4355 return -1;
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4356 }
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	4357 return (int)range.location;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4358 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4359
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4360 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4361 * Stops redrawing of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4362 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4363 * 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	4364 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4365 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	4366 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4367 /* 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	4368 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4369
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4370 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4371 * Resumes redrawing of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4372 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4373 * 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	4374 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4375 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	4376 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4377 /* 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	4378 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4379
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4380 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4381 * 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	4382 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4383 * 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	4384 * 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	4385 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4386 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	4387 {
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	4388 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	4389 [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	4390 if(DWOSMinor > 5)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4391 {
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	4392 [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	4393 [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	4394 }
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4395 [textfield setBackgroundColor:[NSColor clearColor]];
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	4396 [textfield setDrawsBackground:NO];
931 dfd84cefd80b Minor changes to vertical centering on (status) text fields on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 930 diff changeset	4397 [[textfield cell] setVCenter:YES];
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	4398 return textfield;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4399 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4400
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4401 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4402 * 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	4403 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4404 * 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	4405 * 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	4406 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4407 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	4408 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4409 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	4410 [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	4411 [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	4412 [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	4413 [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	4414 [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	4415 [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	4416 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	4417 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4418 [[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	4419 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	4420 return textfield;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4421 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4424 * 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	4425 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4426 * 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	4427 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4428 * 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	4429 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4430 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	4431 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4432 DWRender *render = [[DWRender alloc] init];
922 07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	4433 [render setTag:cid];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4434 return render;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4435 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4436
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4437 /* Sets the current foreground drawing color.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4438 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4439 * red: red value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4440 * green: green value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4441 * blue: blue value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4442 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4443 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	4444 {
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	4445 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	4446 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	4447
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4448 _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	4449
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	4450 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	4451 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	4452 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	4453 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	4454 [oldcolor release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4455 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4456
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4457 /* Sets the current background drawing color.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4458 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4459 * red: red value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4460 * green: green value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4461 * blue: blue value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4462 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4463 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	4464 {
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	4465 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	4466 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	4467
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	4468 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	4469 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4470 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	4471 }
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4472 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	4473 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4474 _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	4475
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	4476 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	4477 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	4478 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	4479 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	4480 }
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	4481 [oldcolor release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4482 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4483
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4484 /* 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	4485 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4486 * value: current color
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4487 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4488 * 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	4489 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4490 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	4491 {
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4492 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	4493 /* 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	4494 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	4495 DWDialog *dialog;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4496
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4497 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	4498 {
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4499 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	4500 /* 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	4501 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	4502 {
8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4503 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	4504 }
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4505 }
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4506 else
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4507 {
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4508 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	4509 /* 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	4510 [colorDlg setContinuous:NO];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4511 [colorDlg setTarget:colorDlg];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4512 [colorDlg setAction:@selector(changeColor:)];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4513 }
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4514
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	4515 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	4516 [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	4517 [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	4518 [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	4519
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4520 /* 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	4521 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	4522
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	4523 /* 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	4524 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	4525 [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	4526 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	4527 return value;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4528 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4529
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4530 /* 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	4531 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4532 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4533 * 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	4534 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4535 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4536 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4537 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	4538 {
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	4539 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	4540 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4541 id image = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4542 if(pixmap)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4543 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4544 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	4545 [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	4546 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
915 361d80388dc9 Test fix at the partial bitblt issue on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 911 diff changeset	4547 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort] flipped:YES]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4548 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4549 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4550 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4551 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	4552 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4553 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	4554 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	4555 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4556 _DWLastDrawable = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4557 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4558 NSBezierPath* aPath = [NSBezierPath bezierPath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4559 [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	4560 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	4561 [color set];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4562
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4563 [aPath moveToPoint:NSMakePoint(x, y)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4564 [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	4565 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	4566 {
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	4567 [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	4568 }
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	4569 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	4570 {
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	4571 [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	4572 }
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	4573 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4574 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4575
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4576 /* 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	4577 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4578 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4579 * 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	4580 * x1: First X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4581 * y1: First Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4582 * x2: Second X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4583 * y2: Second Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4584 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4585 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	4586 {
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	4587 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	4588 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4589 id image = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4590 if(pixmap)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4591 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4592 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	4593 [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	4594 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
915 361d80388dc9 Test fix at the partial bitblt issue on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 911 diff changeset	4595 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort] flipped:YES]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4596 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4597 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4598 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4599 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	4600 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4601 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	4602 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	4603 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4604 _DWLastDrawable = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4605 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4606 NSBezierPath* aPath = [NSBezierPath bezierPath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4607 [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	4608 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	4609 [color set];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4610
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4611 [aPath moveToPoint:NSMakePoint(x1, y1)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4612 [aPath lineToPoint:NSMakePoint(x2, y2)];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4613 [aPath stroke];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4614
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	4615 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	4616 {
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	4617 [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	4618 }
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	4619 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	4620 {
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	4621 [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	4622 }
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	4623 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4624 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4625
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4626 /* 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	4627 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4628 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4629 * 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	4630 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4631 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4632 * text: Text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4633 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4634 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	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 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	4637 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	4638 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	4639 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	4640 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	4641 {
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	4642 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	4643 {
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	4644 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	4645 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	4646 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	4647 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4648 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	4649 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	4650 }
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	4651 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	4652 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	4653 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	4654 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	4655 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4656 [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	4657 }
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	4658 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	4659 {
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	4660 [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	4661 }
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	4662 [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	4663 [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	4664 [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	4665 }
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	4666 _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	4667 }
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	4668 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	4669 {
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	4670 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	4671 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	4672 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	4673 {
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	4674 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	4675 }
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	4676 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	4677 [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	4678 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
915 361d80388dc9 Test fix at the partial bitblt issue on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 911 diff changeset	4679 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] 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	4680 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	4681 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	4682 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	4683 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	4684 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	4685 [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	4686 }
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	4687 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	4688 {
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	4689 [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	4690 }
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	4691 [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	4692 [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	4693 [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	4694 }
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	4695 DW_MUTEX_UNLOCK;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4698 /* 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	4699 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4700 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4701 * 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	4702 * text: Text to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4703 * 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	4704 * 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	4705 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4706 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	4707 {
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	4708 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	4709 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	4710 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	4711 {
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	4712 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	4713 }
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	4714 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	4715 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	4716 {
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	4717 NSFont *font = [object font];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4718
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	4719 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	4720 {
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	4721 [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	4722 }
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	4723 }
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	4724 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	4725 [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	4726 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	4727 {
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	4728 *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	4729 }
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	4730 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	4731 {
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	4732 *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	4733 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4734 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4735
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4736 /* 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	4737 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4738 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4739 * 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	4740 * fill: Fill box TRUE or FALSE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4741 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4742 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4743 * width: Width of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4744 * height: Height of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4745 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4746 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	4747 {
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	4748 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	4749 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4750 id image = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4751 int z;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4752 if(pixmap)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4753 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4754 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	4755 [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	4756 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
915 361d80388dc9 Test fix at the partial bitblt issue on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 911 diff changeset	4757 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort] flipped:YES]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4758 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4759 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4760 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4761 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	4762 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4763 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	4764 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	4765 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4766 _DWLastDrawable = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4767 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4768 NSBezierPath* aPath = [NSBezierPath bezierPath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4769 [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	4770 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	4771 [color set];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4772
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4773 [aPath moveToPoint:NSMakePoint(x, y)];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4774 for(z=1;z<npoints;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4775 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4776 [aPath lineToPoint:NSMakePoint(x[z], y[z])];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4777 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4778 [aPath closePath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4779 if(fill)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4780 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4781 [aPath fill];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4782 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4783 [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	4784 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	4785 {
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	4786 [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	4787 }
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	4788 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	4789 {
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	4790 [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	4791 }
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	4792 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4793 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4794
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4795 /* 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	4796 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4797 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4798 * 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	4799 * fill: Fill box TRUE or FALSE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4800 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4801 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4802 * width: Width of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4803 * height: Height of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4804 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4805 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	4806 {
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	4807 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	4808 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4809 id image = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4810 if(pixmap)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4811 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4812 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	4813 [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	4814 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
915 361d80388dc9 Test fix at the partial bitblt issue on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 911 diff changeset	4815 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort] flipped:YES]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4816 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4817 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4818 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4819 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	4820 {
a4f99795ff26 Abort drawing functions if we fail to lock focus on a render control. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 745 diff changeset	4821 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	4822 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	4823 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4824 _DWLastDrawable = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4825 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4826 NSBezierPath* aPath = [NSBezierPath bezierPath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4827 [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	4828 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	4829 [color set];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4830
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4831 [aPath moveToPoint:NSMakePoint(x, y)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4832 [aPath lineToPoint:NSMakePoint(x, y + height)];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4833 [aPath lineToPoint:NSMakePoint(x + width, y + height)];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4834 [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	4835 [aPath closePath];
767 9b0c22b58447 Don't fill a rectangle unless requested to mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 766 diff changeset	4836 if(fill)
9b0c22b58447 Don't fill a rectangle unless requested to mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 766 diff changeset	4837 [aPath fill];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4838 [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	4839 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	4840 {
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	4841 [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	4842 }
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	4843 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	4844 {
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	4845 [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	4846 }
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	4847 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4848 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4851 * 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	4852 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4853 * 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	4854 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4855 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	4856 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	4857 {
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	4858 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	4859 DW_MUTEX_LOCK;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4860 NSScrollView *scrollview = [[NSScrollView alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4861 DWTree *tree = [[DWTree alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4862
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4863 [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	4864 [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	4865 [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	4866 [scrollview setAutohidesScrollers:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4867
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4868 [tree setAllowsMultipleSelection:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4869 [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	4870 [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	4871 [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	4872 [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	4873 [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	4874 [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	4875 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	4876 return tree;
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 * 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	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 tree to be inserted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4883 * 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	4884 * 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	4885 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4886 * 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	4887 * itemdata: Item specific data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4888 */
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	4889 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	4890 {
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	4891 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	4892 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	4893 DWTree *tree = handle;
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	4894 NSString *nstr = [[NSString stringWithUTF8String:title] retain];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4895 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	4896 [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	4897 [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	4898 [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	4899 [treenode addPointer:NULL];
881 7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4900 [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	4901 [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	4902 [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	4903 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4904 return treenode;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905 }
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 * 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	4909 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4910 * 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	4911 * 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	4912 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4913 * 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	4914 * itemdata: Item specific data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4915 */
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	4916 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	4917 {
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	4918 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	4919 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4920
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 * 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	4923 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924 * 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	4925 * 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	4926 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4927 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	4928 {
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	4929 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	4930 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	4931 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	4932 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	4933 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	4934 return strdup([nstr UTF8String]);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4935 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4936
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 * 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	4939 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4940 * 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	4941 * 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	4942 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4943 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	4944 {
881 7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4945 int _locked_by_me = FALSE;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4946 HTREEITEM parent;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4947
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4948 DW_MUTEX_LOCK;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4949 NSPointerArray array = (NSPointerArray )item;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4950 parent = (HTREEITEM)[array pointerAtIndex:4];
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4951 DW_MUTEX_UNLOCK;
7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	4952 return parent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4953 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4954
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4955 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4956 * 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	4957 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4958 * 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	4959 * 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	4960 * 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	4961 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4962 */
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	4963 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	4964 {
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	4965 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	4966 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	4967 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	4968 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	4969 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	4970 {
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	4971 NSString *oldstr = [array pointerAtIndex:1];
114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	4972 NSString *nstr = [[NSString stringWithUTF8String:title] retain];
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	4973 [array replacePointerAtIndex:1 withPointer:nstr];
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	4974 [oldstr release];
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	4975 }
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	4976 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	4977 {
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	4978 [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	4979 }
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	4980 [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	4981 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4982 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4983
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4984 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4985 * 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	4986 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4987 * 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	4988 * 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	4989 * 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	4990 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4991 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	4992 {
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	4993 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	4994 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	4995 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	4996 [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	4997 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4998 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4999
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5000 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5001 * 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	5002 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5003 * 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	5004 * 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	5005 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5006 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	5007 {
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	5008 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	5009 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	5010 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	5011 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	5012 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	5013 return result;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5014 }
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 * 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	5018 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5019 * 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	5020 * 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	5021 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022 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	5023 {
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	5024 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	5025 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	5026 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	5027 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	5028 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	5029 {
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	5030 [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	5031 }
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	5032 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5033 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5034
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5035 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5036 * Removes all nodes from a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5037 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5038 * 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	5039 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5040 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	5041 {
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	5042 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	5043 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	5044 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	5045 [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	5046 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5047 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5048
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5049 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5050 * Expands a node on a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5051 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5052 * 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	5053 * 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	5054 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5055 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	5056 {
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	5057 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	5058 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	5059 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	5060 [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	5061 DW_MUTEX_UNLOCK;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5064 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5065 * Collapses a node on a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5067 * 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	5068 * 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	5069 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 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	5071 {
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	5072 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	5073 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	5074 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	5075 [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	5076 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5077 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5078
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5079 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5080 * Removes a node from a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5081 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5082 * 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	5083 * 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	5084 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5085 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	5086 {
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	5087 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	5088 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	5089 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	5090 [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	5091 [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	5092 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5093 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5094
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5095 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5096 * 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	5097 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5098 * 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	5099 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5100 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5101 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	5102 {
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	5103 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	5104 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	5105 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	5106 NSScrollView *scrollview = [cont scrollview];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5107 [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	5108 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	5109 [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	5110 [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	5111 [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	5112 [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	5113 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	5114 return cont;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5115 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5116
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5117 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 * Sets up the container columns.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5119 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5120 * 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	5121 * 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	5122 * 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	5123 * 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	5124 * 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	5125 * (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	5126 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5127 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	5128 {
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	5129 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	5130 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5131 int z;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5132 DWContainer *cont = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5133
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5134 [cont setup];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5135
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5136 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5137 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5138 NSTableColumn *column = [[NSTableColumn alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5139 [[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	5140 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	5141 {
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	5142 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	5143 [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	5144 [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	5145 }
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	5146 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	5147 {
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	5148 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	5149 [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	5150 [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	5151 [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	5152 }
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	5153 /* 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	5154 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	5155 {
0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5156 [(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	5157 [(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	5158 }
0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5159 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	5160 {
0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	5161 [(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	5162 [(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	5163 }
795 f23cad02cfb3 Make listbox, container and tree cells uneditable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 794 diff changeset	5164 [column setEditable:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5165 [cont addTableColumn:column];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5166 [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	5167 [column release];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5168 }
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	5169 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5170 return TRUE;
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 * 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	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 to be configured.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5177 * 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	5178 * 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	5179 * 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	5180 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5181 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	5182 {
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	5183 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	5184 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	5185 DWContainer *cont = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5186
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	5187 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	5188
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	5189 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	5190
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	5191 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	5192 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	5193
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	5194 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	5195 [cont setFilesystem:YES];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5196
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5197 free(newtitles);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5198 free(newflags);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5199 return TRUE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5200 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5201
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5202 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5203 * 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	5204 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5205 * 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	5206 * 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	5207 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5208 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	5209 {
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	5210 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	5211 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5212 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5213 [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	5214 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5215 return cont;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5216 }
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 * 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	5220 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5221 * 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	5222 * 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	5223 * 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	5224 * 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	5225 * 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	5226 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5227 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	5228 {
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	5229 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	5230 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5231 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5232 id object = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5233 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	5234 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	5235
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	5236 /* 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	5237 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	5238 {
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	5239 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	5240 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5241
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	5242 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	5243 {
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	5244 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	5245 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	5246 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5247 if(type & DW_CFA_BITMAPORICON)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5248 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5249 object = ((NSImage *)data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5250 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5251 else if(type & DW_CFA_STRING)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5252 {
726 ecf47778caff Possible fix for container string columns not showing correctly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 725 diff changeset	5253 char str = ((char **)data);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5254 object = [ NSString stringWithUTF8String:str ];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5255 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5256 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5257 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5258 char textbuffer[100];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5259
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5260 if(type & DW_CFA_ULONG)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5261 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5262 ULONG tmp = ((ULONG )data);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5263
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5264 sprintf(textbuffer, "%lu", tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5265 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5266 else if(type & DW_CFA_DATE)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5267 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5268 struct tm curtm;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5269 CDATE cdate = ((CDATE )data);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5270
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5271 memset( &curtm, 0, sizeof(curtm) );
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5272 curtm.tm_mday = cdate.day;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5273 curtm.tm_mon = cdate.month - 1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5274 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	5275
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5276 strftime(textbuffer, 100, "%x", &curtm);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5277 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5278 else if(type & DW_CFA_TIME)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5279 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5280 struct tm curtm;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5281 CTIME ctime = ((CTIME )data);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5282
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5283 memset( &curtm, 0, sizeof(curtm) );
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5284 curtm.tm_hour = ctime.hours;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5285 curtm.tm_min = ctime.minutes;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5286 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	5287
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5288 strftime(textbuffer, 100, "%X", &curtm);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5289 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5290 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5291 {
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;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5293 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5294 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5295 object = [ NSString stringWithUTF8String:textbuffer ];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5296 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5297
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5298 [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	5299 [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	5300 DW_MUTEX_UNLOCK;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5303 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5304 * 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	5305 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5306 * 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	5307 * 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	5308 * 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	5309 * 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	5310 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5311 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	5312 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5313 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	5314 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5315
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5316 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5317 * 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	5318 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5319 * 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	5320 * 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	5321 * 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	5322 * 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	5323 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5324 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	5325 {
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	5326 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	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 * 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	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 * 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	5335 * 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	5336 * 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	5337 */
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	5338 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	5339 {
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	5340 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	5341 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5342
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 * 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	5345 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5346 * 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	5347 * 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	5348 * 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	5349 * 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	5350 * 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	5351 */
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	5352 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	5353 {
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	5354 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	5355 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	5356 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	5357 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	5358 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	5359
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	5360 /* 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	5361 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	5362 {
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	5363 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	5364 }
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	5365
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	5366 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	5367 [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	5368 [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	5369 [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	5370 [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	5371 [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	5372 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5373 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5374
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5375 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5376 * 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	5377 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5378 * 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	5379 * 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	5380 * 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	5381 * 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	5382 * 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	5383 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5384 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	5385 {
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	5386 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	5387 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5388
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5389 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5390 * 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	5391 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5392 * 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	5393 * column: Zero based column.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5394 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5395 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	5396 {
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	5397 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	5398 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	5399 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	5400 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	5401 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	5402 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	5403 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	5404 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	5405 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	5406 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	5407 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	5408 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	5409 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	5410 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	5411 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	5412 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	5413 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	5414 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	5415 return rc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5416 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5417
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5418 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5419 * 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	5420 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5421 * 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	5422 * column: Zero based column.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5423 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5424 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	5425 {
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	5426 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	5427 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5428
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5429 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5430 * 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	5431 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5432 * 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	5433 * 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	5434 * width: Width of column in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5435 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5436 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	5437 {
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	5438 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	5439 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	5440 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	5441 if([cont filesystem])
168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	5442 {
168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	5443 column++;
168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	5444 }
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	5445 NSTableColumn *col = [cont getColumn:column];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5446
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	5447 [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	5448 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5449 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5450
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 * 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	5453 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5454 * 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	5455 * 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	5456 * title: String title of the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5457 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5458 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	5459 {
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	5460 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	5461 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5462 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	5463 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	5464 [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	5465 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	5466 }
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	5467
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	5468
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	5469 /*
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	5470 * 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	5471 * 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	5472 * 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	5473 * 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	5474 * 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	5475 */
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	5476 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	5477 {
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	5478 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	5479 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	5480 DWContainer *cont = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5481 [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	5482 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5483 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5484
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5485 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5486 * 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	5487 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5488 * 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	5489 * 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	5490 * 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	5491 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5492 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	5493 {
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	5494 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	5495 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5496 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	5497 [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	5498 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5499 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5500
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5501 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5502 * Removes all rows from a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5503 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5504 * 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	5505 * 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	5506 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5507 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	5508 {
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	5509 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	5510 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5511 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5512 [cont clear];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5513 if(redraw)
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5514 {
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5515 [cont reloadData];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5516 }
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	5517 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5518 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5519
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5520 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5521 * 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	5522 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5523 * 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	5524 * 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	5525 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5526 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	5527 {
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	5528 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	5529 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	5530 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	5531 int x;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5532
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	5533 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	5534 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5535 [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	5536 }
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	5537 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5538 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5539
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5540 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5541 * Scrolls container up or down.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5542 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5543 * 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	5544 * 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	5545 * 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	5546 * 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	5547 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5548 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	5549 {
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	5550 DWContainer *cont = handle;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	5551 NSScrollView *sv = [cont scrollview];
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5552 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	5553 int rowcount = (int)[cont numberOfRowsInTableView:cont];
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5554 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	5555 float change;
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5556
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5557 /* Safety check */
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5558 if(rowcount < 1)
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5559 {
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5560 return;
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5561 }
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5562
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	5563 change = (float)rows/(float)rowcount;
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5564
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5565 switch(direction)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5566 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5567 case DW_SCROLL_TOP:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5568 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5569 [scrollbar setFloatValue:0];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5570 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5571 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5572 case DW_SCROLL_BOTTOM:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5573 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5574 [scrollbar setFloatValue:1];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5575 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5576 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5577 case DW_SCROLL_UP:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5578 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5579 float newpos = currpos - change;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5580 if(newpos < 0)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5581 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5582 newpos = 0;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5583 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5584 [scrollbar setFloatValue:newpos];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5585 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5586 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5587 case DW_SCROLL_DOWN:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5588 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5589 float newpos = currpos + change;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5590 if(newpos > 1)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5591 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5592 newpos = 1;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5593 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5594 [scrollbar setFloatValue:newpos];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5595 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5596 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	5597 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5598 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5599
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5600 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5601 * 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	5602 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5603 * 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	5604 * 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	5605 * 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	5606 * 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	5607 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5608 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	5609 {
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	5610 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	5611 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	5612 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	5613 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	5614 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	5615 char *retval = NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5616
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	5617 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	5618 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5619 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	5620 [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	5621 }
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	5622 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5623 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5624 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5625
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5626 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5627 * 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	5628 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5629 * 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	5630 * 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	5631 * 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	5632 * 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	5633 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5634 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	5635 {
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	5636 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	5637 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	5638 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	5639 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	5640 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	5641 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	5642 char *retval = NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5643
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	5644 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	5645 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5646 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	5647 [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	5648 }
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	5649 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5650 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5651 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5652
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 * 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	5655 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5656 * 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	5657 * 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	5658 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5659 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	5660 {
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	5661 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	5662 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	5663 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	5664 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	5665 int x, count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5666
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	5667 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	5668 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5669 thistext = [cont getRowTitle:x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5670
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	5671 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	5672 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5673 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5674
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	5675 [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	5676 [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	5677 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5678 }
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	5679 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5680 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5683 * 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	5684 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5685 * handle: Handle to the window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5686 * 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	5687 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5688 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	5689 {
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	5690 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	5691 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	5692 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	5693 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	5694 int x, count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5695
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	5696 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	5697 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5698 thistext = [cont getRowTitle:x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5699
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	5700 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	5701 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5702 [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	5703 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	5704 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5705 }
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	5706 DW_MUTEX_UNLOCK;
650 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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710 * 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	5711 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5712 * 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	5713 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5714 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	5715 {
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;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5718 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	5719 [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	5720 #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	5721 /* All resizable columns should expand */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5722 [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	5723 #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	5724 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5725 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5726
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5728 * Inserts an icon into the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5729 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5730 * 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	5731 * 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	5732 * 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	5733 */
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	5734 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	5735 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5736 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	5737 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5738
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5739 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5740 * Deletes an icon from the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5741 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5742 * 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	5743 * 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	5744 */
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	5745 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	5746 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5747 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	5748 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5749
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5750 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5751 * 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	5752 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5753 * 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	5754 * 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	5755 * 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	5756 * to an embedded XPM.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5757 */
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	5758 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	5759 {
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	5760 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	5761 NSString *respath = [bundle resourcePath];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5762 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5763 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5764 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5765 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5766
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5767 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5768 * Obtains an icon from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5769 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5770 * 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	5771 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5772 * (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	5773 */
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	5774 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	5775 {
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	5776 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	5777 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	5778 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	5779 {
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	5780 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	5781 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	5782 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5783 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5784 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5785
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5786 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5787 * Obtains an icon from data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5788 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5789 * 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	5790 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5791 * (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	5792 */
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	5793 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	5794 {
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5795 NSData *thisdata = [NSData dataWithBytes:data length:len];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5796 NSImage *image = [[NSImage alloc] initWithData:thisdata];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5797 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5798 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5799
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 * 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	5802 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5803 * 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	5804 */
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	5805 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	5806 {
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	5807 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	5808 [image release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5809 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5810
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5811 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5812 * 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	5813 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5814 * 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	5815 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5816 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	5817 {
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	5818 /* 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	5819 * 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	5820 * when the application is deactivated to simulate
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5821 * 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	5822 */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	5823 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	5824 /* [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	5825 return mdi;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5826 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5827
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5828 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5829 * 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	5830 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5831 * 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	5832 * 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	5833 * 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	5834 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5835 * 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	5836 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5837 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	5838 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5839 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	5840 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	5841 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5842 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	5843 [split setDelegate:split];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5844 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	5845 [split addSubview:tmpbox];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5846 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	5847 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	5848 [split addSubview:tmpbox];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5849 if(type == DW_VERT)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5850 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5851 [split setVertical:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5852 }
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5853 else
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5854 {
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5855 [split setVertical:YES];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5856 }
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	5857 /* 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	5858 [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	5859 /* [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	5860 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5861 return split;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5862 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5863
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5864 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5865 * 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	5866 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5867 * 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	5868 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5869 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	5870 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5871 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	5872 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	5873 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	5874 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	5875 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	5876 /* 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	5877 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	5878 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5879 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	5880 }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5881 else
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5882 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5883 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	5884 }
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5885 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	5886 {
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5887 [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	5888 }
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5889 else
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5890 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5891 /* 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	5892 * 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	5893 * 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	5894 */
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5895 [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	5896 }
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	5897 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5898 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5899
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5900 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5901 * 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	5902 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903 * 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	5904 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5905 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	5906 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5907 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	5908 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	5909 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	5910 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	5911 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	5912 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	5913 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	5914 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5915 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	5916 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	5917 }
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5918 else
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5919 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	5920 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	5921 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	5922 }
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5923 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	5924 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5925 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	5926 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5927 return retval;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5931 * 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	5932 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5933 * 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	5934 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5935 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	5936 {
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	5937 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	5938 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5939 NSImageView *bitmap = [[NSImageView alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5940 [bitmap setImageFrameStyle:NSImageFrameNone];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5941 [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	5942 [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	5943 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5944 return bitmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5945 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5946
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5947 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5948 * Creates a pixmap with given parameters.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5949 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5950 * 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	5951 * 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	5952 * 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	5953 * depth: Color depth of the pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5954 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5955 * 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	5956 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5957 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	5958 {
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	5959 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5960
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	5961 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	5962 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	5963 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	5964 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	5965 pixmap->handle = handle;
920 f47d5fa72f84 Fixed a clang warning. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 919 diff changeset	5966 pixmap->image = [[NSBitmapImageRep alloc]
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	5967 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	5968 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	5969 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	5970 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	5971 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	5972 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	5973 isPlanar:NO
911 1ac9669caf86 Pick a better colorspace for new pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 910 diff changeset	5974 colorSpaceName:NSDeviceRGBColorSpace
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	5975 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	5976 bitsPerPixel: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	5977 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5978 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5979
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5980 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5981 * Creates a pixmap from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5982 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5983 * 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	5984 * 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	5985 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5986 * (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	5987 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5988 * 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	5989 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5990 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	5991 {
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	5992 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5993
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	5994 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	5995 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	5996 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	5997 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	5998 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	5999 {
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	6000 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	6001 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	6002 }
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	6003 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	6004 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	6005 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	6006 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	6007 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	6008 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6009 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6010
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 * Creates a pixmap from memory.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6013 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6014 * 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	6015 * data: Source of the image data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6016 * (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	6017 * le: length of data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6018 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 * 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	6020 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6021 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	6022 {
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	6023 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6024
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	6025 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	6026 return NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6027 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	6028 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	6029 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	6030 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	6031 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	6032 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	6033 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	6034 return pixmap;
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 /*
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	6038 * 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	6039 * 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	6040 * 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	6041 * 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	6042 * 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	6043 * 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	6044 * is handled automatically
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6045 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6046 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	6047 {
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	6048 /* Don't do anything */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6049 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6050
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6051 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6052 * 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	6053 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6054 * 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	6055 * 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	6056 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6057 * 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	6058 */
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	6059 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	6060 {
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	6061 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6062
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	6063 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	6064 return NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6065
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	6066 NSBundle *bundle = [NSBundle mainBundle];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	6067 NSString *respath = [bundle resourcePath];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6068 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	6069 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	6070 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	6071 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	6072 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	6073 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	6074 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	6075 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6076 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6079 * Destroys an allocated pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6080 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6081 * 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	6082 * dw_pixmap_new..
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 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	6085 {
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	6086 NSBitmapImageRep image = (NSBitmapImageRep )pixmap->image;
918 6b400a0f5f70 Revering the dw_pixmap_destroy() dealloc/release change on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 917 diff changeset	6087 [image release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6088 free(pixmap);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6089 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6090
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6091 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6092 * Copies from one item to another.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6093 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6094 * dest: Destination window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6095 * destp: Destination pixmap. (choose only one).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6096 * xdest: X coordinate of destination.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6097 * ydest: Y coordinate of destination.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6098 * width: Width of area to copy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6099 * height: Height of area to copy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6100 * src: Source window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6101 * srcp: Source pixmap. (choose only one).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6102 * xsrc: X coordinate of source.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6103 * ysrc: Y coordinate of source.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6104 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6105 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	6106 {
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	6107 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	6108 NSValue* bi = [NSValue valueWithPointer:bltinfo];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6109
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	6110 /* 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	6111 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	6112 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	6113 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	6114 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	6115 bltinfo->width = width;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6116 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	6117 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	6118 bltinfo->ysrc = ysrc;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6119
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	6120 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	6121 {
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	6122 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	6123 }
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	6124 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	6125 {
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	6126 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	6127 [object retain];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6128 }
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	6129 [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	6130 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6131
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6132 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6133 * 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	6134 * Not available under OS/2, eCS
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6135 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6136 * 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	6137 * 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	6138 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6139 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	6140 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6141 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	6142 [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	6143 [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	6144 [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	6145 [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	6146 return calendar;
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 * 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	6151 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6152 * 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	6153 * year...
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6154 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6155 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	6156 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6157 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	6158 NSDate *date;
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6159 char buffer[100];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6160
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6161 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	6162
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6163 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	6164 [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	6165 [date release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6166 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6169 * 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	6170 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6171 * 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	6172 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6173 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	6174 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	6175 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	6176 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	6177 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	6178 [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	6179 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	6180 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	6181 if(*year < 70)
d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6182 {
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6183 *year += 2000;
730 d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6184 }
d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6185 else if(*year < 100)
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6186 {
730 d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6187 *year += 1900;
d3fb3613726a Calendar control should return years with 4 digits not 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 729 diff changeset	6188 }
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	6189 [df release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6190 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6191
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6192 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6193 * 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	6194 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6195 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6196 * 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	6197 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6198 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	6199 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6200 WebView *html = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6201 switch(action)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6202 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6203 case DW_HTML_GOBACK:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6204 [html goBack];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6205 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6206 case DW_HTML_GOFORWARD:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6207 [html goForward];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6208 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6209 case DW_HTML_GOHOME:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6210 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6211 case DW_HTML_SEARCH:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6212 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6213 case DW_HTML_RELOAD:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6214 [html reload:html];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6215 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6216 case DW_HTML_STOP:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6217 [html stopLoading:html];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6218 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6219 case DW_HTML_PRINT:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6220 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6221 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6222 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6223
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6224 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6225 * 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	6226 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6227 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6228 * 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	6229 * be rendered.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6230 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6231 * 0 on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6232 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6233 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	6234 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6235 WebView *html = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6236 [[html mainFrame] loadHTMLString:[ NSString stringWithUTF8String:string ] baseURL:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6237 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6238 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6239
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6240 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6241 * 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	6242 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6243 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6244 * 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	6245 * file object to be rendered.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6246 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6247 * 0 on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6248 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6249 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	6250 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6251 WebView *html = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6252 [[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	6253 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6254 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6255
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6256 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6257 * 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	6258 * Not available under OS/2, eCS
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6259 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6260 * 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	6261 * 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	6262 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6263 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	6264 {
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	6265 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	6266 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6267 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	6268 /* [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	6269 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6270 return web;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6271 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6272
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6273 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6274 * 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	6275 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6276 * 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	6277 * 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	6278 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6279 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	6280 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6281 NSPoint mouseLoc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6282 mouseLoc = [NSEvent mouseLocation];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6283 if(x)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6284 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6285 *x = mouseLoc.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6286 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6287 if(y)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6288 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6289 *y = mouseLoc.y;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6290 }
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6293 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6294 * 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	6295 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6296 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6297 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6298 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6299 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	6300 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6301 /* 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	6302 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6303
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6304 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6305 * 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	6306 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6307 * 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	6308 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6309 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6310 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	6311 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6312 NSMenu *menu = [[[NSMenu alloc] init] autorelease];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6313 [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	6314 /* [menu setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6315 return menu;
650 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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6319 * Create a menubar on a window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6320 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6321 * 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	6322 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6323 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	6324 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6325 NSWindow *window = location;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6326 NSMenu *windowmenu = _generate_main_menu();
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6327 [[window contentView] setMenu:windowmenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6328 return (HMENUI)windowmenu;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6329 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6330
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6331 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6332 * 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	6333 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6334 * menu: Handle of a menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6335 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6336 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	6337 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6338 NSMenu thismenu = menu;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6339 [thismenu release];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6340 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6341
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6342 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6343 * 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	6344 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6345 * 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	6346 * 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	6347 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6348 * y: Y coordinate.
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 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	6351 {
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	6352 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	6353 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	6354 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	6355 NSWindow *window = [view window];
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	6356 NSEvent *event = [DWApp currentEvent];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6357 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	6358 location:[window convertScreenToBase:NSMakePoint(x, y)]
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6359 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	6360 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	6361 windowNumber:[window windowNumber]
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6362 context:[NSGraphicsContext currentContext]
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6363 eventNumber:1
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6364 clickCount:1
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6365 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	6366 [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	6367 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6368
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6369 char _removetilde(char dest, char src)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6370 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6371 int z, cur=0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6372 char accel = '\0';
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6373
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6374 for(z=0;z<strlen(src);z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6375 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6376 if(src[z] != '~')
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6377 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6378 dest[cur] = src[z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6379 cur++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6380 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6381 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6382 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6383 accel = src[z+1];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6384 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6385 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6386 dest[cur] = 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6387 return accel;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6388 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6389
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6390 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6391 * 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	6392 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6393 * 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	6394 * 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	6395 * 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	6396 * 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	6397 * 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	6398 * 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	6399 * 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	6400 * 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	6401 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	6402 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	6403 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6404 NSMenu *menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6405 NSMenu *submenu = submenux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6406 NSMenuItem *item = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6407 if(strlen(title) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6408 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6409 [menu addItem:[NSMenuItem separatorItem]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6410 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6411 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6412 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6413 char accel[2];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6414 char *newtitle = malloc(strlen(title)+1);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6415 NSString *nstr;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6416
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6417 accel[0] = _removetilde(newtitle, title);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6418 accel[1] = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6419
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6420 nstr = [ NSString stringWithUTF8String:newtitle ];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6421 free(newtitle);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6422
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6423 item = [menu addItemWithTitle: nstr
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6424 action:@selector(menuHandler:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6425 keyEquivalent:[ NSString stringWithUTF8String:accel ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6426 [item setTag:itemid];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6427 if(flags & DW_MIS_CHECKED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6428 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6429 [item setState:NSOnState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6430 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6431 if(flags & DW_MIS_DISABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6432 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6433 [item setEnabled:NO];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6434 }
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6435
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6436 if(submenux)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6437 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6438 [submenu setTitle:nstr];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6439 [menu setSubmenu:submenu forItem:item];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6440 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6441 return item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6442 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6443 return item;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6444 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6445
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6446 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6447 * 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	6448 * 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	6449 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6450 * 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	6451 * id: Menuitem id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6452 * 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	6453 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	6454 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	6455 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6456 id menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6457 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	6458
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6459 if(menuitem != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6460 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6461 if(check)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6462 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6463 [menuitem setState:NSOnState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6464 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6465 else
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6466 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6467 [menuitem setState:NSOffState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6468 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6469 }
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6472 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6473 * 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	6474 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6475 * 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	6476 * id: Menuitem id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6477 * 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	6478 * DW_MIS_CHECKED/DW_MIS_UNCHECKED
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6479 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	6480 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	6481 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6482 id menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6483 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	6484
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6485 if(menuitem != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6486 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6487 if(state & DW_MIS_CHECKED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6488 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6489 [menuitem setState:NSOnState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6490 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6491 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	6492 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6493 [menuitem setState:NSOffState];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6494 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6495 if(state & DW_MIS_ENABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6496 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6497 [menuitem setEnabled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6498 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6499 else if(state & DW_MIS_DISABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6500 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6501 [menuitem setEnabled:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6502 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6503 }
650 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
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	6506 /* 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	6507 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	6508 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6509 NSArray *pages = [notebook tabViewItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6510 for(DWNotebookPage *notepage in pages)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6511 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6512 if([notepage pageid] == pageid)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6513 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6514 return notepage;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6515 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6516 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6517 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	6518 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	6519
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6520 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6521 * 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	6522 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6523 * 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	6524 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6525 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6526 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	6527 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6528 DWNotebook *notebook = [[DWNotebook alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6529 [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	6530 /* [notebook setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6531 return notebook;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6532 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6533
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6534 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6535 * 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	6536 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6537 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6538 * flags: Any additional page creation flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6539 * 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	6540 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6541 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	6542 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6543 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6544 NSInteger page = [notebook pageid];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6545 DWNotebookPage *notepage = [[DWNotebookPage alloc] initWithIdentifier:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6546 [notepage setPageid:(NSInteger)page];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6547 if(front)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6548 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6549 [notebook insertTabViewItem:notepage atIndex:(NSInteger)0];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6550 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6551 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6552 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6553 [notebook addTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6554 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6555 [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	6556 [notepage release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6557 return (unsigned long)page;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6558 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6559
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6560 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6561 * Remove a page from a notebook.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6562 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6563 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6564 * 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	6565 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6566 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	6567 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6568 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6569 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	6570
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6571 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6572 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6573 [notebook removeTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6574 [notepage release];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6575 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6576 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6577
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6578 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6579 * Queries the currently visible page ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6580 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6581 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6582 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6583 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	6584 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6585 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6586 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6587 return [notepage pageid];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6588 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6589
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6590 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6591 * Sets the currently visibale page ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6592 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6593 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6594 * 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	6595 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6596 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	6597 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6598 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6599 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	6600
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6601 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6602 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6603 [notebook selectTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6604 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6605 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6606
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6607 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6608 * 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	6609 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6610 * handle: Notebook handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6611 * 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	6612 * 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	6613 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6614 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	6615 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6616 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6617 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	6618
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6619 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6620 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6621 [notepage setLabel:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6622 }
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 * 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	6627 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6628 * handle: Notebook handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6629 * 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	6630 * 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	6631 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6632 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	6633 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6634 /* Note supported here... do nothing */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6635 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6636
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6637 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6638 * 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	6639 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6640 * 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	6641 * 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	6642 * page: Box handle to be packed.
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 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	6645 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6646 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6647 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	6648
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6649 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6650 {
667 28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	6651 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	6652 DWBox *box = tmpbox;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6653
667 28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	6654 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	6655 [notepage setView:box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6656 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6657 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6658
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6659 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6660 * Create a new Window Frame.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6661 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6662 * 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	6663 * title: The Window title.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6664 * 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	6665 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6666 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	6667 {
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	6668 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	6669 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	6670 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	6671 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	6672 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	6673 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	6674 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	6675 defer:false];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6676
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6677 [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	6678
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6679 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	6680
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6681 [window setContentView:view];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6682 [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	6683 [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	6684 [view release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6685
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	6686 /* 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	6687 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	6688 {
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6689 id object = hwndOwner;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6690
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	6691 /* 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	6692 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	6693 {
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6694 /* 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	6695 [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	6696 [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	6697 }
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	6698 }
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	6699 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	6700 return (HWND)window;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6701 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6702
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6703 /*
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6704 * 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	6705 * Parameters:
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6706 * handle: Window handle of the widget.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6707 * function: Function pointer to be called.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6708 * 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	6709 */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6710 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	6711 {
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	6712 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	6713 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	6714 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	6715 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	6716 [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	6717 free(params);
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6718 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6719
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6720
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	6721 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6722 * 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	6723 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6724 * 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	6725 * 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	6726 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6727 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	6728 {
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6729 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6730
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6731 if([ object isKindOfClass:[ NSView class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6732 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6733 NSView *view = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6734
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6735 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	6736 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6737 [view discardCursorRects];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6738 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6739 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	6740 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6741 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	6742 NSCursor *cursor = [NSCursor arrowCursor];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6743
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6744 [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	6745 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	6746 /* 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	6747 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6748 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6749
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6750 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6751 * Makes the window visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6752 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6753 * 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	6754 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6755 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	6756 {
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	6757 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6758
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	6759 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	6760 {
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	6761 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	6762 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	6763 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	6764 {
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	6765 [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	6766 }
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	6767 /* 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	6768 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	6769 {
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	6770 /* 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	6771 [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	6772 }
930 b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	6773 [[window contentView] showWindow];
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	6774 [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	6775 }
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	6776 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6777 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6778
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6779 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6780 * Makes the window invisible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6781 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6782 * 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	6783 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6784 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	6785 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6786 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6787
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6788 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6789 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6790 NSWindow *window = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6791
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6792 [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	6793 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6794 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6795 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6796
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6797 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6798 * 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	6799 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6800 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6801 * 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	6802 * 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	6803 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6804 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	6805 {
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6806 id object = handle;
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6807 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	6808 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	6809 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	6810 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	6811
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	6812 /* 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	6813 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	6814 {
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	6815 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	6816 }
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	6817 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	6818 {
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	6819 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	6820 }
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	6821
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	6822 /* 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	6823 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	6824 {
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	6825 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	6826 }
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	6827 /* 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	6828 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	6829 {
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	6830 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	6831
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	6832 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	6833 {
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	6834 [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	6835 }
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	6836 }
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	6837 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	6838 {
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	6839 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	6840
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	6841 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	6842 {
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	6843 [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	6844 }
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6845 }
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6846 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	6847 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6848 DWBox *box = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6849
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	6850 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	6851 {
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	6852 [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	6853 }
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6854 }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6855 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	6856 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6857 DWContainer *cont = handle;
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6858
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	6859 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	6860 {
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	6861 [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	6862 }
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	6863 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	6864 {
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	6865 [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	6866 }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	6867 }
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	6868 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6869 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6870
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6871 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6872 * 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	6873 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6874 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6875 * 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	6876 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6877 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	6878 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6879 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6880 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6881
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6882 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6883 * 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	6884 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6885 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6886 * width: New width in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6887 * height: New height in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6888 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6889 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	6890 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6891 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6892
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	6893 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	6894 {
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	6895 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	6896 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	6897 int tmp;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6898
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	6899 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	6900 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	6901 tmp \|= style;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6902
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	6903 [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	6904 }
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	6905 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	6906 {
bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	6907 NSTextField *tf = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6908
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	6909 [[tf cell] setAlignment:(style & 0xF)];
931 dfd84cefd80b Minor changes to vertical centering on (status) text fields on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 930 diff changeset	6910 if(mask & DW_DT_VCENTER)
dfd84cefd80b Minor changes to vertical centering on (status) text fields on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 930 diff changeset	6911 {
dfd84cefd80b Minor changes to vertical centering on (status) text fields on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 930 diff changeset	6912 [[tf cell] setVCenter:(style & DW_DT_VCENTER ? YES : NO)];
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	6913 }
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	6914 }
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	6915 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	6916 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6917 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	6918 [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	6919 }
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	6920 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	6921 {
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	6922 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	6923
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	6924 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	6925 {
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	6926 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	6927 {
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	6928 [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	6929 [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	6930 }
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	6931 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	6932 {
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	6933 [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	6934 [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	6935 }
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	6936 }
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	6937 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6938 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6939
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6940 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6941 * 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	6942 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6943 * window: Toplevel window or dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6944 * 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	6945 */
766 82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	6946 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	6947 {
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	6948 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	6949 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	6950
872 13debcad9757 Another test fix at reported crash in dw_window_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 867 diff changeset	6951 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	6952 {
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	6953 [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	6954 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6955 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6956
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6957 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6958 * 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	6959 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6960 * 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	6961 * 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	6962 */
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	6963 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	6964 {
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	6965 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	6966 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	6967
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	6968 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	6969 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	6970 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	6971 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	6972 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	6973
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	6974 [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	6975 }
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	6976 }
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	6977 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	6978 {
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	6979 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	6980 {
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	6981 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	6982 }
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	6983 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	6984 {
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	6985 /* 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	6986 * 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	6987 */
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	6988 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	6989 }
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	6990 [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	6991 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6992 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6993
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6994 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6995 * 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	6996 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6997 * handle: Handle to receive mouse input.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6998 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6999 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	7000 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7001 id object = handle;
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	7002 id window = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7003
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	7004 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	7005 {
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	7006 window = [object window];
ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	7007 }
ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	7008 if(window)
ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	7009 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7010 _DWCapture = object;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7011 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7012 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7013
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7014 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7015 * Releases previous mouse capture.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7016 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7017 void API dw_window_release(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7018 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7019 if(_DWCapture)
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7020 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7021 _DWCapture = nil;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7022 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7023 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7024
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7025 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7026 * 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	7027 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7028 * handle: The window handle to destroy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7029 * 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	7030 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7031 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	7032 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7033 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7034
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	7035 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	7036 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7037 /* 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	7038 * 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	7039 * 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	7040 */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7041 NSWindow *window = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7042
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7043 /* 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	7044 if(newparent)
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7045 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7046 object = newparent;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7047
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7048 /* 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	7049 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	7050 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7051 /* 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	7052 [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	7053 [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	7054 return;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7055 }
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7056 }
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	7057 /* 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	7058 [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	7059 [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	7060 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7061 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7062
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7063 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	7064 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7065 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	7066 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	7067 NSFont *font = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7068
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7069 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	7070 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7071 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	7072 *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	7073 name++;
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7074 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	7075 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7076 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	7077 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	7078 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 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 * 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	7082 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7083 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7084 * 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	7085 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7086 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	7087 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7088 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	7089
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7090 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	7091 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7092 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	7093 if([object window])
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	7094 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7095 [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	7096 [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	7097 [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	7098 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7099 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	7100 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	7101 [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	7102 [[object cell] setFont:font];
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	7103 }
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	7104 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	7105 {
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	7106 DWRender *render = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7107
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	7108 [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	7109 }
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	7110 }
bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	7111 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7112 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7113
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7114 /*
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7115 * Returns the current font for the specified window
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7116 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7117 * 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	7118 */
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7119 char * API dw_window_get_font(HWND handle)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7120 {
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	7121 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7122
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	7123 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	7124 {
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	7125 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	7126 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	7127 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	7128 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	7129 }
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	7130 return NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7131 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7132
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7133 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7134 * 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	7135 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7136 * handle: The window handle to destroy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7137 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7138 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	7139 {
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	7140 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	7141 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7142 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7143
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7144 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7145 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7146 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7147 [window close];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7148 }
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	7149 DW_MUTEX_UNLOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7150 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7151 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7152
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7153 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7154 * 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	7155 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7156 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7157 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7158 * 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	7159 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7160 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	7161 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7162 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7163
808 c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7164 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	7165 {
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7166 id window = handle;
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7167 NSString *nsstr = [ window title];
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7168
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7169 return strdup([ nsstr UTF8String ]);
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7170 }
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	7171 else if([ object isKindOfClass:[ NSControl class ] ])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7172 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7173 NSControl *control = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7174 NSString *nsstr = [ control stringValue];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7175
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7176 return strdup([ nsstr UTF8String ]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7177 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7178 return NULL;
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 * 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	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 window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7185 * 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	7186 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7187 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	7188 {
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	7189 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	7190 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7191 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7192
807 f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7193 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	7194 {
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7195 id window = handle;
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7196 [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	7197 }
f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	7198 else if([ object isKindOfClass:[ NSControl class ] ])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7199 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7200 NSControl *control = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7201 [control setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7202 }
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	7203 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7204 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7205
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7206 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7207 * Disables given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7208 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7209 * handle: Handle to the window.
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 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	7212 {
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	7213 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	7214
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	7215 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	7216 {
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	7217 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	7218 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	7219 }
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	7220 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	7221 {
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	7222 NSControl *control = object;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7223 [control setEnabled:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7224 }
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	7225 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	7226 {
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	7227 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	7228
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	7229 [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	7230 }
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 * Enables given window (widget).
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: Handle to the window.
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 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	7239 {
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	7240 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	7241
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	7242 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	7243 {
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	7244 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	7245 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	7246 }
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	7247 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	7248 {
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	7249 NSControl *control = object;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7250 [control setEnabled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7251 }
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	7252 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	7253 {
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	7254 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	7255
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	7256 [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	7257 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7258 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7259
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7260 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7261 * 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	7262 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7263 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7264 * 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	7265 * (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	7266 * 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	7267 * 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	7268 * 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	7269 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	7270 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	7271 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7272 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7273 if([ object isKindOfClass:[ NSImageView class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7274 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7275 NSImageView *iv = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7276 NSData *thisdata = [NSData dataWithBytes:data length:len];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7277 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	7278
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	7279 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	7280 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7281 [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	7282 }
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	7283 [pixmap release];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7284 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7285 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7286
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7287 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7288 * 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	7289 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7290 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7291 * 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	7292 * (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	7293 * 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	7294 * 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	7295 * 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	7296 */
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	7297 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	7298 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7299 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7300 if([ object isKindOfClass:[ NSImageView class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7301 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7302 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	7303 NSImage *bitmap = nil;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7304
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	7305 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	7306 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7307 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	7308 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7309 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	7310 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7311 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	7312 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7313
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	7314 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	7315 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7316 [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	7317 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7318 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7319 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7320
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7321 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7322 * 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	7323 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7324 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7325 * 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	7326 */
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	7327 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	7328 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7329 /* 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	7330 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7331
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7332 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7333 * 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	7334 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7335 * handle: Handle to the parent window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7336 * id: Integer ID of the child.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7337 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	7338 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	7339 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7340 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7341 NSView *view = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7342 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7343 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7344 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7345 view = [window contentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7346 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7347 return [view viewWithTag:cid];
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7350 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7351 * 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	7352 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7353 * handle: The window handle to minimize.
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 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	7356 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7357 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7358 [window miniaturize:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7359 return 0;
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 /* 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	7363 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7364 * 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	7365 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7366 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	7367 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7368 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7369 [window flushWindow];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7370 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7371
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7372 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7373 * Makes the window topmost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7374 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7375 * 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	7376 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7377 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	7378 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7379 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7380 [window orderFront:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7381 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7382 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7383
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 * Makes the window bottommost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7386 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7387 * 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	7388 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7389 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	7390 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7391 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7392 [window orderBack:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7393 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7394 }
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 * 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	7398 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7399 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7400 * width: New width in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7401 * height: New height in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7402 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7403 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	7404 {
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	7405 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	7406 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7407 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7408 NSSize size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7409 size.width = width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7410 size.height = height;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7411
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7412 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7413 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7414 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7415 [window setContentSize:size];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7416 }
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	7417 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7418 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7419
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7420 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7421 * 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	7422 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7423 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7424 * 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	7425 * 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	7426 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7427 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	7428 {
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	7429 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	7430 DW_MUTEX_LOCK;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7431 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7432 NSPoint point;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7433 point.x = x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7434 point.y = y;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7435
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7436 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7437 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7438 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7439 [window setFrameOrigin:point];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7440 }
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	7441 DW_MUTEX_UNLOCK;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7442 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7443
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7444 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7445 * 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	7446 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7447 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7448 * 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	7449 * 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	7450 * width: Width of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7451 * height: Height of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7452 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7453 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	7454 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7455 dw_window_set_pos(handle, x, y);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7456 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	7457 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7458
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7459 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7460 * 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	7461 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7462 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7463 * 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	7464 * 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	7465 * width: Width of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7466 * height: Height of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7468 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	7469 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7470 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7471
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7472 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7473 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7474 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7475 NSRect rect = [window frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7476 if(x)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7477 *x = rect.origin.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7478 if(y)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7479 *y = rect.origin.y;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7480 if(width)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7481 *width = rect.size.width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7482 if(height)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7483 *height = rect.size.height;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7484 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7485 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7486 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7487
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7488 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7489 * Returns the width of the screen.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7490 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7491 int API dw_screen_width(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7492 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7493 NSRect screenRect = [[NSScreen mainScreen] frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7494 return screenRect.size.width;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7495 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7496
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7497 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7498 * Returns the height of the screen.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7499 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7500 int API dw_screen_height(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7501 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7502 NSRect screenRect = [[NSScreen mainScreen] frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7503 return screenRect.size.height;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7504 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7505
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7506 /* 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	7507 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	7508 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7509 NSWindowDepth screenDepth = [[NSScreen mainScreen] depth];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7510 return NSBitsPerPixelFromDepth(screenDepth);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7511 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7512
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7513 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7514 * 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	7515 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7516 * env: Pointer to a DWEnv struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7517 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7518 void dw_environment_query(DWEnv *env)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7519 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7520 struct utsname name;
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 uname(&name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7523 strcpy(env->osName, "MacOS");
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7524
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7525 strcpy(env->buildDate, __DATE__);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7526 strcpy(env->buildTime, __TIME__);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7527 env->DWMajorVersion = DW_MAJOR_VERSION;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7528 env->DWMinorVersion = DW_MINOR_VERSION;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7529 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	7530
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	7531 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	7532 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	7533 env->MajorBuild = DWOSBuild;
809 1ef0f4c03c14 MinorBuild was being left uninitialized. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 808 diff changeset	7534 env->MinorBuild = 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7535 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7536
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7537 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7538 * Emits a beep.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7539 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7540 * freq: Frequency.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7541 * dur: Duration.
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 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	7544 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7545 NSBeep();
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7546 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7547
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7548 /* 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	7549 * anything you have drawn is visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7550 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7551 void API dw_flush(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7552 {
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	7553 /* 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	7554 [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	7555 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7556
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7557 /* 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	7558 * 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	7559 * dw_window_get_data().
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7560 */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7561 UserData _find_userdata(UserData root, char varname)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7562 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7563 UserData tmp = root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7564
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7565 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7566 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7567 if(strcasecmp(tmp->varname, varname) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7568 return tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7569 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7570 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7571 return NULL;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7572 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7573
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7574 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	7575 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7576 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	7577
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7578 if(new)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7579 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7580 new->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7581 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7582 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7583 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7584 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7585 new = malloc(sizeof(UserData));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7586 if(new)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7587 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7588 new->varname = strdup(varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7589 new->data = data;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7590
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7591 new->next = NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7592
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7593 if (!*root)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7594 *root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7595 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7596 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7597 UserData prev = NULL, tmp = *root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7598 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7599 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7600 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7601 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7602 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7603 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7604 prev->next = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7605 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7606 *root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7607 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7608 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7609 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7610 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7611 return FALSE;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7612 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7613
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7614 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	7615 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7616 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	7617
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7618 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7619 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7620 if(all \|\| strcasecmp(tmp->varname, varname) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7621 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7622 if(!prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7623 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7624 *root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7625 free(tmp->varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7626 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7627 if(!all)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7628 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7629 tmp = *root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7630 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7631 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7632 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7633 /* If all is true we should
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7634 * never get here.
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 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7637 free(tmp->varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7638 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7639 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7640 }
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 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7643 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7644 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7645 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7646 }
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 return 0;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7649 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	7650
650 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 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	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 * 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	7656 * 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	7657 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7658 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	7659 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7660 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	7661 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	7662 {
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7663 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	7664 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	7665 }
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7666 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	7667 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7668 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	7669 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	7670 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7671 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	7672
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7673 if(!blah)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7674 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7675 if(!dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7676 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7677
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7678 blah = calloc(1, sizeof(WindowData));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7679 [object setUserdata:blah];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7680 }
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(data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7683 _new_userdata(&(blah->root), dataname, data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7684 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7685 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7686 if(dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7687 _remove_userdata(&(blah->root), dataname, FALSE);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7688 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7689 _remove_userdata(&(blah->root), NULL, TRUE);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7690 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7691 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7692
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7693 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7694 * 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	7695 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7696 * 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	7697 * 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	7698 * 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	7699 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7700 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	7701 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7702 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	7703 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	7704 {
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7705 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	7706 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	7707 }
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	7708 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	7709 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	7710 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	7711 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	7712 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7713 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	7714
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7715 if(blah && blah->root && dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7716 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7717 UserData *ud = _find_userdata(&(blah->root), dataname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7718 if(ud)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7719 return ud->data;
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 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7723
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	7724 #define DW_TIMER_MAX 64
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	7725 NSTimer *DWTimers[DW_TIMER_MAX];
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	7726
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7727 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7728 * 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	7729 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7730 * interval: Milliseconds to delay between calls.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7731 * 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	7732 * 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	7733 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7734 * 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	7735 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7736 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	7737 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7738 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7739
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7740 for(z=0;z<DW_TIMER_MAX;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7741 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7742 if(!DWTimers[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7743 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7744 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7745 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7746 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7747
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7748 if(sigfunc && !DWTimers[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7749 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7750 NSTimeInterval seconds = (double)interval / 1000.0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7751 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	7752 _new_signal(0, thistimer, z+1, sigfunc, data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7753 return z+1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7754 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7755 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7756 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7757
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7758 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7759 * Removes timer callback.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7760 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7761 * 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	7762 */
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	7763 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	7764 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7765 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7766 NSTimer *thistimer;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7767
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7768 /* 0 is an invalid timer ID */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7769 if(timerid < 1 \|\| !DWTimers[timerid-1])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7770 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7771
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7772 thistimer = DWTimers[timerid-1];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7773 DWTimers[timerid-1] = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7774
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7775 [thistimer invalidate];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7776
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7777 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7778 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7779 if(tmp->id == timerid && tmp->window == thistimer)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7780 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7781 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7782 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7783 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7784 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7785 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7786 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7787 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7788 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7789 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7790 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7791 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7792 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7793 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7794 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7795 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7796 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7797 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7798 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7799 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7800 }
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 * 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	7804 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7805 * 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	7806 * 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	7807 * 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	7808 * 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	7809 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7810 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	7811 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7812 ULONG message = 0, msgid = 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7813
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7814 if(window && signame && sigfunc)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7815 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7816 if((message = _findsigmessage(signame)) != 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7817 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7818 _new_signal(message, window, (int)msgid, sigfunc, data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7819 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7820 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7821 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7824 * 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	7825 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7826 * 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	7827 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7828 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	7829 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7830 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7831 ULONG message;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7832
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7833 if(!window \|\| !signame \|\| (message = _findsigmessage(signame)) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7834 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7835
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7836 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7837 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7838 if(tmp->window == window && tmp->message == message)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7839 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7840 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7841 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7842 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7843 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7844 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7845 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7846 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7847 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7848 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7849 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7850 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7851 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7852 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7853 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7854 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7855 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7856 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7857 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7858 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7859 }
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 * 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	7863 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7864 * 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	7865 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7866 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	7867 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7868 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	7869
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7870 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7871 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7872 if(tmp->window == window)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7873 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7874 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7875 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7876 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7877 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7878 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7879 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7880 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7881 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7882 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7883 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7884 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7885 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7886 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7887 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7888 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7889 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7890 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7891 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7892 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7893 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7894
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7895 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7896 * 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	7897 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7898 * 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	7899 * 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	7900 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7901 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	7902 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7903 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	7904
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7905 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7906 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7907 if(tmp->window == window && tmp->data == data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7908 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7909 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7910 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7911 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7912 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7913 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7914 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7915 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7916 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7917 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7918 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7919 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7920 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7921 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7922 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7923 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7924 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7925 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7926 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7927 }
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7930 void _my_strlwr(char *buf)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7931 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7932 int z, len = strlen(buf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7933
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7934 for(z=0;z<len;z++)
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 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	7937 buf[z] -= 'A' - 'a';
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7938 }
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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7941 /* 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	7942 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7943 * 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	7944 * handle: Pointer to a module handle,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7945 * 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	7946 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7947 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	7948 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7949 int len;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7950 char *newname;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7951 char errorbuf[1024];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7952
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7954 if(!handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7955 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7956
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7957 if((len = strlen(name)) == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7958 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7959
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7960 /* Lenth + "lib" + ".dylib" + NULL */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7961 newname = malloc(len + 10);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7962
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7963 if(!newname)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7964 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7965
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7966 sprintf(newname, "lib%s.dylib", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7967 _my_strlwr(newname);
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 *handle = dlopen(newname, RTLD_NOW);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7970 if(*handle == NULL)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7971 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7972 strncpy(errorbuf, dlerror(), 1024);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7973 printf("%s\n", errorbuf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7974 sprintf(newname, "lib%s.dylib", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975 *handle = dlopen(newname, RTLD_NOW);
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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7978 free(newname);
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 return (NULL == *handle) ? -1 : 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7981 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7982
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7983 /* 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	7984 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7985 * 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	7986 * 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	7987 * 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	7988 * the address.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7989 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7990 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	7991 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 if(!func \|\| !name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7993 return -1;
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 if(strlen(name) == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7996 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7997
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7998 func = (void)dlsym(handle, name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7999 return (NULL == *func);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8000 }
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 /* Frees the shared library previously opened.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8003 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8004 * 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	8005 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8006 int dw_module_close(HMOD handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8007 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8008 if(handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8009 return dlclose(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8010 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8011 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8012
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8013 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8014 * 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	8015 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8016 HMTX dw_mutex_new(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8017 {
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	8018 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	8019
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	8020 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	8021 return mutex;
650 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
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 * 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	8026 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8027 * 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	8028 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8029 void dw_mutex_close(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8030 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8031 if(mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8032 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 pthread_mutex_destroy(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8034 free(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8035 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8039 * 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	8040 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8041 * 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	8042 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8043 void dw_mutex_lock(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8044 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	8045 /* 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	8046 * 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	8047 * 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	8048 * 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	8049 */
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	8050 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	8051 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	8052 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	8053 {
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	8054 /* 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	8055 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	8056 {
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	8057 /* 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	8058 }
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	8059 }
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	8060 }
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	8061 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	8062 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	8063 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	8064 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8065 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8066
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 * Reliquishes the access to the semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8069 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8070 * 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	8071 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8072 void dw_mutex_unlock(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8073 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8074 pthread_mutex_unlock(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8076
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 * 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	8079 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8080 HEV dw_event_new(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8081 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8082 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	8083
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8084 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8085 return NULL;
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 /* 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	8088 * 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	8089 * 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	8090 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8091 pthread_mutex_init (&(eve->mutex), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8092 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8093 pthread_cond_init (&(eve->event), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8094
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8095 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8096 eve->alive = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8097 eve->posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8098
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8099 return eve;
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
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 * 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	8104 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8105 * 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	8106 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8107 int dw_event_reset (HEV eve)
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 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110 return FALSE;
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 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8113 pthread_cond_broadcast (&(eve->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8114 pthread_cond_init (&(eve->event), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8115 eve->posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8116 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8117 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8118 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8119
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8121 * 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	8122 * 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	8123 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8124 * 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	8125 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8126 int dw_event_post (HEV eve)
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 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8129 return FALSE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8130
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8131 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8132 pthread_cond_broadcast (&(eve->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8133 eve->posted = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8134 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8135 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8136 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8139 * 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	8140 * 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	8141 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8142 * 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	8143 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8144 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	8145 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8146 int rc;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8147 struct timeval now;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8148 struct timespec timeo;
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 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8151 return FALSE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8152
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8153 if(eve->posted)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8154 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8155
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8156 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8157 gettimeofday(&now, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8158 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	8159 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	8160 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	8161 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8162 if(!rc)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8163 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8164 if(rc == ETIMEDOUT)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8165 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8166 return 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
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 * 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	8171 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8172 * 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	8173 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8174 int dw_event_close(HEV *eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8175 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8176 if(!eve \|\| !(*eve))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8177 return FALSE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8178
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8179 pthread_mutex_lock (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8180 pthread_cond_destroy (&((*eve)->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8181 pthread_mutex_unlock (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8182 pthread_mutex_destroy (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8183 free(*eve);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8184 *eve = NULL;
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 return TRUE;
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 struct _seminfo {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8190 int fd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 int waiting;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8192 };
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8193
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8194 static void _handle_sem(int *tmpsock)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8195 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8196 fd_set rd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8197 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	8198 int listenfd = tmpsock[0];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8199 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	8200 char command;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8201 sigset_t mask;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8202
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8203 sigfillset(&mask); /* Mask all allowed signals */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8204 pthread_sigmask(SIG_BLOCK, &mask, NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8205
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8206 /* problems */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8207 if(tmpsock[1] == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8208 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8209 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8210 return;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8211 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8212
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8213 array[0].fd = tmpsock[1];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8214 array[0].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8215
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8216 /* 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	8217 free(tmpsock);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8218
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8219 while(1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8220 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8221 FD_ZERO(&rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8222 FD_SET(listenfd, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8223
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8224 maxfd = listenfd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8225
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8226 /* 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	8227 for(z=0;z<connectcount;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8228 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8229 if(array[z].fd > maxfd)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8230 maxfd = array[z].fd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8231
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8232 FD_SET(array[z].fd, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8233 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8234
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8235 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	8236 return;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8237
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8238 if(FD_ISSET(listenfd, &rd))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8239 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8240 struct _seminfo *newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8241 int newfd = accept(listenfd, 0, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8242
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8243 if(newfd > -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8244 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8245 /* Add new connections to the set */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8246 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	8247 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	8248
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8249 newarray[connectcount].fd = newfd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8250 newarray[connectcount].waiting = 0;
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 connectcount++;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8253
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8254 /* Replace old array with new one */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8256 array = newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8257 }
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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8260 /* 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	8261 for(z=0;z<connectcount;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8262 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8263 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	8264 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8265 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	8266 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8267 struct _seminfo *newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8268
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8269 /* Remove this connection from the set */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8270 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	8271 if(!z)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8272 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	8273 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8274 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8275 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	8276 if(z!=(connectcount-1))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8277 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	8278 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8279 connectcount--;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8280
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8281 /* Replace old array with new one */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8282 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8283 array = newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8284 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8285 else if(bytesread == 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8286 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 switch(command)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8288 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8289 case 0:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8290 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8291 /* Reset */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8292 posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8293 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8294 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8295 case 1:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8296 /* Post */
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 int s;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8299 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8300
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8301 posted = 1;
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 for(s=0;s<connectcount;s++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8304 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8305 /* The semaphore has been posted so
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8306 * 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	8307 * continue.
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 if(array[s].waiting)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310 write(array[s].fd, &tmp, 1);
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 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8313 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314 case 2:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8315 /* Wait */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8316 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8317 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8318
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8319 array[z].waiting = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8320
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8321 /* If we are posted exit immeditately */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8322 if(posted)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8323 write(array[z].fd, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8324 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8325 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8326 case 3:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8328 /* Done Waiting */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8329 array[z].waiting = 0;
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 break;
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 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8335 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8336
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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8339 }
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 /* 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	8342 /* 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	8343 * opened from other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8344 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8345 * 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	8346 * 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	8347 * by other processes.
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 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	8350 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8351 struct sockaddr_un un;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8352 int ev, tmpsock = (int )malloc(sizeof(int)*2);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8353 HEV eve;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8354 DWTID dwthread;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8355
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8356 if(!tmpsock)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8357 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8358
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8359 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8360
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8361 if(!eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8362 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8363 free(tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8364 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8365 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8366
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8367 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8368 ev = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8369 memset(&un, 0, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8370 un.sun_family=AF_UNIX;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8371 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8372 strcpy(un.sun_path, "/tmp/.dw/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8373 strcat(un.sun_path, name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8374
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8375 /* just to be safe, this should be changed
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8376 * to support multiple instances.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8377 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8378 remove(un.sun_path);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8379
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8380 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8381 listen(tmpsock[0], 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8382 connect(ev, (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8383 tmpsock[1] = accept(tmpsock[0], 0, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8384
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8385 if(tmpsock[0] < 0 \|\| tmpsock[1] < 0 \|\| ev < 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8386 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8387 if(tmpsock[0] > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8388 close(tmpsock[0]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8389 if(tmpsock[1] > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8390 close(tmpsock[1]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8391 if(ev > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8392 close(ev);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8393 free(tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8394 free(eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8395 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8396 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8397
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8398 /* Create a thread to handle this event semaphore */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8399 pthread_create(&dwthread, NULL, (void )_handle_sem, (void )tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8400 eve->alive = ev;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8401 return eve;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8402 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8403
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8404 /* 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	8405 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8406 * 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	8407 * 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	8408 * by other processes.
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 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	8411 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8412 struct sockaddr_un un;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8413 HEV eve;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8414 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8415 if(ev < 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8416 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8417
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8418 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8419
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8420 if(!eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8421 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8422 close(ev);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8423 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8424 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8425
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8426 un.sun_family=AF_UNIX;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8427 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8428 strcpy(un.sun_path, "/tmp/.dw/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8429 strcat(un.sun_path, name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8430 connect(ev, (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8431 eve->alive = ev;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8432 return eve;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8433 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8434
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8435 /* 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	8436 * on this semaphore will block.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8437 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8438 * 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	8439 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8440 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8441 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	8442 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443 /* signal reset */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8444 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8445
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8446 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8447 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8448
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8449 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	8450 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8451 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8452 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8453
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8454 /* 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	8455 * 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	8456 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8457 * 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	8458 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8459 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8460 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	8461 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8462
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8463 /* signal post */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8464 char tmp = (char)1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8465
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8466 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8467 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8468
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8469 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	8470 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8471 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8472 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8473
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8474 /* 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	8475 * 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	8476 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8477 * 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	8478 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8479 * 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	8480 * or -1 if indefinite.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8481 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8482 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	8483 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8484 fd_set rd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8485 struct timeval tv, *useme;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8486 int retval = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8487 char tmp;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8489 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8490 return DW_ERROR_NON_INIT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8491
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8492 /* Set the timout or infinite */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8493 if(timeout == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8494 useme = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8495 else
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8496 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8497 tv.tv_sec = timeout / 1000;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8498 tv.tv_usec = timeout % 1000;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8500 useme = &tv;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8501 }
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 FD_ZERO(&rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8504 FD_SET(eve->alive, &rd);
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 /* Signal wait */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8507 tmp = (char)2;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8508 write(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8509
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8510 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	8511
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8512 /* Signal done waiting. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8513 tmp = (char)3;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8514 write(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8515
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8516 if(retval == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8517 return DW_ERROR_TIMEOUT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8518 else if(retval == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8519 return DW_ERROR_INTERRUPT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8520
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8521 /* 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	8522 * we don't loop endlessly. :)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8523 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8524 read(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8525 return 0;
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 /* 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	8529 * 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	8530 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8531 * 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	8532 * an open or create call.
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 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	8535 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8536 /* Finally close the domain socket,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8537 * cleanup will continue in _handle_sem.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8538 */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8539 if(eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8540 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8541 close(eve->alive);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8542 free(eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8543 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8544 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8545 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8546
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8547 /* 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	8548 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	8549 {
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8550 #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	8551 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	8552 [pool drain];
698 e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	8553 pool = [[NSAutoreleasePool alloc] init];
e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	8554 pthread_setspecific(_dw_pool_key, pool);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8555 #endif
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8556 }
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8557
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8558 /*
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8559 * Setup thread independent pools.
650 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 void _dwthreadstart(void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8562 {
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	8563 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	8564 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	8565 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	8566
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	8567 /* 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	8568 #if !defined(GARBAGE_COLLECT)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8569 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	8570 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	8571 #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	8572 _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	8573
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	8574 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	8575
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	8576 /* 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	8577 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	8578
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	8579 /* 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	8580 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	8581 [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	8582 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	8583 [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	8584 #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	8585 pool = pthread_getspecific(_dw_pool_key);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8586 [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	8587 #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	8588 free(tmp);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8589 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8590
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8591 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	8592 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8593 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	8594 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8595 [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	8596 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8597 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	8598 [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	8599 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	8600
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8601 /*
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8602 * 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	8603 * Parameters:
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8604 * 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	8605 * 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	8606 */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8607 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	8608 {
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	8609 /* 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	8610 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	8611 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	8612 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	8613 /* 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	8614 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	8615 /* 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	8616 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	8617 /* 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	8618 #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	8619 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	8620 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	8621 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	8622 #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	8623 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	8624 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	8625 _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	8626 /* 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	8627 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	8628 [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	8629 [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	8630 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	8631 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	8632 /* 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	8633 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	8634 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	8635 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	8636 /* 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	8637 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	8638 [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	8639 [thread release];
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	8640 [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	8641 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	8642 }
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8643
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8644 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8645 * 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	8646 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8647 * 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	8648 * 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	8649 * 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	8650 * 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	8651 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8652 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	8653 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8654 char namebuf[1024];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8655 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	8656
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8657 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	8658 sprintf(namebuf, "/tmp/.dw/%s", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8659
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8660 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	8661 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8662 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8663 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8664 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8665
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8666 ftruncate(handle->fd, size);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8667
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8668 /* 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	8669 *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	8670
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8671 if(*dest == MAP_FAILED)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8672 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8673 close(handle->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8674 *dest = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8675 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8676 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8677 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8678
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8679 handle->size = size;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8680 handle->sid = getsid(0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8681 handle->path = strdup(namebuf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8682
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8683 return handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8684 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8685
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8686 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8687 * 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	8688 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8689 * 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	8690 * 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	8691 * 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	8692 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8693 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	8694 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8695 char namebuf[1024];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8696 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	8697
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8698 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	8699 sprintf(namebuf, "/tmp/.dw/%s", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8700
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8701 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	8702 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8703 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8704 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8705 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8706
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8707 /* 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	8708 *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	8709
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8710 if(*dest == MAP_FAILED)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8711 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8712 close(handle->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8713 *dest = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8714 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8715 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8716 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8717
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8718 handle->size = size;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8719 handle->sid = -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8720 handle->path = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8721
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8722 return handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8723 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8724
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8725 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8726 * 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	8727 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8728 * 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	8729 * 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	8730 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8731 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	8732 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8733 struct _dw_unix_shm *h = handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8734 int rc = munmap(ptr, h->size);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8735
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8736 close(h->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8737 if(h->path)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8738 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8739 /* 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	8740 * creator of the file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8741 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8742 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	8743 remove(h->path);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8744 free(h->path);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8745 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8746 return rc;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8747 }
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	8748
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8749 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8750 * 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	8751 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8752 * 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	8753 * 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	8754 * 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	8755 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8756 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	8757 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8758 DWTID thread;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8759 void *tmp = malloc(sizeof(void ) * 2);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8760 int rc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8761
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8762 tmp[0] = func;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8763 tmp[1] = data;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8764
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8765 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	8766 if(rc == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8767 return thread;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8768 return (DWTID)-1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8769 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8770
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8771 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8772 * Ends execution of current thread immediately.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8773 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8774 void dw_thread_end(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8775 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8776 pthread_exit(NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8777 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8778
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8779 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8780 * Returns the current thread's ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8781 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8782 DWTID dw_thread_id(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8783 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8784 return (DWTID)pthread_self();
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8785 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8786
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8787 /*
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8788 * 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	8789 * Parameters:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8790 * program: Program name with optional path.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8791 * 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	8792 * 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	8793 * Returns:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8794 * -1 on error.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8795 */
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8796 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	8797 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8798 int ret = -1;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8799
738 52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8800 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	8801 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8802 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	8803 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8804 [[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	8805 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	8806 }
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8807 else
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8808 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8809 [[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	8810 }
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8811 return 0;
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	8812 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8813
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8814 if((ret = fork()) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8815 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8816 int i;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8817
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8818 for (i = 3; i < 256; i++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8819 close(i);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8820 setsid();
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8821
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8822 if(type == DW_EXEC_CON)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8823 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8824 char **tmpargs;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8825
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8826 if(!params)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8827 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8828 tmpargs = malloc(sizeof(char *));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8829 tmpargs[0] = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8830 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8831 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8832 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8833 int z = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8834
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8835 while(params[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8836 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8837 z++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8838 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8839 tmpargs = malloc(sizeof(char )(z+3));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8840 z=0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8841 tmpargs[0] = "xterm";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8842 tmpargs[1] = "-e";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8843 while(params[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8844 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8845 tmpargs[z+2] = params[z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8846 z++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8847 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8848 tmpargs[z+2] = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8849 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8850 execvp("xterm", tmpargs);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8851 free(tmpargs);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8852 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8853 /* If we got here exec failed */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8854 _exit(-1);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8855 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8856 return ret;
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8857 }
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8858
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8859 /*
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8860 * 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	8861 * Parameters:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8862 * url: Uniform resource locator.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8863 */
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8864 int dw_browse(char *url)
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	8865 {
715 5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	8866 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	8867 [[NSWorkspace sharedWorkspace] openURL:myurl];
5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	8868 return 0;
5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	8869 }

Mercurial > dwindows

annotate mac/dw.m @ 935:114729f5aedc