Mercurial > dwindows
changeset 2626:401a3b9f21ba
Massive continuation of code style standardization.
Only tested on Mac and iOS, may require follow up commits to get things
building again as I test on various platforms.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Sun, 01 Aug 2021 12:17:07 +0000 |
| parents | 2e804b4db81e |
| children | 814c81cae51d |
| files | android/dw.cpp gtk/dw.c gtk3/dw.c gtk4/dw.c ios/dw.m mac/dw.m os2/dw.c win/dw.c |
| diffstat | 8 files changed, 1029 insertions(+), 1029 deletions(-) [+] |
line wrap: on
line diff
--- a/android/dw.cpp Tue Jul 27 23:09:52 2021 +0000 +++ b/android/dw.cpp Sun Aug 01 12:17:07 2021 +0000 @@ -199,9 +199,9 @@ dw_thread_new((void *) _dw_main_launch, arg, 0); } -typedef struct _sighandler -{ - struct _sighandler *next; +typedef struct _dwsighandler +{ + struct _dwsighandler *next; ULONG message; HWND window; int id; @@ -209,13 +209,13 @@ void *discfunction; void *data; -} SignalHandler; - -static SignalHandler *DWRoot = nullptr; - -SignalHandler *_dw_get_handler(HWND window, int messageid) -{ - SignalHandler *tmp = DWRoot; +} DWSignalHandler; + +static DWSignalHandler *DWRoot = nullptr; + +DWSignalHandler *_dw_get_handler(HWND window, int messageid) +{ + DWSignalHandler *tmp = DWRoot; JNIEnv *env; if((env = (JNIEnv *)pthread_getspecific(_dw_env_key))) { @@ -266,7 +266,7 @@ int _dw_event_handler2(void **params) { - SignalHandler *handler = (SignalHandler *)params[9]; + DWSignalHandler *handler = (DWSignalHandler *)params[9]; int message = DW_POINTER_TO_INT(params[8]); int retval = -1; @@ -461,7 +461,7 @@ } int _dw_event_handler(jobject object, void **params) { - SignalHandler *handler = _dw_get_handler(object, DW_POINTER_TO_INT(params[8])); + DWSignalHandler *handler = _dw_get_handler(object, DW_POINTER_TO_INT(params[8])); if (handler) { @@ -661,7 +661,7 @@ */ void _dw_new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *discfunc, void *data) { - SignalHandler *newsig = (SignalHandler *)malloc(sizeof(SignalHandler)); + DWSignalHandler *newsig = (DWSignalHandler *)malloc(sizeof(DWSignalHandler)); newsig->message = message; newsig->window = window; @@ -675,7 +675,7 @@ DWRoot = newsig; else { - SignalHandler *prev = nullptr, *tmp = DWRoot; + DWSignalHandler *prev = nullptr, *tmp = DWRoot; while(tmp) { if(tmp->message == message && @@ -5913,7 +5913,7 @@ */ void API dw_signal_disconnect_by_name(HWND window, const char *signame) { - SignalHandler *prev = nullptr, *tmp = DWRoot; + DWSignalHandler *prev = nullptr, *tmp = DWRoot; ULONG message; if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0) @@ -5958,7 +5958,7 @@ */ void API dw_signal_disconnect_by_window(HWND window) { - SignalHandler *prev = nullptr, *tmp = DWRoot; + DWSignalHandler *prev = nullptr, *tmp = DWRoot; while(tmp) { @@ -6000,7 +6000,7 @@ */ void API dw_signal_disconnect_by_data(HWND window, void *data) { - SignalHandler *prev = nullptr, *tmp = DWRoot; + DWSignalHandler *prev = nullptr, *tmp = DWRoot; while(tmp) {
--- a/gtk/dw.c Tue Jul 27 23:09:52 2021 +0000 +++ b/gtk/dw.c Sun Aug 01 12:17:07 2021 +0000 @@ -69,7 +69,7 @@ #endif #endif -GdkColor _colors[] = +GdkColor _dw_colors[] = { { 0, 0x0000, 0x0000, 0x0000 }, /* 0 black */ { 0, 0xbbbb, 0x0000, 0x0000 }, /* 1 red */ @@ -93,7 +93,7 @@ * List those icons that have transparency first */ #define NUM_EXTS 9 -char *image_exts[NUM_EXTS] = +char *_dw_image_exts[NUM_EXTS] = { ".xpm", ".png", @@ -120,7 +120,7 @@ pthread_key_t _dw_bg_color_key; pthread_key_t _dw_mutex_key; -GtkWidget *last_window = NULL, *popup = NULL; +GtkWidget *_dw_last_window = NULL, *_dw_popup = NULL; GdkPixmap *_dw_tmppixmap = NULL; GdkBitmap *_dw_tmpbitmap = NULL; @@ -147,32 +147,32 @@ static GdkColormap *_dw_cmap = NULL; /* Signal forwarder prototypes */ -static gint _button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static gint _button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static gint _motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data); -static gint _delete_event(GtkWidget *widget, GdkEvent *event, gpointer data); -static gint _key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data); -static gint _generic_event(GtkWidget *widget, gpointer data); -static gint _configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data); -static gint _activate_event(GtkWidget *widget, gpointer data); -static gint _container_select_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static gint _container_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static gint _item_select_event(GtkWidget *widget, GtkWidget *child, gpointer data); -static gint _expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data); -static gint _set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data); -static gint _tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static gint _value_changed_event(GtkAdjustment *adjustment, gpointer user_data); -#if GTK_MAJOR_VERSION > 1 -static gint _tree_select_event(GtkTreeSelection *sel, gpointer data); -static gint _tree_expand_event(GtkTreeView *treeview, GtkTreeIter *arg1, GtkTreePath *arg2, gpointer data); -#else -static gint _tree_select_event(GtkTree *tree, GtkWidget *child, gpointer data); -static gint _tree_expand_event(GtkTreeItem *treeitem, gpointer data); -#endif -static gint _switch_page_event(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer data); -static gint _column_click_event(GtkWidget *widget, gint column_num, gpointer data); +static gint _dw_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data); +static gint _dw_button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data); +static gint _dw_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data); +static gint _dw_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data); +static gint _dw_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data); +static gint _dw_generic_event(GtkWidget *widget, gpointer data); +static gint _dw_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data); +static gint _dw_activate_event(GtkWidget *widget, gpointer data); +static gint _dw_container_select_event(GtkWidget *widget, GdkEventButton *event, gpointer data); +static gint _dw_container_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data); +static gint _dw_item_select_event(GtkWidget *widget, GtkWidget *child, gpointer data); +static gint _dw_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data); +static gint _dw_set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data); +static gint _dw_tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data); +static gint _dw_value_changed_event(GtkAdjustment *adjustment, gpointer user_data); +#if GTK_MAJOR_VERSION > 1 +static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data); +static gint _dw_tree_expand_event(GtkTreeView *treeview, GtkTreeIter *arg1, GtkTreePath *arg2, gpointer data); +#else +static gint _dw_tree_select_event(GtkTree *tree, GtkWidget *child, gpointer data); +static gint _dw_tree_expand_event(GtkTreeItem *treeitem, gpointer data); +#endif +static gint _dw_switch_page_event(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer data); +static gint _dw_column_click_event(GtkWidget *widget, gint column_num, gpointer data); #ifdef USE_WEBKIT -static void _html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data); +static void _dw_html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data); #endif static void _dw_signal_disconnect(gpointer data, GClosure *closure); @@ -187,15 +187,15 @@ #endif } DWPrivatePixmap; -static DWPrivatePixmap *_PixmapArray = NULL; -static int _PixmapCount = 0; +static DWPrivatePixmap *_DWPixmapArray = NULL; +static int _DWPixmapCount = 0; typedef struct { void *func; char name[30]; -} SignalList; +} DWSignalList; typedef struct { @@ -205,35 +205,35 @@ gint cid; void *intfunc; -} SignalHandler; +} DWSignalHandler; #define SIGNALMAX 20 /* A list of signal forwarders, to account for paramater differences. */ -static SignalList SignalTranslate[SIGNALMAX] = { - { _configure_event, DW_SIGNAL_CONFIGURE }, - { _key_press_event, DW_SIGNAL_KEY_PRESS }, - { _button_press_event, DW_SIGNAL_BUTTON_PRESS }, - { _button_release_event, DW_SIGNAL_BUTTON_RELEASE }, - { _motion_notify_event, DW_SIGNAL_MOTION_NOTIFY }, - { _delete_event, DW_SIGNAL_DELETE }, - { _expose_event, DW_SIGNAL_EXPOSE }, - { _activate_event, "activate" }, - { _generic_event, DW_SIGNAL_CLICKED }, - { _container_select_event, DW_SIGNAL_ITEM_ENTER }, - { _container_context_event, DW_SIGNAL_ITEM_CONTEXT }, - { _tree_context_event, "tree-context" }, - { _item_select_event, DW_SIGNAL_LIST_SELECT }, - { _tree_select_event, DW_SIGNAL_ITEM_SELECT }, - { _set_focus_event, DW_SIGNAL_SET_FOCUS }, - { _value_changed_event, DW_SIGNAL_VALUE_CHANGED }, - { _switch_page_event, DW_SIGNAL_SWITCH_PAGE }, - { _column_click_event, DW_SIGNAL_COLUMN_CLICK }, - { _tree_expand_event, DW_SIGNAL_TREE_EXPAND }, +static DWSignalList DWSignalTranslate[SIGNALMAX] = { + { _dw_configure_event, DW_SIGNAL_CONFIGURE }, + { _dw_key_press_event, DW_SIGNAL_KEY_PRESS }, + { _dw_button_press_event, DW_SIGNAL_BUTTON_PRESS }, + { _dw_button_release_event, DW_SIGNAL_BUTTON_RELEASE }, + { _dw_motion_notify_event, DW_SIGNAL_MOTION_NOTIFY }, + { _dw_delete_event, DW_SIGNAL_DELETE }, + { _dw_expose_event, DW_SIGNAL_EXPOSE }, + { _dw_activate_event, "activate" }, + { _dw_generic_event, DW_SIGNAL_CLICKED }, + { _dw_container_select_event, DW_SIGNAL_ITEM_ENTER }, + { _dw_container_context_event, DW_SIGNAL_ITEM_CONTEXT }, + { _dw_tree_context_event, "tree-context" }, + { _dw_item_select_event, DW_SIGNAL_LIST_SELECT }, + { _dw_tree_select_event, DW_SIGNAL_ITEM_SELECT }, + { _dw_set_focus_event, DW_SIGNAL_SET_FOCUS }, + { _dw_value_changed_event, DW_SIGNAL_VALUE_CHANGED }, + { _dw_switch_page_event, DW_SIGNAL_SWITCH_PAGE }, + { _dw_column_click_event, DW_SIGNAL_COLUMN_CLICK }, + { _dw_tree_expand_event, DW_SIGNAL_TREE_EXPAND }, #ifdef USE_WEBKIT - { _html_changed_event, DW_SIGNAL_HTML_CHANGED } -#else - { _generic_event, DW_SIGNAL_HTML_CHANGED } + { _dw_html_changed_event, DW_SIGNAL_HTML_CHANGED } +#else + { _dw_generic_event, DW_SIGNAL_HTML_CHANGED } #endif }; @@ -312,21 +312,21 @@ static void gtk_mdi_realize(GtkWidget *widget); static void gtk_mdi_size_request(GtkWidget *widget, GtkRequisition *requisition); -static void gtk_mdi_size_allocate(GtkWidget *widget, GtkAllocation *allocation); +static void gtk_mdi_dw_size_allocate(GtkWidget *widget, GtkAllocation *allocation); static gint gtk_mdi_expose(GtkWidget *widget, GdkEventExpose *event); /* Callbacks */ -static gboolean move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static gboolean resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static gboolean iconify_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static gboolean maximize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static gboolean kill_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_iconify_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_maximize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_kill_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); static void gtk_mdi_add(GtkContainer *container, GtkWidget *widget); static void gtk_mdi_remove_true(GtkContainer *container, GtkWidget *widget); static void gtk_mdi_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); -static GtkMdiChild *get_child(GtkMdi *mdi, GtkWidget * widget); +static GtkMdiChild *_dw_mdi_get_child(GtkMdi *mdi, GtkWidget * widget); static void _dw_log( char *format, ... ) { @@ -382,7 +382,7 @@ widget_class->realize = gtk_mdi_realize; widget_class->expose_event = gtk_mdi_expose; widget_class->size_request = gtk_mdi_size_request; - widget_class->size_allocate = gtk_mdi_size_allocate; + widget_class->size_allocate = gtk_mdi_dw_size_allocate; container_class->add = gtk_mdi_add; container_class->remove = gtk_mdi_remove_true; @@ -547,19 +547,19 @@ gdk_window_set_cursor (bottom_event_box->window, cursor); g_signal_connect (G_OBJECT (top_event_box), "event", - G_CALLBACK (move_child_callback), + G_CALLBACK (_dw_mdi_move_child_callback), child); g_signal_connect (G_OBJECT (bottom_event_box), "event", - G_CALLBACK (resize_child_callback), + G_CALLBACK (_dw_mdi_resize_child_callback), child); g_signal_connect (G_OBJECT (button[0]), "button_press_event", - G_CALLBACK (iconify_child_callback), + G_CALLBACK (_dw_mdi_iconify_child_callback), child); g_signal_connect (G_OBJECT (button[1]), "button_press_event", - G_CALLBACK (maximize_child_callback), + G_CALLBACK (_dw_mdi_maximize_child_callback), child); g_signal_connect (G_OBJECT (button[2]), "button_press_event", - G_CALLBACK (kill_child_callback), + G_CALLBACK (_dw_mdi_kill_child_callback), child); } @@ -570,7 +570,7 @@ g_return_if_fail (GTK_IS_MDI (mdi)); g_return_if_fail (GTK_IS_WIDGET (widget)); - child = get_child (mdi, widget); + child = _dw_mdi_get_child (mdi, widget); g_return_if_fail (child); child->x = x; @@ -586,7 +586,7 @@ g_return_if_fail (GTK_IS_MDI (mdi)); g_return_if_fail (GTK_IS_WIDGET (widget)); - child = get_child (mdi, widget); + child = _dw_mdi_get_child (mdi, widget); g_return_if_fail (child); *x = child->x; @@ -661,7 +661,7 @@ g_return_val_if_fail (GTK_IS_MDI (mdi), CHILD_NORMAL); g_return_val_if_fail (GTK_IS_WIDGET (widget), CHILD_NORMAL); - child = get_child (mdi, widget); + child = _dw_mdi_get_child (mdi, widget); g_return_val_if_fail (child, CHILD_NORMAL); return child->state; @@ -675,7 +675,7 @@ g_return_if_fail (GTK_IS_MDI (mdi)); g_return_if_fail (GTK_IS_WIDGET (widget)); - child = get_child (mdi, widget); + child = _dw_mdi_get_child (mdi, widget); g_return_if_fail (child); child->state = state; @@ -688,7 +688,7 @@ GtkMdiChild *child; g_return_if_fail (GTK_IS_MDI (mdi)); - child = get_child (mdi, widget); + child = _dw_mdi_get_child (mdi, widget); g_return_if_fail (child); gtk_mdi_remove_true (GTK_CONTAINER (mdi), child->widget); } @@ -753,7 +753,7 @@ } } -static void gtk_mdi_size_allocate(GtkWidget *widget, GtkAllocation *allocation) +static void gtk_mdi_dw_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { GtkMdi *mdi; GtkMdiChild *child; @@ -829,7 +829,7 @@ break; } } - gtk_widget_size_allocate (child->widget, &child_allocation); + gtk_widget_dw_size_allocate (child->widget, &child_allocation); } } } @@ -909,7 +909,7 @@ } } -static gboolean move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean _dw_mdi_move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data) { GtkMdi *mdi; GtkMdiChild *child; @@ -991,7 +991,7 @@ return FALSE; } -static gboolean resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean _dw_mdi_resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data) { GtkMdi *mdi; GtkMdiChild *child; @@ -1079,7 +1079,7 @@ return FALSE; } -static gboolean iconify_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean _dw_mdi_iconify_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data) { GtkMdiChild *child; child = (GtkMdiChild *) data; @@ -1096,7 +1096,7 @@ return FALSE; } -static gboolean maximize_child_callback (GtkWidget *widget, GdkEvent * event, gpointer data) +static gboolean _dw_mdi_maximize_child_callback (GtkWidget *widget, GdkEvent * event, gpointer data) { GtkMdiChild *child; child = (GtkMdiChild *) data; @@ -1113,7 +1113,7 @@ return FALSE; } -static gboolean kill_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean _dw_mdi_kill_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data) { GtkMdiChild *child; GtkMdi *mdi; @@ -1127,7 +1127,7 @@ return FALSE; } -static GtkMdiChild *get_child (GtkMdi *mdi, GtkWidget *widget) +static GtkMdiChild *_dw_mdi_get_child (GtkMdi *mdi, GtkWidget *widget) { GList *children; @@ -1168,21 +1168,21 @@ } /* Finds the translation function for a given signal name */ -static void *_findsigfunc(const char *signame) +static void *_dw_findsigfunc(const char *signame) { int z; for(z=0;z<SIGNALMAX;z++) { - if(strcasecmp(signame, SignalTranslate[z].name) == 0) - return SignalTranslate[z].func; + if(strcasecmp(signame, DWSignalTranslate[z].name) == 0) + return DWSignalTranslate[z].func; } return NULL; } -static SignalHandler _get_signal_handler(gpointer data) -{ - SignalHandler sh = {0}; +static DWSignalHandler _dw_get_signal_handler(gpointer data) +{ + DWSignalHandler sh = {0}; if(data) { @@ -1205,7 +1205,7 @@ return sh; } -static void _remove_signal_handler(GtkWidget *widget, int counter) +static void _dw_remove_signal_handler(GtkWidget *widget, int counter) { char text[101] = {0}; gint cid; @@ -1224,7 +1224,7 @@ gtk_object_set_data(GTK_OBJECT(widget), text, NULL); } -static int _set_signal_handler(GtkWidget *widget, HWND window, void *func, gpointer data, void *intfunc) +static int _dw_set_signal_handler(GtkWidget *widget, HWND window, void *func, gpointer data, void *intfunc) { int counter = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(widget), "_dw_sigcounter")); char text[101] = {0}; @@ -1244,7 +1244,7 @@ return counter - 1; } -static void _set_signal_handler_id(GtkWidget *widget, int counter, gint cid) +static void _dw_set_signal_handler_id(GtkWidget *widget, int counter, gint cid) { char text[101] = {0}; @@ -1253,9 +1253,9 @@ } #ifdef USE_WEBKIT -static void _html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static void _dw_html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); char *location = (char *)webkit_web_view_get_uri(web_view); int status = 0; void **params = data; @@ -1272,9 +1272,9 @@ } #endif -static gint _set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1287,9 +1287,9 @@ return retval; } -static gint _button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1308,9 +1308,9 @@ return retval; } -static gint _button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1329,9 +1329,9 @@ return retval; } -static gint _motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1362,9 +1362,9 @@ return retval; } -static gint _delete_event(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1377,9 +1377,9 @@ return retval; } -static gint _key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1397,9 +1397,9 @@ return retval; } -static gint _generic_event(GtkWidget *widget, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_generic_event(GtkWidget *widget, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1412,9 +1412,9 @@ return retval; } -static gint _activate_event(GtkWidget *widget, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_activate_event(GtkWidget *widget, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1422,15 +1422,15 @@ { int (*activatefunc)(HWND, void *) = work.func; - retval = activatefunc(popup ? popup : work.window, work.data); - popup = NULL; + retval = activatefunc(_dw_popup ? _dw_popup : work.window, work.data); + _dw_popup = NULL; } return retval; } -static gint _configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1443,9 +1443,9 @@ return retval; } -static gint _expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1463,9 +1463,9 @@ return retval; } -static gint _item_select_event(GtkWidget *widget, GtkWidget *child, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_item_select_event(GtkWidget *widget, GtkWidget *child, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); static int _dw_recursing = 0; int retval = FALSE; @@ -1508,9 +1508,9 @@ return retval; } -static gint _container_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_container_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1531,9 +1531,9 @@ return retval; } -static gint _tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1588,7 +1588,7 @@ } #if GTK_MAJOR_VERSION > 1 -static gint _tree_select_event(GtkTreeSelection *sel, gpointer data) +static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data) { GtkWidget *item, *widget = (GtkWidget *)gtk_tree_selection_get_tree_view(sel); int retval = FALSE; @@ -1596,7 +1596,7 @@ if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); if(widget) { - SignalHandler work = _get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if(work.window) { @@ -1616,9 +1616,9 @@ return retval; } -static gint _tree_expand_event(GtkTreeView *widget, GtkTreeIter *iter, GtkTreePath *path, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_tree_expand_event(GtkTreeView *widget, GtkTreeIter *iter, GtkTreePath *path, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1630,9 +1630,9 @@ return retval; } #else -static gint _tree_select_event(GtkTree *tree, GtkWidget *child, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_tree_select_event(GtkTree *tree, GtkWidget *child, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); GtkWidget *treeroot = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(child), "_dw_tree"); int retval = FALSE; @@ -1655,9 +1655,9 @@ return retval; } -static gint _tree_expand_event(GtkTreeItem *treeitem, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_tree_expand_event(GtkTreeItem *treeitem, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1670,9 +1670,9 @@ } #endif -static gint _container_select_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_container_select_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1694,9 +1694,9 @@ return retval; } -static gint _container_enter_event(GtkWidget *widget, GdkEventKey *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_container_enter_event(GtkWidget *widget, GdkEventKey *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1712,7 +1712,7 @@ } /* Return the logical page id from the physical page id */ -int _get_logical_page(HWND handle, unsigned long pageid) +int _dw_get_logical_page(HWND handle, unsigned long pageid) { int z; GtkWidget **pagearray = gtk_object_get_data(GTK_OBJECT(handle), "_dw_pagearray"); @@ -1730,23 +1730,23 @@ } -static gint _switch_page_event(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_switch_page_event(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); if(work.window) { int (*switchpagefunc)(HWND, unsigned long, void *) = work.func; - retval = switchpagefunc(work.window, _get_logical_page(GTK_WIDGET(notebook), page_num), work.data); + retval = switchpagefunc(work.window, _dw_get_logical_page(GTK_WIDGET(notebook), page_num), work.data); } return retval; } -static gint _column_click_event(GtkWidget *widget, gint column_num, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_column_click_event(GtkWidget *widget, gint column_num, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); @@ -1758,9 +1758,9 @@ return retval; } -static gint _container_select_row(GtkWidget *widget, gint row, gint column, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_container_select_row(GtkWidget *widget, gint row, gint column, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); void **rowdata = (void **)gtk_clist_get_row_data(GTK_CLIST(widget), row); int (*contextfunc)(HWND, HWND, char *, void *, void *) = work.func; @@ -1776,7 +1776,7 @@ return contextfunc(work.window, 0, rowdata ? rowdata[0] : NULL, work.data, rowdata ? rowdata[1] : NULL);; } -static int _round_value(gfloat val) +static int _dw_round_value(gfloat val) { int newval = (int)val; @@ -1786,22 +1786,22 @@ return newval; } -static gint _value_changed_event(GtkAdjustment *adjustment, gpointer data) -{ - int max = _round_value(adjustment->upper); - int val = _round_value(adjustment->value); +static gint _dw_value_changed_event(GtkAdjustment *adjustment, gpointer data) +{ + int max = _dw_round_value(adjustment->upper); + int val = _dw_round_value(adjustment->value); GtkWidget *slider = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(adjustment), "_dw_slider"); GtkWidget *spinbutton = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(adjustment), "_dw_spinbutton"); GtkWidget *scrollbar = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(adjustment), "_dw_scrollbar"); - if(gtk_object_get_data(GTK_OBJECT(adjustment), "_dw_suppress_value_changed_event")) + if(gtk_object_get_data(GTK_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event")) return FALSE; if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); if (slider || spinbutton || scrollbar) { - SignalHandler work = _get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if (work.window) { @@ -1816,7 +1816,7 @@ return FALSE; } -static gint _default_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) +static gint _dw_default_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { GtkWidget *next = (GtkWidget *)data; @@ -1834,18 +1834,18 @@ return FALSE; } -static GdkPixmap *_find_private_pixmap(GdkBitmap **bitmap, HICN icon, unsigned long *userwidth, unsigned long *userheight) +static GdkPixmap *_dw_find_private_pixmap(GdkBitmap **bitmap, HICN icon, unsigned long *userwidth, unsigned long *userheight) { int id = GPOINTER_TO_INT(icon); - if(id < _PixmapCount && _PixmapArray[id].used) - { - *bitmap = _PixmapArray[id].mask; + if(id < _DWPixmapCount && _DWPixmapArray[id].used) + { + *bitmap = _DWPixmapArray[id].mask; if(userwidth) - *userwidth = _PixmapArray[id].width; + *userwidth = _DWPixmapArray[id].width; if(userheight) - *userheight = _PixmapArray[id].height; - return _PixmapArray[id].pixmap; + *userheight = _DWPixmapArray[id].height; + return _DWPixmapArray[id].pixmap; } return NULL; } @@ -1872,7 +1872,7 @@ } #endif -static GdkPixmap *_find_pixmap(GdkBitmap **bitmap, HICN icon, HWND handle, unsigned long *userwidth, unsigned long *userheight) +static GdkPixmap *_dw_find_pixmap(GdkBitmap **bitmap, HICN icon, HWND handle, unsigned long *userwidth, unsigned long *userheight) { unsigned int id = GPOINTER_TO_INT(icon); #if GTK_MAJOR_VERSION > 1 @@ -1885,7 +1885,7 @@ return NULL; if(id & (1 << 31)) - return _find_private_pixmap(bitmap, GINT_TO_POINTER((id & 0xFFFFFF)), userwidth, userheight); + return _dw_find_private_pixmap(bitmap, GINT_TO_POINTER((id & 0xFFFFFF)), userwidth, userheight); #if GTK_MAJOR_VERSION > 1 icon_pixbuf = _dw_pixbuf_from_resource(id); @@ -1915,7 +1915,7 @@ #elif defined(USE_IMLIB) gdk_imlib_data_to_pixmap((char **)data, &icon_pixmap, bitmap); #else - icon_pixmap = gdk_pixmap_create_from_xpm_d(handle->window, bitmap, &_colors[DW_CLR_PALEGRAY], (char **)data); + icon_pixmap = gdk_pixmap_create_from_xpm_d(handle->window, bitmap, &_dw_colors[DW_CLR_PALEGRAY], (char **)data); #endif } } @@ -1948,16 +1948,16 @@ } #if GTK_MAJOR_VERSION > 1 -static GdkPixbuf *_find_private_pixbuf(HICN icon) +static GdkPixbuf *_dw_find_private_pixbuf(HICN icon) { int id = GPOINTER_TO_INT(icon); - if(id < _PixmapCount && _PixmapArray[id].used) - return _PixmapArray[id].pixbuf; + if(id < _DWPixmapCount && _DWPixmapArray[id].used) + return _DWPixmapArray[id].pixbuf; return NULL; } -static GdkPixbuf *_find_pixbuf(HICN icon) +static GdkPixbuf *_dw_find_pixbuf(HICN icon) { unsigned int id = GPOINTER_TO_INT(icon); GdkPixbuf *icon_pixbuf; @@ -1967,7 +1967,7 @@ return NULL; if(id & (1 << 31)) - return _find_private_pixbuf(GINT_TO_POINTER((id & 0xFFFFFF))); + return _dw_find_private_pixbuf(GINT_TO_POINTER((id & 0xFFFFFF))); if((icon_pixbuf = _dw_pixbuf_from_resource(id))) return icon_pixbuf; @@ -1995,7 +1995,7 @@ #endif #ifdef GDK_WINDOWING_X11 -static void _size_allocate(GtkWindow *window) +static void _dw_size_allocate(GtkWindow *window) { XSizeHints sizehints; @@ -2166,7 +2166,7 @@ /* Add colors to the system colormap */ _dw_cmap = gdk_colormap_get_system(); for(z=0;z<16;z++) - gdk_color_alloc(_dw_cmap, &_colors[z]); + gdk_color_alloc(_dw_cmap, &_dw_colors[z]); pthread_key_create(&_dw_fg_color_key, NULL); pthread_key_create(&_dw_bg_color_key, NULL); @@ -2192,7 +2192,7 @@ { GtkWidget *handle = gtk_label_new(""); gtk_widget_realize(handle); - _dw_tmppixmap = gdk_pixmap_create_from_xpm_d(handle->window, &_dw_tmpbitmap, &_colors[DW_CLR_PALEGRAY], (char **)_dw_test_xpm); + _dw_tmppixmap = gdk_pixmap_create_from_xpm_d(handle->window, &_dw_tmpbitmap, &_dw_colors[DW_CLR_PALEGRAY], (char **)_dw_test_xpm); gtk_widget_destroy(handle); } #endif @@ -2565,7 +2565,7 @@ #elif defined(USE_IMLIB) gdk_imlib_data_to_pixmap((char **)xpm_data, &icon_pixmap, &bitmap); #else - icon_pixmap = gdk_pixmap_create_from_xpm_d(handle->window, &bitmap, &_colors[DW_CLR_PALEGRAY], (char **)xpm_data); + icon_pixmap = gdk_pixmap_create_from_xpm_d(handle->window, &bitmap, &_dw_colors[DW_CLR_PALEGRAY], (char **)xpm_data); #endif #if GTK_MAJOR_VERSION > 1 @@ -2846,7 +2846,7 @@ } /* Internal function that changes the attachment properties in a table for destroying. */ -void _rearrange_table_destroy(GtkWidget *widget, gpointer data) +void _dw_rearrange_table_destroy(GtkWidget *widget, gpointer data) { gint pos = GPOINTER_TO_INT(data); GtkContainer *cont = gtk_object_get_data(GTK_OBJECT(widget), "_dw_table"); @@ -2924,7 +2924,7 @@ if((pos+1) < boxcount) { /* If we need to contract the table, reposition all the children */ - gtk_container_forall(GTK_CONTAINER(box),_rearrange_table_destroy, GINT_TO_POINTER(boxtype == DW_VERT ? pos : -(pos+1))); + gtk_container_forall(GTK_CONTAINER(box),_dw_rearrange_table_destroy, GINT_TO_POINTER(boxtype == DW_VERT ? pos : -(pos+1))); } if(boxcount > 0) @@ -2974,7 +2974,7 @@ DW_MUTEX_UNLOCK; } -static int _set_font(HWND handle, const char *fontname) +static int _dw_set_font(HWND handle, const char *fontname) { int retval = FALSE; #if GTK_MAJOR_VERSION < 2 @@ -3005,7 +3005,7 @@ static int _dw_font_active = 0; /* Internal function to handle the font OK press */ -static gint _gtk_font_ok(GtkWidget *widget, DWDialog *dwwait) +static gint _dw_font_ok(GtkWidget *widget, DWDialog *dwwait) { GtkFontSelectionDialog *fd; char *retfont = NULL; @@ -3050,7 +3050,7 @@ } /* Internal function to handle the font Cancel press */ -static gint _gtk_font_cancel(GtkWidget *widget, DWDialog *dwwait) +static gint _dw_font_cancel(GtkWidget *widget, DWDialog *dwwait) { if(!dwwait) return FALSE; @@ -3110,8 +3110,8 @@ dwwait = dw_dialog_new((void *)fd); - g_signal_connect(G_OBJECT(fd->ok_button), "clicked", G_CALLBACK(_gtk_font_ok), dwwait); - g_signal_connect(G_OBJECT(fd->cancel_button), "clicked", G_CALLBACK(_gtk_font_cancel), dwwait); + g_signal_connect(G_OBJECT(fd->ok_button), "clicked", G_CALLBACK(_dw_font_ok), dwwait); + g_signal_connect(G_OBJECT(fd->cancel_button), "clicked", G_CALLBACK(_dw_font_cancel), dwwait); gtk_widget_show(GTK_WIDGET(fd)); @@ -3136,7 +3136,7 @@ } /* Convert DW style font to pango style */ -void _convert_font(char *font) +void _dw_convert_font(char *font) { char *name = strchr(font, '.'); @@ -3214,7 +3214,7 @@ gtk_object_set_data(GTK_OBJECT(handle2), "_dw_gdkfont", (gpointer)gdkfont); #else if(font) - _convert_font(font); + _dw_convert_font(font); #endif /* Free old font name if one is allocated */ @@ -3321,7 +3321,7 @@ return retfont; } -void _free_gdk_colors(HWND handle) +void _dw_free_gdk_colors(HWND handle) { GdkColor *old = (GdkColor *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_foregdk"); @@ -3335,12 +3335,12 @@ } /* Free old color pointers and allocate new ones */ -static void _save_gdk_colors(HWND handle, GdkColor fore, GdkColor back) +static void _dw_save_gdk_colors(HWND handle, GdkColor fore, GdkColor back) { GdkColor *foregdk = malloc(sizeof(GdkColor)); GdkColor *backgdk = malloc(sizeof(GdkColor)); - _free_gdk_colors(handle); + _dw_free_gdk_colors(handle); *foregdk = fore; *backgdk = back; @@ -3349,9 +3349,9 @@ gtk_object_set_data(GTK_OBJECT(handle), "_dw_backgdk", (gpointer)backgdk); } -GdkColor _get_gdkcolor(unsigned long color) -{ - GdkColor temp = _colors[0]; +GdkColor _dw_get_gdkcolor(unsigned long color) +{ + GdkColor temp = _dw_colors[0]; if(color & DW_RGB_COLOR) { @@ -3364,18 +3364,18 @@ } else if(color < DW_CLR_DEFAULT) { - temp = _colors[color]; + temp = _dw_colors[color]; } return temp; } -static int _set_color(HWND handle, unsigned long fore, unsigned long back) +static int _dw_set_color(HWND handle, unsigned long fore, unsigned long back) { /* Remember that each color component in X11 use 16 bit no matter * what the destination display supports. (and thus GDK) */ - GdkColor forecolor = _get_gdkcolor(fore); - GdkColor backcolor = _get_gdkcolor(back); + GdkColor forecolor = _dw_get_gdkcolor(fore); + GdkColor backcolor = _dw_get_gdkcolor(back); #if GTK_MAJOR_VERSION < 2 GtkStyle *style = gtk_style_copy(gtk_widget_get_style(handle)); #endif @@ -3399,7 +3399,7 @@ style->base[0] = style->base[1] = style->bg[0] = style->bg[1] = backcolor; #endif - _save_gdk_colors(handle, forecolor, backcolor); + _dw_save_gdk_colors(handle, forecolor, backcolor); if(GTK_IS_CLIST(handle)) { @@ -3432,12 +3432,12 @@ GdkColor *backcol = (GdkColor *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_backgdk"); if(!backcol) - backcol = &_colors[DW_CLR_WHITE]; + backcol = &_dw_colors[DW_CLR_WHITE]; if(odd != DW_RGB_TRANSPARENT || even != DW_RGB_TRANSPARENT) { - GdkColor oddcol = _get_gdkcolor(odd); - GdkColor evencol = _get_gdkcolor(even); + GdkColor oddcol = _dw_get_gdkcolor(odd); + GdkColor evencol = _dw_get_gdkcolor(even); for(z=0;z<rowcount;z++) { @@ -3479,7 +3479,7 @@ handle2 = tmp; } - _set_color(handle2, fore, back); + _dw_set_color(handle2, fore, back); DW_MUTEX_UNLOCK; return TRUE; @@ -3526,8 +3526,8 @@ if(pointertype & (1 << 31)) { GdkBitmap *bitmap = NULL; - GdkPixmap *pixmap = _find_private_pixmap(&bitmap, GINT_TO_POINTER((pointertype & 0xFFFFFF)), NULL, NULL); - cursor = gdk_cursor_new_from_pixmap(pixmap, (GdkPixmap *)bitmap, &_colors[DW_CLR_WHITE], &_colors[DW_CLR_BLACK], 8, 8); + GdkPixmap *pixmap = _dw_find_private_pixmap(&bitmap, GINT_TO_POINTER((pointertype & 0xFFFFFF)), NULL, NULL); + cursor = gdk_cursor_new_from_pixmap(pixmap, (GdkPixmap *)bitmap, &_dw_colors[DW_CLR_WHITE], &_dw_colors[DW_CLR_BLACK], 8, 8); } else if(!pointertype) cursor = NULL; @@ -3589,7 +3589,7 @@ gtk_widget_show_all(table); - last_window = tmp = gtk_window_new(GTK_WINDOW_TOPLEVEL); + _dw_last_window = tmp = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(tmp), title); gtk_window_set_resizable(GTK_WINDOW(tmp), (flStyle & DW_FCF_SIZEBORDER) ? TRUE : FALSE); @@ -3720,7 +3720,7 @@ else adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) ); if (adjustment) - val = _round_value(adjustment->value); + val = _dw_round_value(adjustment->value); DW_MUTEX_UNLOCK; return val; } @@ -3746,7 +3746,7 @@ adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) ); if (adjustment) { - range = _round_value(adjustment->upper); + range = _dw_round_value(adjustment->upper); } DW_MUTEX_UNLOCK; return range; @@ -3936,7 +3936,7 @@ } } -char _removetilde(char *dest, const char *src) +char _dw_removetilde(char *dest, const char *src) { int z, cur=0; char accel = '\0'; @@ -3984,7 +3984,7 @@ } DW_MUTEX_LOCK; - accel = _removetilde(tempbuf, title); + accel = _dw_removetilde(tempbuf, title); accel_group = (GtkAccelGroup *)gtk_object_get_data(GTK_OBJECT(menu), "_dw_accel"); submenucount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(menu), "_dw_submenucount")); @@ -4067,7 +4067,7 @@ return tmphandle; } -GtkWidget *_find_submenu_id(GtkWidget *start, const char *name) +GtkWidget *_dw_find_submenu_id(GtkWidget *start, const char *name) { GtkWidget *tmp; int z, submenucount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(start), "_dw_submenucount")); @@ -4084,7 +4084,7 @@ if((submenu = gtk_object_get_data(GTK_OBJECT(start), tempbuf))) { - if((menuitem = _find_submenu_id(submenu, name))) + if((menuitem = _dw_find_submenu_id(submenu, name))) return menuitem; } } @@ -4110,7 +4110,7 @@ DW_MUTEX_LOCK; snprintf(numbuf, 24, "%lu", id); - tmphandle = _find_submenu_id(menu, numbuf); + tmphandle = _dw_find_submenu_id(menu, numbuf); if(tmphandle) { @@ -4141,7 +4141,7 @@ DW_MUTEX_LOCK; snprintf(numbuf, 24, "%lu", id); - tmphandle = _find_submenu_id(menu, numbuf); + tmphandle = _dw_find_submenu_id(menu, numbuf); if ( (state & DW_MIS_CHECKED) || (state & DW_MIS_UNCHECKED) ) { @@ -4193,7 +4193,7 @@ DW_MUTEX_LOCK; snprintf(numbuf, 24, "%lu", id); - tmphandle = _find_submenu_id(menu, numbuf); + tmphandle = _dw_find_submenu_id(menu, numbuf); if(tmphandle) { @@ -4220,7 +4220,7 @@ if(!menu || !*menu) return; - popup = parent; + _dw_popup = parent; DW_MUTEX_LOCK; gtk_menu_popup(GTK_MENU(*menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME); @@ -4533,9 +4533,9 @@ gtk_widget_show(tmp); gtk_object_set_data(GTK_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); - sigid = _set_signal_handler(GTK_COMBO(tmp)->list, tmp, NULL, NULL, NULL); - cid = gtk_signal_connect(GTK_OBJECT(GTK_COMBO(tmp)->list), "select_child", GTK_SIGNAL_FUNC(_item_select_event), GINT_TO_POINTER(sigid)); - _set_signal_handler_id(GTK_COMBO(tmp)->list, sigid, cid); + sigid = _dw_set_signal_handler(GTK_COMBO(tmp)->list, tmp, NULL, NULL, NULL); + cid = gtk_signal_connect(GTK_OBJECT(GTK_COMBO(tmp)->list), "select_child", GTK_SIGNAL_FUNC(_dw_item_select_event), GINT_TO_POINTER(sigid)); + _dw_set_signal_handler_id(GTK_COMBO(tmp)->list, sigid, cid); if(_DWDefaultFont) dw_window_set_font(tmp, _DWDefaultFont); DW_MUTEX_UNLOCK; @@ -4797,7 +4797,7 @@ gtk_object_set_data(GTK_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment); gtk_object_set_data(GTK_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp); gtk_object_set_data(GTK_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); - gtk_object_set_data(GTK_OBJECT(tmp), "_dw_suppress_value_changed_event", GINT_TO_POINTER(0)); + gtk_object_set_data(GTK_OBJECT(tmp), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(0)); DW_MUTEX_UNLOCK; return tmp; } @@ -4886,7 +4886,7 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - icon_pixmap = _find_pixmap(&bitmap, icon, handle, NULL, NULL); + icon_pixmap = _dw_find_pixmap(&bitmap, icon, handle, NULL, NULL); if(handle->window && icon_pixmap) gdk_window_set_icon(handle->window, NULL, icon_pixmap, bitmap); @@ -4922,9 +4922,9 @@ DW_MUTEX_LOCK; if(id) #if GTK_MAJOR_VERSION > 1 - pixbuf = _find_pixbuf((HICN)id); -#else - tmp = _find_pixmap(&bitmap, (HICN)id, handle, NULL, NULL); + pixbuf = _dw_find_pixbuf((HICN)id); +#else + tmp = _dw_find_pixmap(&bitmap, (HICN)id, handle, NULL, NULL); #endif else { @@ -4948,7 +4948,7 @@ for ( i = 0; i < NUM_EXTS; i++ ) { strcpy( file, filename ); - strcat( file, image_exts[i] ); + strcat( file, _dw_image_exts[i] ); if ( access( file, 04 ) == 0 ) { found_ext = 1; @@ -4970,7 +4970,7 @@ bitmap = gdk_imlib_copy_mask(image); gdk_imlib_destroy_image(image); #else - tmp = gdk_pixmap_create_from_xpm(handle->window, &bitmap, &_colors[DW_CLR_PALEGRAY], file); + tmp = gdk_pixmap_create_from_xpm(handle->window, &bitmap, &_dw_colors[DW_CLR_PALEGRAY], file); #endif } @@ -5066,16 +5066,16 @@ bitmap = gdk_imlib_copy_mask(image); gdk_imlib_destroy_image(image); #else - tmp = gdk_pixmap_create_from_xpm_d(handle->window, &bitmap, &_colors[DW_CLR_PALEGRAY], mydata); + tmp = gdk_pixmap_create_from_xpm_d(handle->window, &bitmap, &_dw_colors[DW_CLR_PALEGRAY], mydata); #endif /* remove our temporary file */ unlink(template); } else if (id) #if GTK_MAJOR_VERSION > 1 - pixbuf = _find_pixbuf((HICN)id); -#else - tmp = _find_pixmap(&bitmap, (HICN)id, handle, NULL, NULL); + pixbuf = _dw_find_pixbuf((HICN)id); +#else + tmp = _dw_find_pixmap(&bitmap, (HICN)id, handle, NULL, NULL); #endif #if GTK_MAJOR_VERSION > 1 @@ -5947,8 +5947,8 @@ adjustment = (GtkAdjustment *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_adjustment"); if(adjustment) { - int max = _round_value(adjustment->upper) - 1; - int thisval = _round_value(adjustment->value); + int max = _dw_round_value(adjustment->upper) - 1; + int thisval = _dw_round_value(adjustment->value); if(GTK_IS_VSCALE(handle)) val = max - thisval; @@ -5977,7 +5977,7 @@ adjustment = (GtkAdjustment *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_adjustment"); if(adjustment) { - int max = _round_value(adjustment->upper) - 1; + int max = _dw_round_value(adjustment->upper) - 1; if(GTK_IS_VSCALE(handle)) gtk_adjustment_set_value(adjustment, (gfloat)(max - position)); @@ -6003,7 +6003,7 @@ DW_MUTEX_LOCK; adjustment = (GtkAdjustment *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_adjustment"); if(adjustment) - val = _round_value(adjustment->value); + val = _dw_round_value(adjustment->value); DW_MUTEX_UNLOCK; return val; } @@ -6026,9 +6026,9 @@ adjustment = (GtkAdjustment *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_adjustment"); if(adjustment) { - gtk_object_set_data(GTK_OBJECT(adjustment), "_dw_suppress_value_changed_event", GINT_TO_POINTER(1)); + gtk_object_set_data(GTK_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(1)); gtk_adjustment_set_value(adjustment, (gfloat)position); - gtk_object_set_data(GTK_OBJECT(adjustment), "_dw_suppress_value_changed_event", GINT_TO_POINTER(0)); + gtk_object_set_data(GTK_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(0)); } DW_MUTEX_UNLOCK; } @@ -6192,7 +6192,7 @@ { iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter)); - pixbuf = _find_pixbuf(icon); + pixbuf = _dw_find_pixbuf(icon); gtk_tree_store_insert_after(store, iter, (GtkTreeIter *)parent, (GtkTreeIter *)item); gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1); @@ -6234,7 +6234,7 @@ gtk_object_set_data(GTK_OBJECT(newitem), "_dw_parent", (gpointer)parent); hbox = gtk_hbox_new(FALSE, 2); gtk_object_set_data(GTK_OBJECT(newitem), "_dw_hbox", (gpointer)hbox); - gdkpix = _find_pixmap(&gdkbmp, icon, hbox, NULL, NULL); + gdkpix = _dw_find_pixmap(&gdkbmp, icon, hbox, NULL, NULL); gtk_container_add(GTK_CONTAINER(newitem), hbox); if(gdkpix) { @@ -6250,18 +6250,18 @@ void *thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_item_expand_func"); void *mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_item_expand_data"); void **params = calloc(sizeof(void *), 3): - SignalHandler work; + DWSignalHandler work; params[0] = mydata; params[2] = (void *)tree; - work = _get_signal_handler(mydata); + work = _dw_get_signal_handler(mydata); if(thisfunc && work.window) { - gint sigid = _set_signal_handler(newitem, work.window, work.func, work.data, thisfunc); + gint sigid = _dw_set_signal_handler(newitem, work.window, work.func, work.data, thisfunc); pointer[0] = GINT_TO_POINTER(sigid); gint cid = g_signal_connect_data(G_OBJECT(newitem), "expand", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(newitem, sigid, cid); + _dw_set_signal_handler_id(newitem, sigid, cid); } else { @@ -6277,26 +6277,26 @@ { void *thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_select_child_func"); void *mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_select_child_data"); - SignalHandler work = _get_signal_handler(mydata); + DWSignalHandler work = _dw_get_signal_handler(mydata); subtree = gtk_tree_new(); if(thisfunc && work.window) { - int sigid = _set_signal_handler(subtree, work.window, work.func, work.data, thisfunc); + int sigid = _dw_set_signal_handler(subtree, work.window, work.func, work.data, thisfunc); gint cid =gtk_signal_connect(GTK_OBJECT(subtree), "select-child", GTK_SIGNAL_FUNC(thisfunc),(gpointer)sigid); - _set_signal_handler_id(subtree, sigid, cid); + _dw_set_signal_handler_id(subtree, sigid, cid); } thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_container_context_func"); mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_container_context_data"); - work = _get_signal_handler(mydata); + work = _dw_get_signal_handler(mydata); if(thisfunc && work.window) { - int sigid = _set_signal_handler(subtree, work.window, work.func, work.data, thisfunc); + int sigid = _dw_set_signal_handler(subtree, work.window, work.func, work.data, thisfunc); gint cid =gtk_signal_connect(GTK_OBJECT(subtree), "button_press_event", GTK_SIGNAL_FUNC(thisfunc),(gpointer)sigid); - _set_signal_handler_id(subtree, sigid, cid); + _dw_set_signal_handler_id(subtree, sigid, cid); } gtk_object_set_user_data(GTK_OBJECT(parent), subtree); @@ -6355,7 +6355,7 @@ { iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter)); - pixbuf = _find_pixbuf(icon); + pixbuf = _dw_find_pixbuf(icon); gtk_tree_store_append (store, iter, (GtkTreeIter *)parent); gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1); @@ -6390,7 +6390,7 @@ gtk_object_set_data(GTK_OBJECT(item), "_dw_parent", (gpointer)parent); hbox = gtk_hbox_new(FALSE, 2); gtk_object_set_data(GTK_OBJECT(item), "_dw_hbox", (gpointer)hbox); - gdkpix = _find_pixmap(&gdkbmp, icon, hbox, NULL, NULL); + gdkpix = _dw_find_pixmap(&gdkbmp, icon, hbox, NULL, NULL); gtk_container_add(GTK_CONTAINER(item), hbox); if(gdkpix) { @@ -6406,18 +6406,18 @@ void *thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_item_expand_func"); void *mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_item_expand_data"); void **params = calloc(sizeof(void *), 3): - SignalHandler work; + DWSignalHandler work; params[0] = mydata; params[2] = (void *)tree; - work = _get_signal_handler(mydata); + work = _dw_get_signal_handler(mydata); if(thisfunc && work.window) { - gint sigid = _set_signal_handler(item, work.window, work.func, work.data, thisfunc); + gint sigid = _dw_set_signal_handler(item, work.window, work.func, work.data, thisfunc); params[0] = GINT_TO_POINTER(sigid); gint cid = g_signal_connect_data(G_OBJECT(item), "expand", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(item, sigid, cid); + _dw_set_signal_handler_id(item, sigid, cid); } } @@ -6429,26 +6429,26 @@ { void *thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_select_child_func"); void *mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_select_child_data"); - SignalHandler work = _get_signal_handler(mydata); + DWSignalHandler work = _dw_get_signal_handler(mydata); subtree = gtk_tree_new(); if(thisfunc && work.window) { - int sigid = _set_signal_handler(subtree, work.window, work.func, work.data, thisfunc); + int sigid = _dw_set_signal_handler(subtree, work.window, work.func, work.data, thisfunc); gint cid =gtk_signal_connect(GTK_OBJECT(subtree), "select-child", GTK_SIGNAL_FUNC(thisfunc),(gpointer)sigid); - _set_signal_handler_id(subtree, sigid, cid); + _dw_set_signal_handler_id(subtree, sigid, cid); } thisfunc = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_container_context_func"); mydata = (void *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_container_context_data"); - work = _get_signal_handler(mydata); + work = _dw_get_signal_handler(mydata); if(thisfunc && work.window) { - int sigid = _set_signal_handler(subtree, work.window, work.func, work.data, thisfunc); + int sigid = _dw_set_signal_handler(subtree, work.window, work.func, work.data, thisfunc); gint cid =gtk_signal_connect(GTK_OBJECT(subtree), "button_press_event", GTK_SIGNAL_FUNC(thisfunc),(gpointer)sigid); - _set_signal_handler_id(subtree, sigid, cid); + _dw_set_signal_handler_id(subtree, sigid, cid); } gtk_object_set_user_data(GTK_OBJECT(parent), subtree); @@ -6502,7 +6502,7 @@ && GTK_IS_TREE_VIEW(tree) && (store = (GtkTreeStore *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_store"))) { - pixbuf = _find_pixbuf(icon); + pixbuf = _dw_find_pixbuf(icon); gtk_tree_store_set(store, (GtkTreeIter *)item, 0, title, 1, pixbuf, -1); if(pixbuf && !(GPOINTER_TO_INT(icon) & (1 << 31))) @@ -6529,7 +6529,7 @@ gtk_widget_destroy(hbox); hbox = gtk_hbox_new(FALSE, 2); gtk_object_set_data(GTK_OBJECT(item), "_dw_hbox", (gpointer)hbox); - gdkpix = _find_pixmap(&gdkbmp, icon, hbox, NULL, NULL); + gdkpix = _dw_find_pixmap(&gdkbmp, icon, hbox, NULL, NULL); gtk_container_add(GTK_CONTAINER(item), hbox); if(gdkpix) { @@ -7075,7 +7075,7 @@ #if GTK_MAJOR_VERSION > 1 /* Internal function to keep HICNs from getting too big */ -GdkPixbuf *_icon_resize(GdkPixbuf *ret) +GdkPixbuf *_dw_icon_resize(GdkPixbuf *ret) { if(ret) { @@ -7125,7 +7125,7 @@ for ( i = 0; i < NUM_EXTS; i++ ) { strcpy( file, filename ); - strcat( file, image_exts[i] ); + strcat( file, _dw_image_exts[i] ); if ( access( file, 04 ) == 0 ) { found_ext = 1; @@ -7140,9 +7140,9 @@ DW_MUTEX_LOCK; /* Find a free entry in the array */ - for (z=0;z<_PixmapCount;z++) - { - if (!_PixmapArray[z].used) + for (z=0;z<_DWPixmapCount;z++) + { + if (!_DWPixmapArray[z].used) { ret = found = z; break; @@ -7154,52 +7154,52 @@ */ if (found == -1) { - DWPrivatePixmap *old = _PixmapArray; - - ret = found = _PixmapCount; - _PixmapCount++; - - _PixmapArray = malloc(sizeof(DWPrivatePixmap) * _PixmapCount); + DWPrivatePixmap *old = _DWPixmapArray; + + ret = found = _DWPixmapCount; + _DWPixmapCount++; + + _DWPixmapArray = malloc(sizeof(DWPrivatePixmap) * _DWPixmapCount); if (found) - memcpy(_PixmapArray, old, sizeof(DWPrivatePixmap) * found); + memcpy(_DWPixmapArray, old, sizeof(DWPrivatePixmap) * found); if (old) free(old); - _PixmapArray[found].used = 1; - _PixmapArray[found].pixmap = _PixmapArray[found].mask = NULL; - } - -#if GTK_MAJOR_VERSION > 1 - pixbuf = _icon_resize(gdk_pixbuf_new_from_file(file, NULL)); + _DWPixmapArray[found].used = 1; + _DWPixmapArray[found].pixmap = _DWPixmapArray[found].mask = NULL; + } + +#if GTK_MAJOR_VERSION > 1 + pixbuf = _dw_icon_resize(gdk_pixbuf_new_from_file(file, NULL)); if (pixbuf) { - _PixmapArray[found].pixbuf = pixbuf; - _PixmapArray[found].width = gdk_pixbuf_get_width(pixbuf); - _PixmapArray[found].height = gdk_pixbuf_get_height(pixbuf); - - gdk_pixbuf_render_pixmap_and_mask(pixbuf, &_PixmapArray[found].pixmap, &_PixmapArray[found].mask, 1); + _DWPixmapArray[found].pixbuf = pixbuf; + _DWPixmapArray[found].width = gdk_pixbuf_get_width(pixbuf); + _DWPixmapArray[found].height = gdk_pixbuf_get_height(pixbuf); + + gdk_pixbuf_render_pixmap_and_mask(pixbuf, &_DWPixmapArray[found].pixmap, &_DWPixmapArray[found].mask, 1); } #elif defined(USE_IMLIB) image = gdk_imlib_load_image(file); if (image) { - _PixmapArray[found].width = image->rgb_width; - _PixmapArray[found].height = image->rgb_height; + _DWPixmapArray[found].width = image->rgb_width; + _DWPixmapArray[found].height = image->rgb_height; gdk_imlib_render(image, image->rgb_width, image->rgb_height); - _PixmapArray[found].pixmap = gdk_imlib_copy_image(image); - _PixmapArray[found].mask = gdk_imlib_copy_mask(image); + _DWPixmapArray[found].pixmap = gdk_imlib_copy_image(image); + _DWPixmapArray[found].mask = gdk_imlib_copy_mask(image); gdk_imlib_destroy_image(image); } #else - if (last_window) - _PixmapArray[found].pixmap = gdk_pixmap_create_from_xpm(last_window->window, &_PixmapArray[found].mask, &_colors[DW_CLR_PALEGRAY], file); -#endif - DW_MUTEX_UNLOCK; - if (!_PixmapArray[found].pixmap || !_PixmapArray[found].mask) - { - _PixmapArray[found].used = 0; - _PixmapArray[found].pixmap = _PixmapArray[found].mask = NULL; + if (_dw_last_window) + _DWPixmapArray[found].pixmap = gdk_pixmap_create_from_xpm(_dw_last_window->window, &_DWPixmapArray[found].mask, &_dw_colors[DW_CLR_PALEGRAY], file); +#endif + DW_MUTEX_UNLOCK; + if (!_DWPixmapArray[found].pixmap || !_DWPixmapArray[found].mask) + { + _DWPixmapArray[found].used = 0; + _DWPixmapArray[found].pixmap = _DWPixmapArray[found].mask = NULL; return 0; } return (HICN)(ret | (1 << 31)); @@ -7237,9 +7237,9 @@ return 0; /* Find a free entry in the array */ - for(z=0;z<_PixmapCount;z++) - { - if(!_PixmapArray[z].used) + for(z=0;z<_DWPixmapCount;z++) + { + if(!_DWPixmapArray[z].used) { ret = found = z; break; @@ -7251,56 +7251,56 @@ */ if(found == -1) { - DWPrivatePixmap *old = _PixmapArray; - - ret = found = _PixmapCount; - _PixmapCount++; - - _PixmapArray = malloc(sizeof(DWPrivatePixmap) * _PixmapCount); + DWPrivatePixmap *old = _DWPixmapArray; + + ret = found = _DWPixmapCount; + _DWPixmapCount++; + + _DWPixmapArray = malloc(sizeof(DWPrivatePixmap) * _DWPixmapCount); if (found) - memcpy(_PixmapArray, old, sizeof(DWPrivatePixmap) * found); + memcpy(_DWPixmapArray, old, sizeof(DWPrivatePixmap) * found); if (old) free(old); - _PixmapArray[found].used = 1; - _PixmapArray[found].pixmap = _PixmapArray[found].mask = NULL; - } - -#if GTK_MAJOR_VERSION > 1 - pixbuf = _icon_resize(gdk_pixbuf_new_from_file(template, NULL)); + _DWPixmapArray[found].used = 1; + _DWPixmapArray[found].pixmap = _DWPixmapArray[found].mask = NULL; + } + +#if GTK_MAJOR_VERSION > 1 + pixbuf = _dw_icon_resize(gdk_pixbuf_new_from_file(template, NULL)); if(pixbuf) { - _PixmapArray[found].pixbuf = pixbuf; - _PixmapArray[found].width = gdk_pixbuf_get_width(pixbuf); - _PixmapArray[found].height = gdk_pixbuf_get_height(pixbuf); - - gdk_pixbuf_render_pixmap_and_mask(pixbuf, &_PixmapArray[found].pixmap, &_PixmapArray[found].mask, 1); + _DWPixmapArray[found].pixbuf = pixbuf; + _DWPixmapArray[found].width = gdk_pixbuf_get_width(pixbuf); + _DWPixmapArray[found].height = gdk_pixbuf_get_height(pixbuf); + + gdk_pixbuf_render_pixmap_and_mask(pixbuf, &_DWPixmapArray[found].pixmap, &_DWPixmapArray[found].mask, 1); } #elif defined(USE_IMLIB) image = gdk_imlib_load_image(template); if(image) { - _PixmapArray[found].width = image->rgb_width; - _PixmapArray[found].height = image->rgb_height; + _DWPixmapArray[found].width = image->rgb_width; + _DWPixmapArray[found].height = image->rgb_height; gdk_imlib_render(image, image->rgb_width, image->rgb_height); - _PixmapArray[found].pixmap = gdk_imlib_copy_image(image); - _PixmapArray[found].mask = gdk_imlib_copy_mask(image); + _DWPixmapArray[found].pixmap = gdk_imlib_copy_image(image); + _DWPixmapArray[found].mask = gdk_imlib_copy_mask(image); gdk_imlib_destroy_image(image); } #else - if(last_window) - _PixmapArray[found].pixmap = gdk_pixmap_create_from_xpm_d(last_window->window, &_PixmapArray[found].mask, &_colors[DW_CLR_PALEGRAY], data); + if(_dw_last_window) + _DWPixmapArray[found].pixmap = gdk_pixmap_create_from_xpm_d(_dw_last_window->window, &_DWPixmapArray[found].mask, &_dw_colors[DW_CLR_PALEGRAY], data); #endif /* remove our temporary file */ unlink(template); DW_MUTEX_UNLOCK; - if(!_PixmapArray[found].pixmap || !_PixmapArray[found].mask) - { - _PixmapArray[found].used = 0; - _PixmapArray[found].pixmap = _PixmapArray[found].mask = NULL; + if(!_DWPixmapArray[found].pixmap || !_DWPixmapArray[found].mask) + { + _DWPixmapArray[found].used = 0; + _DWPixmapArray[found].pixmap = _DWPixmapArray[found].mask = NULL; return 0; } return (HICN)(ret | (1 << 31)); @@ -7321,26 +7321,26 @@ { unsigned long id = GPOINTER_TO_INT(handle) & 0xFFFFFF; - if(id < _PixmapCount && _PixmapArray[id].used) - { -#if GTK_MAJOR_VERSION > 1 - if(_PixmapArray[id].pixbuf) - { - g_object_unref(_PixmapArray[id].pixbuf); - _PixmapArray[id].pixbuf = NULL; - } -#endif - if(_PixmapArray[id].mask) - { - gdk_bitmap_unref(_PixmapArray[id].mask); - _PixmapArray[id].mask = NULL; - } - if(_PixmapArray[id].pixmap) - { - gdk_pixmap_unref(_PixmapArray[id].pixmap); - _PixmapArray[id].pixmap = NULL; - } - _PixmapArray[id].used = 0; + if(id < _DWPixmapCount && _DWPixmapArray[id].used) + { +#if GTK_MAJOR_VERSION > 1 + if(_DWPixmapArray[id].pixbuf) + { + g_object_unref(_DWPixmapArray[id].pixbuf); + _DWPixmapArray[id].pixbuf = NULL; + } +#endif + if(_DWPixmapArray[id].mask) + { + gdk_bitmap_unref(_DWPixmapArray[id].mask); + _DWPixmapArray[id].mask = NULL; + } + if(_DWPixmapArray[id].pixmap) + { + gdk_pixmap_unref(_DWPixmapArray[id].pixmap); + _DWPixmapArray[id].pixmap = NULL; + } + _DWPixmapArray[id].used = 0; } } } @@ -7437,7 +7437,7 @@ if(data) { HICN hicon = *((HICN *)data); - pixmap = _find_pixmap(&bitmap, hicon, clist, NULL, NULL); + pixmap = _dw_find_pixmap(&bitmap, hicon, clist, NULL, NULL); } gtk_clist_set_pixmap(GTK_CLIST(clist), row, column, pixmap ? pixmap : _dw_tmppixmap, pixmap ? bitmap : _dw_tmpbitmap); } @@ -7449,7 +7449,7 @@ if(data) { HICN hicon = *((HICN *)data); - pixmap = _find_pixmap(&bitmap, hicon, clist, NULL, NULL); + pixmap = _dw_find_pixmap(&bitmap, hicon, clist, NULL, NULL); } gtk_clist_set_pixtext(GTK_CLIST(clist), row, column, text ? text : textbuffer, 2, pixmap ? pixmap : _dw_tmppixmap, pixmap ? bitmap : _dw_tmpbitmap); } @@ -8183,7 +8183,7 @@ #if GTK_CHECK_VERSION(2,10,0) /* Translate the status message into a message on our buddy window */ -static void _status_translate(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) +static void _dw_status_translate(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) { GdkEventButton event = { 0 }; long x, y; @@ -8214,12 +8214,12 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - pixbuf = _find_pixbuf(icon); + pixbuf = _dw_find_pixbuf(icon); status = gtk_status_icon_new_from_pixbuf(pixbuf); if(bubbletext) gtk_status_icon_set_tooltip_text(status, bubbletext); g_object_set_data(G_OBJECT(handle), "_dw_taskbar", status); - g_signal_connect(G_OBJECT (status), "popup-menu", G_CALLBACK (_status_translate), handle); + g_signal_connect(G_OBJECT (status), "popup-menu", G_CALLBACK (_dw_status_translate), handle); gtk_status_icon_set_visible(status, TRUE); DW_MUTEX_UNLOCK; #endif @@ -8290,7 +8290,7 @@ } /* Returns a GdkColor from a DW color */ -static GdkColor _internal_color(unsigned long value) +static GdkColor _dw_internal_color(unsigned long value) { if(DW_RGB_COLOR & value) { @@ -8298,8 +8298,8 @@ return color; } if (value < 16) - return _colors[value]; - return _colors[0]; + return _dw_colors[value]; + return _dw_colors[0]; } /* Sets the current foreground drawing color. @@ -8311,7 +8311,7 @@ void dw_color_foreground_set(unsigned long value) { int _locked_by_me = FALSE; - GdkColor color = _internal_color(value); + GdkColor color = _dw_internal_color(value); GdkColor *foreground = pthread_getspecific(_dw_fg_color_key); DW_MUTEX_LOCK; @@ -8341,7 +8341,7 @@ } else { - GdkColor color = _internal_color(value); + GdkColor color = _dw_internal_color(value); DW_MUTEX_LOCK; gdk_color_alloc(_dw_cmap, &color); @@ -8411,7 +8411,7 @@ DWDialog *dwwait; GtkColorSelection *colorsel; #if GTK_MAJOR_VERSION > 1 - GdkColor color = _internal_color(value); + GdkColor color = _dw_internal_color(value); #else gdouble colors[4]; #endif @@ -8462,7 +8462,7 @@ */ } -GdkGC *_set_colors(GdkWindow *window) +GdkGC *_dw_set_colors(GdkWindow *window) { GdkGC *gc = NULL; GdkColor *foreground = pthread_getspecific(_dw_fg_color_key); @@ -8497,9 +8497,9 @@ DW_MUTEX_LOCK; if(handle) - gc = _set_colors(handle->window); + gc = _dw_set_colors(handle->window); else if(pixmap && pixmap->pixmap) - gc = _set_colors(pixmap->pixmap); + gc = _dw_set_colors(pixmap->pixmap); #if GTK_CHECK_VERSION(2,10,0) else if(pixmap && pixmap->image) cr = cairo_create(pixmap->image); @@ -8541,9 +8541,9 @@ DW_MUTEX_LOCK; if(handle) - gc = _set_colors(handle->window); + gc = _dw_set_colors(handle->window); else if(pixmap && pixmap->pixmap) - gc = _set_colors(pixmap->pixmap); + gc = _dw_set_colors(pixmap->pixmap); #if GTK_CHECK_VERSION(2,10,0) else if(pixmap && pixmap->image) cr = cairo_create(pixmap->image); @@ -8588,9 +8588,9 @@ DW_MUTEX_LOCK; if(handle) - gc = _set_colors(handle->window); + gc = _dw_set_colors(handle->window); else if(pixmap && pixmap->pixmap) - gc = _set_colors(pixmap->pixmap); + gc = _dw_set_colors(pixmap->pixmap); #if GTK_CHECK_VERSION(2,10,0) else if(pixmap && pixmap->image) cr = cairo_create(pixmap->image); @@ -8652,9 +8652,9 @@ DW_MUTEX_LOCK; if(handle) - gc = _set_colors(handle->window); + gc = _dw_set_colors(handle->window); else if(pixmap && pixmap->pixmap) - gc = _set_colors(pixmap->pixmap); + gc = _dw_set_colors(pixmap->pixmap); #if GTK_CHECK_VERSION(2,10,0) else if(pixmap && pixmap->image) cr = cairo_create(pixmap->image); @@ -8713,9 +8713,9 @@ DW_MUTEX_LOCK; if(handle) - gc = _set_colors(handle->window); + gc = _dw_set_colors(handle->window); else if(pixmap && pixmap->pixmap) - gc = _set_colors(pixmap->pixmap); + gc = _dw_set_colors(pixmap->pixmap); #if GTK_CHECK_VERSION(2,10,0) else if(pixmap && pixmap->image) cr = cairo_create(pixmap->image); @@ -8809,7 +8809,7 @@ { if((tmpname = (char *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_fontname"))) fontname = tmpname; - gc = _set_colors(handle->window); + gc = _dw_set_colors(handle->window); } else if(pixmap && pixmap->pixmap) { @@ -8817,7 +8817,7 @@ fontname = pixmap->font; else if((tmpname = (char *)gtk_object_get_data(GTK_OBJECT(pixmap->handle), "_dw_fontname"))) fontname = tmpname; - gc = _set_colors(pixmap->pixmap); + gc = _dw_set_colors(pixmap->pixmap); } #if GTK_CHECK_VERSION(2,10,0) else if(pixmap && pixmap->image) @@ -9103,7 +9103,7 @@ for ( i = 0; i < NUM_EXTS; i++ ) { strcpy( file, filename ); - strcat( file, image_exts[i] ); + strcat( file, _dw_image_exts[i] ); if ( access( file, 04 ) == 0 ) { found_ext = 1; @@ -9133,7 +9133,7 @@ pixmap->pixmap = gdk_imlib_copy_image(image); gdk_imlib_destroy_image(image); #else - pixmap->pixmap = gdk_pixmap_create_from_xpm(handle->window, &pixmap->bitmap, &_colors[DW_CLR_PALEGRAY], file); + pixmap->pixmap = gdk_pixmap_create_from_xpm(handle->window, &pixmap->bitmap, &_dw_colors[DW_CLR_PALEGRAY], file); #endif pixmap->handle = handle; DW_MUTEX_UNLOCK; @@ -9196,7 +9196,7 @@ pixmap->pixmap = gdk_imlib_copy_image(image); gdk_imlib_destroy_image(image); #else - pixmap->pixmap = gdk_pixmap_create_from_xpm_d(handle->window, &pixmap->bitmap, &_colors[DW_CLR_PALEGRAY], data); + pixmap->pixmap = gdk_pixmap_create_from_xpm_d(handle->window, &pixmap->bitmap, &_dw_colors[DW_CLR_PALEGRAY], data); #endif /* remove our temporary file */ unlink(template); @@ -9236,7 +9236,7 @@ DW_MUTEX_LOCK; - pixmap->pixmap = _find_pixmap(&pixmap->bitmap, (HICN)id, handle, &pixmap->width, &pixmap->height); + pixmap->pixmap = _dw_find_pixmap(&pixmap->bitmap, (HICN)id, handle, &pixmap->width, &pixmap->height); if(pixmap->pixmap) { #if GTK_MAJOR_VERSION < 2 @@ -9279,7 +9279,7 @@ { char *oldfont = pixmap->font; pixmap->font = strdup(fontname); - _convert_font(pixmap->font); + _dw_convert_font(pixmap->font); if(oldfont) free(oldfont); return DW_ERROR_NONE; @@ -9309,7 +9309,7 @@ #if GTK_CHECK_VERSION(2,10,0) /* Cairo version of dw_pixmap_bitblt() from GTK3, use if either pixmap is a cairo surface */ -int _cairo_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight) +int _dw_cairo_pixmap_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight) { int _locked_by_me = FALSE; cairo_t *cr = NULL; @@ -9426,7 +9426,7 @@ #if GTK_CHECK_VERSION(2,10,0) if((destp && destp->image) || (srcp && srcp->image)) - return _cairo_pixmap_bitblt(dest, destp, xdest, ydest, width, height, src, srcp, xsrc, ysrc, srcwidth, srcheight); + return _dw_cairo_pixmap_bitblt(dest, destp, xdest, ydest, width, height, src, srcp, xsrc, ysrc, srcwidth, srcheight); #endif if((!dest && (!destp || !destp->pixmap)) || (!src && (!srcp || !srcp->pixmap))) @@ -9437,9 +9437,9 @@ DW_MUTEX_LOCK; if(dest) - gc = _set_colors(dest->window); + gc = _dw_set_colors(dest->window); else if(src) - gc = _set_colors(src->window); + gc = _dw_set_colors(src->window); else if(destp) gc = gdk_gc_new(destp->pixmap); else if(srcp) @@ -9798,15 +9798,15 @@ return DW_ERROR_NONE; } -struct _seminfo { +struct _dw_seminfo { int fd; int waiting; }; -static void _handle_sem(int *tmpsock) +static void _dw_handle_sem(int *tmpsock) { fd_set rd; - struct _seminfo *array = (struct _seminfo *)malloc(sizeof(struct _seminfo)); + struct _dw_seminfo *array = (struct _dw_seminfo *)malloc(sizeof(struct _dw_seminfo)); int listenfd = tmpsock[0]; int bytesread, connectcount = 1, maxfd, z, posted = 0; char command; @@ -9853,14 +9853,14 @@ if(FD_ISSET(listenfd, &rd)) { - struct _seminfo *newarray; + struct _dw_seminfo *newarray; int newfd = accept(listenfd, 0, 0); if(newfd > -1) { /* Add new connections to the set */ - newarray = (struct _seminfo *)malloc(sizeof(struct _seminfo)*(connectcount+1)); - memcpy(newarray, array, sizeof(struct _seminfo)*(connectcount)); + newarray = (struct _dw_seminfo *)malloc(sizeof(struct _dw_seminfo)*(connectcount+1)); + memcpy(newarray, array, sizeof(struct _dw_seminfo)*(connectcount)); newarray[connectcount].fd = newfd; newarray[connectcount].waiting = 0; @@ -9880,17 +9880,17 @@ { if((bytesread = read(array[z].fd, &command, 1)) < 1) { - struct _seminfo *newarray; + struct _dw_seminfo *newarray; /* Remove this connection from the set */ - newarray = (struct _seminfo *)malloc(sizeof(struct _seminfo)*(connectcount-1)); + newarray = (struct _dw_seminfo *)malloc(sizeof(struct _dw_seminfo)*(connectcount-1)); if(!z) - memcpy(newarray, &array[1], sizeof(struct _seminfo)*(connectcount-1)); + memcpy(newarray, &array[1], sizeof(struct _dw_seminfo)*(connectcount-1)); else { - memcpy(newarray, array, sizeof(struct _seminfo)*z); + memcpy(newarray, array, sizeof(struct _dw_seminfo)*z); if(z!=(connectcount-1)) - memcpy(&newarray[z], &array[z+1], sizeof(struct _seminfo)*(z-connectcount-1)); + memcpy(&newarray[z], &array[z+1], sizeof(struct _dw_seminfo)*(z-connectcount-1)); } connectcount--; @@ -10002,7 +10002,7 @@ } /* Create a thread to handle this event semaphore */ - pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock); + pthread_create(&dwthread, NULL, (void *)_dw_handle_sem, (void *)tmpsock); return GINT_TO_POINTER(ev); } @@ -10130,7 +10130,7 @@ int dw_named_event_close(HEV eve) { /* Finally close the domain socket, - * cleanup will continue in _handle_sem. + * cleanup will continue in _dw_handle_sem. */ close(GPOINTER_TO_INT(eve)); return DW_ERROR_NONE; @@ -10360,7 +10360,7 @@ #define DW_EXPAND (GTK_EXPAND | GTK_SHRINK | GTK_FILL) /* Internal function that changes the attachment properties in a table. */ -void _rearrange_table(GtkWidget *widget, gpointer data) +void _dw_rearrange_table(GtkWidget *widget, gpointer data) { gint pos = GPOINTER_TO_INT(data); GtkContainer *cont = gtk_object_get_data(GTK_OBJECT(widget), "_dw_table"); @@ -10393,7 +10393,7 @@ } /* Internal function to get the recommended size of scrolled items */ -void _get_scrolled_size(GtkWidget *item, gint *thiswidth, gint *thisheight) +void _dw_get_scrolled_size(GtkWidget *item, gint *thiswidth, gint *thisheight) { GtkWidget *widget = gtk_object_get_user_data(GTK_OBJECT(item)); static char testtext[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -10579,7 +10579,7 @@ gtk_object_set_data(GTK_OBJECT(item), "_dw_table", box); if(index < boxcount) - gtk_container_forall(GTK_CONTAINER(box),_rearrange_table, GINT_TO_POINTER(boxtype == DW_VERT ? index : -(index+1))); + gtk_container_forall(GTK_CONTAINER(box),_dw_rearrange_table, GINT_TO_POINTER(boxtype == DW_VERT ? index : -(index+1))); gtk_table_attach(GTK_TABLE(box), item, x, x + 1, y, y + 1, hsize ? DW_EXPAND : 0, vsize ? DW_EXPAND : 0, pad, pad); gtk_object_set_data(GTK_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1)); { @@ -10592,7 +10592,7 @@ { gint scrolledwidth = 0, scrolledheight = 0; - _get_scrolled_size(item, &scrolledwidth, &scrolledheight); + _dw_get_scrolled_size(item, &scrolledwidth, &scrolledheight); if(width < 1 && !hsize) thiswidth = scrolledwidth; @@ -10675,7 +10675,7 @@ if((pos+1) < boxcount) { /* If we need to contract the table, reposition all the children */ - gtk_container_forall(GTK_CONTAINER(box),_rearrange_table_destroy, GINT_TO_POINTER(boxtype == DW_VERT ? pos : -(pos+1))); + gtk_container_forall(GTK_CONTAINER(box),_dw_rearrange_table_destroy, GINT_TO_POINTER(boxtype == DW_VERT ? pos : -(pos+1))); } if(boxcount > 0) @@ -10761,7 +10761,7 @@ if((pos+1) < boxcount) { /* If we need to contract the table, reposition all the children */ - gtk_container_forall(GTK_CONTAINER(box),_rearrange_table_destroy, GINT_TO_POINTER(boxtype == DW_VERT ? pos : -(pos+1))); + gtk_container_forall(GTK_CONTAINER(box),_dw_rearrange_table_destroy, GINT_TO_POINTER(boxtype == DW_VERT ? pos : -(pos+1))); } if(boxcount > 0) @@ -10835,15 +10835,15 @@ _dw_box_pack(box, item, 0, width, height, hsize, vsize, pad, "dw_box_pack_end()"); } -union extents_union { guchar **gu_extents; unsigned long **extents; }; -static GdkAtom extents_atom = 0; -static time_t extents_time = 0; +union _dw_extents_union { guchar **gu_extents; unsigned long **extents; }; +static GdkAtom _dw_extents_atom = 0; +static time_t _dw_extents_time = 0; static gboolean _dw_property_notify(GtkWidget *window, GdkEventProperty* event, GdkWindow *gdkwindow) { /* Check to see if we got a property change */ - if(event->state == GDK_PROPERTY_NEW_VALUE && event->atom == extents_atom && event->window == gdkwindow) - extents_time = 0; + if(event->state == GDK_PROPERTY_NEW_VALUE && event->atom == _dw_extents_atom && event->window == gdkwindow) + _dw_extents_time = 0; return FALSE; } @@ -10854,11 +10854,11 @@ { const char *request = "_NET_REQUEST_FRAME_EXTENTS"; unsigned long *extents = NULL; - union extents_union eu; + union _dw_extents_union eu; GdkAtom request_extents = gdk_atom_intern(request, FALSE); - if(!extents_atom) - extents_atom = gdk_atom_intern("_NET_FRAME_EXTENTS", FALSE); + if(!_dw_extents_atom) + _dw_extents_atom = gdk_atom_intern("_NET_FRAME_EXTENTS", FALSE); /* Set some rational defaults.. just in case */ *vert = 28; @@ -10892,7 +10892,7 @@ connid = gtk_signal_connect(GTK_OBJECT(window), "property_notify_event", GTK_SIGNAL_FUNC(_dw_property_notify), window->window); /* Record the request time */ - time(&extents_time); + time(&_dw_extents_time); /* Look for the property notify event */ do @@ -10900,7 +10900,7 @@ dw_main_iteration(); time(&currtime); } - while(currtime - extents_time < 2); + while(currtime - _dw_extents_time < 2); /* Remove the signal handler now that we are done */ gtk_signal_disconnect(GTK_OBJECT(window), connid); @@ -10909,7 +10909,7 @@ /* Attempt to retrieve window's frame extents. */ eu.extents = &extents; if(gdk_property_get(window->window, - extents_atom, + _dw_extents_atom, gdk_atom_intern("CARDINAL", FALSE), 0, sizeof(unsigned long)*4, FALSE, NULL, NULL, NULL, eu.gu_extents)) @@ -10942,7 +10942,7 @@ int cx = 0, cy = 0; #ifdef GDK_WINDOWING_X11 - _size_allocate(GTK_WINDOW(handle)); + _dw_size_allocate(GTK_WINDOW(handle)); #endif /* If the window is mapped */ if(handle->window && GTK_WIDGET_MAPPED(handle)) @@ -11010,7 +11010,7 @@ { gint scrolledwidth, scrolledheight; - _get_scrolled_size(handle, &scrolledwidth, &scrolledheight); + _dw_get_scrolled_size(handle, &scrolledwidth, &scrolledheight); if(width) *width = scrolledwidth; @@ -11417,7 +11417,7 @@ } /* Return the physical page id from the logical page id */ -int _get_physical_page(HWND handle, unsigned long pageid) +int _dw_get_physical_page(HWND handle, unsigned long pageid) { int z; GtkWidget *thispage, **pagearray = gtk_object_get_data(GTK_OBJECT(handle), "_dw_pagearray"); @@ -11448,7 +11448,7 @@ GtkWidget **pagearray; DW_MUTEX_LOCK; - realpage = _get_physical_page(handle, pageid); + realpage = _dw_get_physical_page(handle, pageid); if(realpage > -1 && realpage < 256) { gtk_notebook_remove_page(GTK_NOTEBOOK(handle), realpage); @@ -11470,7 +11470,7 @@ DW_MUTEX_LOCK; phys = gtk_notebook_get_current_page(GTK_NOTEBOOK(handle)); - retval = _get_logical_page(handle, phys); + retval = _dw_get_logical_page(handle, phys); DW_MUTEX_UNLOCK; return retval; } @@ -11486,7 +11486,7 @@ int realpage, _locked_by_me = FALSE; DW_MUTEX_LOCK; - realpage = _get_physical_page(handle, pageid); + realpage = _dw_get_physical_page(handle, pageid); if(realpage > -1 && realpage < 256) gtk_notebook_set_page(GTK_NOTEBOOK(handle), pageid); DW_MUTEX_UNLOCK; @@ -11506,7 +11506,7 @@ int realpage, _locked_by_me = FALSE; DW_MUTEX_LOCK; - realpage = _get_physical_page(handle, pageid); + realpage = _dw_get_physical_page(handle, pageid); if(realpage < 0 || realpage > 255) { char ptext[101] = {0}; @@ -11631,9 +11631,9 @@ list_item=gtk_list_item_new_with_label(text); if(font) - _set_font(GTK_LIST_ITEM(list_item)->item.bin.child, font); + _dw_set_font(GTK_LIST_ITEM(list_item)->item.bin.child, font); if(fore && back) - _set_color(GTK_LIST_ITEM(list_item)->item.bin.child, + _dw_set_color(GTK_LIST_ITEM(list_item)->item.bin.child, DW_RGB(fore->red, fore->green, fore->blue), DW_RGB(back->red, back->green, back->blue)); @@ -11692,9 +11692,9 @@ list_item=gtk_list_item_new_with_label(text); if(font) - _set_font(GTK_LIST_ITEM(list_item)->item.bin.child, font); + _dw_set_font(GTK_LIST_ITEM(list_item)->item.bin.child, font); if(fore && back) - _set_color(GTK_LIST_ITEM(list_item)->item.bin.child, + _dw_set_color(GTK_LIST_ITEM(list_item)->item.bin.child, DW_RGB(fore->red, fore->green, fore->blue), DW_RGB(back->red, back->green, back->blue)); @@ -11752,9 +11752,9 @@ list_item=gtk_list_item_new_with_label(*text); if(font) - _set_font(GTK_LIST_ITEM(list_item)->item.bin.child, font); + _dw_set_font(GTK_LIST_ITEM(list_item)->item.bin.child, font); if(fore && back) - _set_color(GTK_LIST_ITEM(list_item)->item.bin.child, + _dw_set_color(GTK_LIST_ITEM(list_item)->item.bin.child, DW_RGB(fore->red, fore->green, fore->blue), DW_RGB(back->red, back->green, back->blue)); @@ -12230,7 +12230,7 @@ } /* Reposition the bar according to the percentage */ -static gint _splitbar_size_allocate(GtkWidget *widget, GtkAllocation *event, gpointer data) +static gint _dw_splitbar_size_allocate(GtkWidget *widget, GtkAllocation *event, gpointer data) { float *percent = (float *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_percent"); @@ -12272,7 +12272,7 @@ gtk_object_set_data(GTK_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); *percent = 50.0; gtk_object_set_data(GTK_OBJECT(tmp), "_dw_percent", (gpointer)percent); - gtk_signal_connect(GTK_OBJECT(tmp), "size-allocate", GTK_SIGNAL_FUNC(_splitbar_size_allocate), NULL); + gtk_signal_connect(GTK_OBJECT(tmp), "size-allocate", GTK_SIGNAL_FUNC(_dw_splitbar_size_allocate), NULL); #if GTK_MAJOR_VERSION < 2 gtk_paned_set_handle_size(GTK_PANED(tmp), 3); #endif @@ -12444,7 +12444,7 @@ return; DW_MUTEX_LOCK; - gtk_signal_connect(GTK_OBJECT(window), "key_press_event", GTK_SIGNAL_FUNC(_default_key_press_event), next); + gtk_signal_connect(GTK_OBJECT(window), "key_press_event", GTK_SIGNAL_FUNC(_dw_default_key_press_event), next); DW_MUTEX_UNLOCK; } @@ -12600,7 +12600,7 @@ } /* The next few functions are support functions for the UNIX folder browser */ -static void _populate_directory(HWND tree, HTREEITEM parent, char *path) +static void _dw_populate_directory(HWND tree, HTREEITEM parent, char *path) { struct dirent *dent; HTREEITEM item; @@ -12662,7 +12662,7 @@ return FALSE; } -static char *_tree_folder(HWND tree, HTREEITEM item) +static char *_dw_tree_folder(HWND tree, HTREEITEM item) { char *folder=strdup(""); HTREEITEM parent = item; @@ -12686,7 +12686,7 @@ return folder; } -static int DWSIGNAL _item_select(HWND window, HTREEITEM item, char *text, void *data, void *itemdata) +static int DWSIGNAL _dw_item_select(HWND window, HTREEITEM item, char *text, void *data, void *itemdata) { DWDialog *dwwait = (DWDialog *)data; char *treedata = (char *)dw_window_get_data((HWND)dwwait->data, "_dw_tree_selected"); @@ -12695,13 +12695,13 @@ if(treedata) free(treedata); - treedata = _tree_folder(window, item); + treedata = _dw_tree_folder(window, item); dw_window_set_data((HWND)dwwait->data, "_dw_tree_selected", (void *)treedata); return FALSE; } -static int DWSIGNAL _tree_expand(HWND window, HTREEITEM item, void *data) +static int DWSIGNAL _dw_tree_expand(HWND window, HTREEITEM item, void *data) { DWDialog *dwwait = (DWDialog *)data; HWND tree = (HWND)dw_window_get_data((HWND)dwwait->data, "_dw_tree"); @@ -12709,12 +12709,12 @@ if(tempitem) { - char *folder = _tree_folder(tree, item); + char *folder = _dw_tree_folder(tree, item); dw_tree_item_set_data(tree, item, 0); if(*folder) - _populate_directory(tree, item, folder); + _dw_populate_directory(tree, item, folder); #if GTK_MAJOR_VERSION > 1 /* FIXME: GTK 1.x tree control goes crazy when @@ -12892,8 +12892,8 @@ dwwait = dw_dialog_new((void *)window); - dw_signal_connect(tree, DW_SIGNAL_ITEM_SELECT, DW_SIGNAL_FUNC(_item_select), (void *)dwwait); - dw_signal_connect(tree, DW_SIGNAL_TREE_EXPAND, DW_SIGNAL_FUNC(_tree_expand), (void *)dwwait); + dw_signal_connect(tree, DW_SIGNAL_ITEM_SELECT, DW_SIGNAL_FUNC(_dw_item_select), (void *)dwwait); + dw_signal_connect(tree, DW_SIGNAL_TREE_EXPAND, DW_SIGNAL_FUNC(_dw_tree_expand), (void *)dwwait); button = dw_button_new("Ok", 1001L); dw_box_pack_start(hbox, button, 50, 30, TRUE, FALSE, 3); @@ -13572,7 +13572,7 @@ /* Get the actual signal window handle not the user window handle * Should mimic the code in dw_signal_connect() below. */ -static HWND _find_signal_window(HWND window, const char *signame) +static HWND _dw_find_signal_window(HWND window, const char *signame) { HWND thiswindow = window; @@ -13605,7 +13605,7 @@ if(discfunc) { - SignalHandler work = _get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if(work.window) { @@ -13642,7 +13642,7 @@ */ void dw_signal_connect_data(HWND window, const char *signame, void *sigfunc, void *discfunc, void *data) { - void *thisfunc = _findsigfunc(signame); + void *thisfunc = _dw_findsigfunc(signame); char *thisname = (char *)signame; HWND thiswindow = window; int sigid, _locked_by_me = FALSE; @@ -13682,28 +13682,28 @@ if (GTK_IS_MENU_ITEM(thiswindow) && strcmp(signame, DW_SIGNAL_CLICKED) == 0) { thisname = "activate"; - thisfunc = _findsigfunc(thisname); + thisfunc = _dw_findsigfunc(thisname); } else if (GTK_IS_CLIST(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0) { thisname = "button_press_event"; - thisfunc = _findsigfunc(DW_SIGNAL_ITEM_CONTEXT); + thisfunc = _dw_findsigfunc(DW_SIGNAL_ITEM_CONTEXT); } #if GTK_MAJOR_VERSION > 1 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0) { - thisfunc = _findsigfunc("tree-context"); - - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); + thisfunc = _dw_findsigfunc("tree-context"); + + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; cid = g_signal_connect_data(G_OBJECT(thiswindow), "button_press_event", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); #if 0 - sigid = _set_signal_handler(window, window, sigfunc, data, thisfunc); + sigid = _dw_set_signal_handler(window, window, sigfunc, data, thisfunc); cid = gtk_signal_connect(GTK_OBJECT(window), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), (gpointer)sigid); - _set_signal_handler_id(window, sigid, cid); + _dw_set_signal_handler_id(window, sigid, cid); #endif DW_MUTEX_UNLOCK; @@ -13716,11 +13716,11 @@ thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow)); thisname = "changed"; - sigid = _set_signal_handler(treeview, window, sigfunc, data, thisfunc); + sigid = _dw_set_signal_handler(treeview, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)treeview; cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, (GCallback)thisfunc, params, _dw_signal_disconnect, 0); - _set_signal_handler_id(treeview, sigid, cid); + _dw_set_signal_handler_id(treeview, sigid, cid); DW_MUTEX_UNLOCK; return; } @@ -13731,21 +13731,21 @@ #else else if (GTK_IS_TREE(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0) { - thisfunc = _findsigfunc("tree-context"); - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); + thisfunc = _dw_findsigfunc("tree-context"); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_container_context_func", (gpointer)thisfunc); gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_container_context_data", params); cid = gtk_signal_connect(GTK_OBJECT(thiswindow), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), params); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS); - sigid = _set_signal_handler(window, window, sigfunc, data, thisfunc); + sigid = _dw_set_signal_handler(window, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; cid = gtk_signal_connect(GTK_OBJECT(window), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), params); - _set_signal_handler_id(window, sigid, cid); + _dw_set_signal_handler_id(window, sigid, cid); DW_MUTEX_UNLOCK; return; } @@ -13753,7 +13753,7 @@ { if(thisfunc) { - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_select_child_func", (gpointer)thisfunc); gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_select_child_data", GINT_TO_POINTER(sigid)); @@ -13764,7 +13764,7 @@ { if(thisfunc) { - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_tree_item_expand_func", (gpointer)thisfunc); gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_tree_item_expand_data", GINT_TO_POINTER(sigid)); @@ -13775,20 +13775,20 @@ #endif else if (GTK_IS_CLIST(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_ENTER) == 0) { - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _container_enter_event); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_container_enter_event); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; - cid = g_signal_connect_data(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_container_enter_event), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + cid = g_signal_connect_data(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_dw_container_enter_event), params, _dw_signal_disconnect, 0); + _dw_set_signal_handler_id(thiswindow, sigid, cid); params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS); thisname = "button_press_event"; - thisfunc = _findsigfunc(DW_SIGNAL_ITEM_ENTER); + thisfunc = _dw_findsigfunc(DW_SIGNAL_ITEM_ENTER); } else if (GTK_IS_CLIST(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_SELECT) == 0) { thisname = "select_row"; - thisfunc = (void *)_container_select_row; + thisfunc = (void *)_dw_container_select_row; } else if (GTK_IS_COMBO(thiswindow) && strcmp(signame, DW_SIGNAL_LIST_SELECT) == 0) { @@ -13808,21 +13808,21 @@ #ifdef USE_WEBKIT else if (WEBKIT_IS_WEB_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_HTML_CHANGED) == 0) { - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_STARTED); cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-started", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS); - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_LOADING); cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-committed", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS); params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_COMPLETE); @@ -13860,11 +13860,11 @@ return; } - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); DW_MUTEX_UNLOCK; } @@ -13881,19 +13881,19 @@ void **params = alloca(sizeof(void *) * 3); DW_MUTEX_LOCK; - params[2] = _find_signal_window(window, signame); + params[2] = _dw_find_signal_window(window, signame); count = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(params[2]), "_dw_sigcounter")); - thisfunc = _findsigfunc(signame); + thisfunc = _dw_findsigfunc(signame); for(z=0;z<count;z++) { - SignalHandler sh; + DWSignalHandler sh; params[0] = GINT_TO_POINTER(z); - sh = _get_signal_handler(params); + sh = _dw_get_signal_handler(params); if(sh.intfunc == thisfunc) - _remove_signal_handler((HWND)params[2], z); + _dw_remove_signal_handler((HWND)params[2], z); } DW_MUTEX_UNLOCK; } @@ -13910,11 +13910,11 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - thiswindow = _find_signal_window(window, NULL); + thiswindow = _dw_find_signal_window(window, NULL); count = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(thiswindow), "_dw_sigcounter")); for(z=0;z<count;z++) - _remove_signal_handler(thiswindow, z); + _dw_remove_signal_handler(thiswindow, z); gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_sigcounter", NULL); DW_MUTEX_UNLOCK; } @@ -13932,18 +13932,18 @@ void **params = alloca(sizeof(void *) * 3); DW_MUTEX_LOCK; - params[2] = _find_signal_window(window, NULL); + params[2] = _dw_find_signal_window(window, NULL); count = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(params[2]), "_dw_sigcounter")); for(z=0;z<count;z++) { - SignalHandler sh; + DWSignalHandler sh; params[0] = GINT_TO_POINTER(z); - sh = _get_signal_handler(params); + sh = _dw_get_signal_handler(params); if(sh.data == data) - _remove_signal_handler((HWND)params[2], z); + _dw_remove_signal_handler((HWND)params[2], z); } DW_MUTEX_UNLOCK; }
--- a/gtk3/dw.c Tue Jul 27 23:09:52 2021 +0000 +++ b/gtk3/dw.c Sun Aug 01 12:17:07 2021 +0000 @@ -74,7 +74,7 @@ * 77 = 119 = 0.4667 * 00 = 0 = 0.0000 */ -GdkRGBA _colors[] = +GdkRGBA _dw_colors[] = { { 0.0000, 0.0000, 0.0000, 1.0 }, /* 0 black */ { 0.7333, 0.0000, 0.0000, 1.0 }, /* 1 red */ @@ -98,7 +98,7 @@ * List those icons that have transparency first */ #define NUM_EXTS 9 -char *image_exts[NUM_EXTS] = +char *_dw_image_exts[NUM_EXTS] = { ".xpm", ".png", @@ -147,30 +147,30 @@ #define _DW_TREE_TYPE_COMBOBOX 4 /* Signal forwarder prototypes */ -static gint _button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static gint _button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static gint _motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data); -static gint _delete_event(GtkWidget *widget, GdkEvent *event, gpointer data); -static gint _key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data); -static gint _generic_event(GtkWidget *widget, gpointer data); -static gint _configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data); -static gint _activate_event(GtkWidget *widget, gpointer data); -static gint _container_enter_event(GtkWidget *widget, GdkEventAny *event, gpointer data); -static gint _combobox_select_event(GtkWidget *widget, gpointer data); -static gint _expose_event(GtkWidget *widget, cairo_t *cr, gpointer data); -static gint _set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data); -static gint _tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static gint _value_changed_event(GtkWidget *widget, gpointer user_data); -static gint _tree_select_event(GtkTreeSelection *sel, gpointer data); -static gint _tree_expand_event(GtkTreeView *treeview, GtkTreeIter *arg1, GtkTreePath *arg2, gpointer data); -static gint _switch_page_event(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data); -static gint _column_click_event(GtkWidget *widget, gpointer data); -static void _html_result_event(GObject *object, GAsyncResult *result, gpointer script_data); +static gint _dw_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data); +static gint _dw_button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data); +static gint _dw_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data); +static gint _dw_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data); +static gint _dw_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data); +static gint _dw_generic_event(GtkWidget *widget, gpointer data); +static gint _dw_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data); +static gint _dw_activate_event(GtkWidget *widget, gpointer data); +static gint _dw_container_enter_event(GtkWidget *widget, GdkEventAny *event, gpointer data); +static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data); +static gint _dw_expose_event(GtkWidget *widget, cairo_t *cr, gpointer data); +static gint _dw_set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data); +static gint _dw_tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data); +static gint _dw_value_changed_event(GtkWidget *widget, gpointer user_data); +static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data); +static gint _dw_tree_expand_event(GtkTreeView *treeview, GtkTreeIter *arg1, GtkTreePath *arg2, gpointer data); +static gint _dw_switch_page_event(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data); +static gint _dw_column_click_event(GtkWidget *widget, gpointer data); +static void _dw_html_result_event(GObject *object, GAsyncResult *result, gpointer script_data); #ifdef USE_WEBKIT #ifdef USE_WEBKIT2 -static void _html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data); +static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data); #else -static void _html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data); +static void _dw_html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data); #endif #endif static void _dw_signal_disconnect(gpointer data, GClosure *closure); @@ -188,7 +188,7 @@ void *func; char name[30]; -} SignalList; +} DWSignalList; typedef struct { @@ -198,36 +198,36 @@ gint cid; void *intfunc; -} SignalHandler; +} DWSignalHandler; #define SIGNALMAX 20 /* A list of signal forwarders, to account for paramater differences. */ -static SignalList SignalTranslate[SIGNALMAX] = { - { _configure_event, DW_SIGNAL_CONFIGURE }, - { _key_press_event, DW_SIGNAL_KEY_PRESS }, - { _button_press_event, DW_SIGNAL_BUTTON_PRESS }, - { _button_release_event, DW_SIGNAL_BUTTON_RELEASE }, - { _motion_notify_event, DW_SIGNAL_MOTION_NOTIFY }, - { _delete_event, DW_SIGNAL_DELETE }, - { _expose_event, DW_SIGNAL_EXPOSE }, - { _activate_event, "activate" }, - { _generic_event, DW_SIGNAL_CLICKED }, - { _container_enter_event, DW_SIGNAL_ITEM_ENTER }, - { _tree_context_event, DW_SIGNAL_ITEM_CONTEXT }, - { _combobox_select_event, DW_SIGNAL_LIST_SELECT }, - { _tree_select_event, DW_SIGNAL_ITEM_SELECT }, - { _set_focus_event, DW_SIGNAL_SET_FOCUS }, - { _value_changed_event, DW_SIGNAL_VALUE_CHANGED }, - { _switch_page_event, DW_SIGNAL_SWITCH_PAGE }, - { _column_click_event, DW_SIGNAL_COLUMN_CLICK }, - { _tree_expand_event, DW_SIGNAL_TREE_EXPAND }, +static DWSignalList DWSignalTranslate[SIGNALMAX] = { + { _dw_configure_event, DW_SIGNAL_CONFIGURE }, + { _dw_key_press_event, DW_SIGNAL_KEY_PRESS }, + { _dw_button_press_event, DW_SIGNAL_BUTTON_PRESS }, + { _dw_button_release_event, DW_SIGNAL_BUTTON_RELEASE }, + { _dw_motion_notify_event, DW_SIGNAL_MOTION_NOTIFY }, + { _dw_delete_event, DW_SIGNAL_DELETE }, + { _dw_expose_event, DW_SIGNAL_EXPOSE }, + { _dw_activate_event, "activate" }, + { _dw_generic_event, DW_SIGNAL_CLICKED }, + { _dw_container_enter_event, DW_SIGNAL_ITEM_ENTER }, + { _dw_tree_context_event, DW_SIGNAL_ITEM_CONTEXT }, + { _dw_combobox_select_event, DW_SIGNAL_LIST_SELECT }, + { _dw_tree_select_event, DW_SIGNAL_ITEM_SELECT }, + { _dw_set_focus_event, DW_SIGNAL_SET_FOCUS }, + { _dw_value_changed_event, DW_SIGNAL_VALUE_CHANGED }, + { _dw_switch_page_event, DW_SIGNAL_SWITCH_PAGE }, + { _dw_column_click_event, DW_SIGNAL_COLUMN_CLICK }, + { _dw_tree_expand_event, DW_SIGNAL_TREE_EXPAND }, #ifdef USE_WEBKIT - { _html_changed_event, DW_SIGNAL_HTML_CHANGED }, + { _dw_html_changed_event, DW_SIGNAL_HTML_CHANGED }, #else - { _generic_event, DW_SIGNAL_HTML_CHANGED }, -#endif - { _html_result_event, DW_SIGNAL_HTML_RESULT } + { _dw_generic_event, DW_SIGNAL_HTML_CHANGED }, +#endif + { _dw_html_result_event, DW_SIGNAL_HTML_RESULT } }; /* Alignment flags */ @@ -312,17 +312,17 @@ static void gtk_mdi_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height); /* Callbacks */ -static gboolean move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static gboolean resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static gboolean iconify_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static gboolean maximize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static gboolean kill_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_iconify_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_maximize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean _dw_mdi_kill_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data); static void gtk_mdi_add(GtkContainer *container, GtkWidget *widget); static void gtk_mdi_remove_true(GtkContainer *container, GtkWidget *widget); static void gtk_mdi_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); -static GtkMdiChild *get_child(GtkMdi *mdi, GtkWidget * widget); +static GtkMdiChild *_dw_mdi_get_child(GtkMdi *mdi, GtkWidget * widget); static GType gtk_mdi_get_type(void) { @@ -514,19 +514,19 @@ gdk_window_set_cursor (gtk_widget_get_window(bottom_event_box), cursor); g_signal_connect (G_OBJECT (top_event_box), "event", - G_CALLBACK (move_child_callback), + G_CALLBACK (_dw_mdi_move_child_callback), child); g_signal_connect (G_OBJECT (bottom_event_box), "event", - G_CALLBACK (resize_child_callback), + G_CALLBACK (_dw_mdi_resize_child_callback), child); g_signal_connect (G_OBJECT (button[0]), "button_press_event", - G_CALLBACK (iconify_child_callback), + G_CALLBACK (_dw_mdi_iconify_child_callback), child); g_signal_connect (G_OBJECT (button[1]), "button_press_event", - G_CALLBACK (maximize_child_callback), + G_CALLBACK (_dw_mdi_maximize_child_callback), child); g_signal_connect (G_OBJECT (button[2]), "button_press_event", - G_CALLBACK (kill_child_callback), + G_CALLBACK (_dw_mdi_kill_child_callback), child); } @@ -537,7 +537,7 @@ g_return_if_fail(GTK_IS_MDI(mdi)); g_return_if_fail(GTK_IS_WIDGET(widget)); - child = get_child(mdi, widget); + child = _dw_mdi_get_child(mdi, widget); g_return_if_fail(child); child->x = x; @@ -553,7 +553,7 @@ g_return_if_fail(GTK_IS_MDI (mdi)); g_return_if_fail(GTK_IS_WIDGET (widget)); - child = get_child(mdi, widget); + child = _dw_mdi_get_child(mdi, widget); g_return_if_fail(child); *x = child->x; @@ -567,7 +567,7 @@ g_return_if_fail (GTK_IS_MDI (mdi)); g_return_if_fail (GTK_IS_WIDGET (widget)); - child = get_child (mdi, widget); + child = _dw_mdi_get_child (mdi, widget); g_return_if_fail (child); child->state = state; @@ -580,7 +580,7 @@ GtkMdiChild *child; g_return_if_fail (GTK_IS_MDI (mdi)); - child = get_child (mdi, widget); + child = _dw_mdi_get_child (mdi, widget); g_return_if_fail (child); gtk_mdi_remove_true (GTK_CONTAINER (mdi), child->widget); } @@ -832,7 +832,7 @@ } } -static gboolean move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean _dw_mdi_move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data) { GtkMdi *mdi; GtkMdiChild *child; @@ -926,7 +926,7 @@ return FALSE; } -static gboolean resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean _dw_mdi_resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data) { GtkMdi *mdi; GtkMdiChild *child; @@ -1033,7 +1033,7 @@ return FALSE; } -static gboolean iconify_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean _dw_mdi_iconify_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data) { GtkMdiChild *child; child = (GtkMdiChild *) data; @@ -1050,7 +1050,7 @@ return FALSE; } -static gboolean maximize_child_callback (GtkWidget *widget, GdkEvent * event, gpointer data) +static gboolean _dw_mdi_maximize_child_callback (GtkWidget *widget, GdkEvent * event, gpointer data) { GtkMdiChild *child; child = (GtkMdiChild *) data; @@ -1067,7 +1067,7 @@ return FALSE; } -static gboolean kill_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean _dw_mdi_kill_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data) { GtkMdiChild *child; GtkMdi *mdi; @@ -1081,7 +1081,7 @@ return FALSE; } -static GtkMdiChild *get_child (GtkMdi *mdi, GtkWidget *widget) +static GtkMdiChild *_dw_mdi_get_child (GtkMdi *mdi, GtkWidget *widget) { GList *children; @@ -1122,21 +1122,21 @@ } /* Finds the translation function for a given signal name */ -static void *_findsigfunc(const char *signame) +static void *_dw_findsigfunc(const char *signame) { int z; for(z=0;z<SIGNALMAX;z++) { - if(strcasecmp(signame, SignalTranslate[z].name) == 0) - return SignalTranslate[z].func; + if(strcasecmp(signame, DWSignalTranslate[z].name) == 0) + return DWSignalTranslate[z].func; } return NULL; } -static SignalHandler _get_signal_handler(gpointer data) -{ - SignalHandler sh = {0}; +static DWSignalHandler _dw_get_signal_handler(gpointer data) +{ + DWSignalHandler sh = {0}; if(data) { @@ -1159,7 +1159,7 @@ return sh; } -static void _remove_signal_handler(GtkWidget *widget, int counter) +static void _dw_remove_signal_handler(GtkWidget *widget, int counter) { char text[100]; gint cid; @@ -1178,7 +1178,7 @@ g_object_set_data(G_OBJECT(widget), text, NULL); } -static int _set_signal_handler(GtkWidget *widget, HWND window, void *func, gpointer data, void *intfunc, void *discfunc) +static int _dw_set_signal_handler(GtkWidget *widget, HWND window, void *func, gpointer data, void *intfunc, void *discfunc) { int counter = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_sigcounter")); char text[100]; @@ -1200,7 +1200,7 @@ return counter - 1; } -static void _set_signal_handler_id(GtkWidget *widget, int counter, gint cid) +static void _dw_set_signal_handler_id(GtkWidget *widget, int counter, gint cid) { char text[100]; @@ -1208,7 +1208,7 @@ g_object_set_data(G_OBJECT(widget), text, GINT_TO_POINTER(cid)); } -static void _html_result_event(GObject *object, GAsyncResult *result, gpointer script_data) +static void _dw_html_result_event(GObject *object, GAsyncResult *result, gpointer script_data) { #if USE_WEBKIT2 pthread_t saved_thread = _dw_thread; @@ -1227,10 +1227,10 @@ _dw_thread = (pthread_t)-1; if(handlerdata) { - SignalHandler work; + DWSignalHandler work; void *params[3] = { GINT_TO_POINTER(handlerdata-1), 0, object }; - work = _get_signal_handler(params); + work = _dw_get_signal_handler(params); if(work.window) { @@ -1290,9 +1290,9 @@ #ifdef USE_WEBKIT #ifdef USE_WEBKIT2 -static void _html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); char *location = (char *)webkit_web_view_get_uri(web_view); int status = 0; @@ -1318,9 +1318,9 @@ } } #else -static void _html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static void _dw_html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); char *location = (char *)webkit_web_view_get_uri(web_view); int status = 0; void **params = data; @@ -1338,9 +1338,9 @@ #endif #endif -static gint _set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1352,9 +1352,9 @@ return retval; } -static gint _button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1372,9 +1372,9 @@ return retval; } -static gint _button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1392,9 +1392,9 @@ return retval; } -static gint _motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1424,9 +1424,9 @@ return retval; } -static gint _delete_event(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1438,9 +1438,9 @@ return retval; } -static gint _key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1457,9 +1457,9 @@ return retval; } -static gint _generic_event(GtkWidget *widget, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_generic_event(GtkWidget *widget, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1471,9 +1471,9 @@ return retval; } -static gint _activate_event(GtkWidget *widget, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_activate_event(GtkWidget *widget, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window && !_dw_ignore_click) @@ -1486,9 +1486,9 @@ return retval; } -static gint _configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1500,9 +1500,9 @@ return retval; } -static gint _expose_event(GtkWidget *widget, cairo_t *cr, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_expose_event(GtkWidget *widget, cairo_t *cr, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1523,9 +1523,9 @@ return retval; } -static gint _combobox_select_event(GtkWidget *widget, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(g_object_get_data(G_OBJECT(widget), "_dw_recursing")) @@ -1569,9 +1569,9 @@ #define _DW_DATA_TYPE_STRING 0 #define _DW_DATA_TYPE_POINTER 1 -static gint _tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1633,14 +1633,14 @@ return retval; } -static gint _tree_select_event(GtkTreeSelection *sel, gpointer data) +static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data) { GtkWidget *item = NULL, *widget = (GtkWidget *)gtk_tree_selection_get_tree_view(sel); int retval = FALSE; if(widget) { - SignalHandler work = _get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if(work.window) { @@ -1730,9 +1730,9 @@ return retval; } -static gint _tree_expand_event(GtkTreeView *widget, GtkTreeIter *iter, GtkTreePath *path, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_tree_expand_event(GtkTreeView *widget, GtkTreeIter *iter, GtkTreePath *path, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(!_dw_ignore_expand && work.window) @@ -1743,9 +1743,9 @@ return retval; } -static gint _container_enter_event(GtkWidget *widget, GdkEventAny *event, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_container_enter_event(GtkWidget *widget, GdkEventAny *event, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); GdkEventKey *keyevent = (GdkEventKey *)event; GdkEventButton *buttonevent = (GdkEventButton *)event; int retval = FALSE; @@ -1796,7 +1796,7 @@ } /* Return the logical page id from the physical page id */ -int _get_logical_page(HWND handle, unsigned long pageid) +int _dw_get_logical_page(HWND handle, unsigned long pageid) { int z; GtkWidget **pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray"); @@ -1814,20 +1814,20 @@ } -static gint _switch_page_event(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data) -{ - SignalHandler work = _get_signal_handler(data); +static gint _dw_switch_page_event(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data) +{ + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) { int (*switchpagefunc)(HWND, unsigned long, void *) = work.func; - retval = switchpagefunc(work.window, _get_logical_page(GTK_WIDGET(notebook), page_num), work.data); + retval = switchpagefunc(work.window, _dw_get_logical_page(GTK_WIDGET(notebook), page_num), work.data); } return retval; } -static gint _column_click_event(GtkWidget *widget, gpointer data) +static gint _dw_column_click_event(GtkWidget *widget, gpointer data) { void **params = data; int retval = FALSE; @@ -1839,10 +1839,10 @@ if(handlerdata) { - SignalHandler work; + DWSignalHandler work; params[0] = GINT_TO_POINTER(handlerdata-1); - work = _get_signal_handler(params); + work = _dw_get_signal_handler(params); if(work.window) { @@ -1855,7 +1855,7 @@ return retval; } -static int _round_value(gfloat val) +static int _dw_round_value(gfloat val) { int newval = (int)val; @@ -1865,7 +1865,7 @@ return newval; } -static gint _value_changed_event(GtkWidget *widget, gpointer data) +static gint _dw_value_changed_event(GtkWidget *widget, gpointer data) { GtkWidget *slider, *spinbutton, *scrollbar; GtkAdjustment *adjustment = (GtkAdjustment *)widget; @@ -1878,15 +1878,15 @@ spinbutton = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_spinbutton"); scrollbar = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_scrollbar"); - max = _round_value(gtk_adjustment_get_upper(adjustment)); - val = _round_value(gtk_adjustment_get_value(adjustment)); - - if(g_object_get_data(G_OBJECT(adjustment), "_dw_suppress_value_changed_event")) + max = _dw_round_value(gtk_adjustment_get_upper(adjustment)); + val = _dw_round_value(gtk_adjustment_get_value(adjustment)); + + if(g_object_get_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event")) return FALSE; if (slider || spinbutton || scrollbar) { - SignalHandler work = _get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if (work.window) { @@ -1901,7 +1901,7 @@ return FALSE; } -static gint _default_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) +static gint _dw_default_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { GtkWidget *next = (GtkWidget *)data; @@ -1938,7 +1938,7 @@ #endif } -static GdkPixbuf *_find_pixbuf(HICN icon, unsigned long *userwidth, unsigned long *userheight) +static GdkPixbuf *_dw_find_pixbuf(HICN icon, unsigned long *userwidth, unsigned long *userheight) { unsigned int id = GPOINTER_TO_INT(icon); GdkPixbuf *icon_pixbuf = NULL; @@ -2700,7 +2700,7 @@ /* Convert DW style font to CSS syntax (or Pango for older versions): * font: font-style font-variant font-weight font-size/line-height font-family */ -char *_convert_font(const char *font) +char *_dw_convert_font(const char *font) { char *newfont = NULL; @@ -2802,7 +2802,7 @@ int dw_window_set_font(HWND handle, const char *fontname) { GtkWidget *handle2 = handle; - char *font = _convert_font(fontname); + char *font = _dw_convert_font(fontname); int _locked_by_me = FALSE; gpointer data; @@ -2977,7 +2977,7 @@ return retfont; } -void _free_gdk_colors(HWND handle) +void _dw_free_gdk_colors(HWND handle) { GdkRGBA *old = (GdkRGBA *)g_object_get_data(G_OBJECT(handle), "_dw_foregdk"); @@ -2991,12 +2991,12 @@ } /* Free old color pointers and allocate new ones */ -static void _save_gdk_colors(HWND handle, GdkRGBA fore, GdkRGBA back) +static void _dw_save_gdk_colors(HWND handle, GdkRGBA fore, GdkRGBA back) { GdkRGBA *foregdk = malloc(sizeof(GdkRGBA)); GdkRGBA *backgdk = malloc(sizeof(GdkRGBA)); - _free_gdk_colors(handle); + _dw_free_gdk_colors(handle); *foregdk = fore; *backgdk = back; @@ -3005,7 +3005,7 @@ g_object_set_data(G_OBJECT(handle), "_dw_backgdk", (gpointer)backgdk); } -static int _set_color(HWND handle, unsigned long fore, unsigned long back) +static int _dw_set_color(HWND handle, unsigned long fore, unsigned long back) { /* Remember that each color component in X11 use 16 bit no matter * what the destination display supports. (and thus GDK) @@ -3020,7 +3020,7 @@ forecolor.blue = (gdouble)DW_BLUE_VALUE(fore) / 255.0; } else if(fore != DW_CLR_DEFAULT) - forecolor = _colors[fore]; + forecolor = _dw_colors[fore]; _dw_override_color(handle, "color", fore != DW_CLR_DEFAULT ? &forecolor : NULL); @@ -3032,11 +3032,11 @@ backcolor.blue = (gdouble)DW_BLUE_VALUE(back) / 255.0; } else if(back != DW_CLR_DEFAULT) - backcolor = _colors[back]; + backcolor = _dw_colors[back]; _dw_override_color(handle, "background-color", back != DW_CLR_DEFAULT ? &backcolor : NULL); - _save_gdk_colors(handle, forecolor, backcolor); + _dw_save_gdk_colors(handle, forecolor, backcolor); return TRUE; } @@ -3070,7 +3070,7 @@ } } - _set_color(handle2, fore, back); + _dw_set_color(handle2, fore, back); DW_MUTEX_UNLOCK; return TRUE; @@ -3137,7 +3137,7 @@ DW_MUTEX_LOCK; if(pointertype > 65535) { - GdkPixbuf *pixbuf = _find_pixbuf(GINT_TO_POINTER(pointertype), NULL, NULL); + GdkPixbuf *pixbuf = _dw_find_pixbuf(GINT_TO_POINTER(pointertype), NULL, NULL); cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf, 8, 8); } else if(!pointertype) @@ -3342,7 +3342,7 @@ else adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) ); if (adjustment) - val = _round_value(gtk_adjustment_get_value(adjustment)); + val = _dw_round_value(gtk_adjustment_get_value(adjustment)); DW_MUTEX_UNLOCK; return val; } @@ -3368,7 +3368,7 @@ adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) ); if (adjustment) { - range = _round_value(gtk_adjustment_get_upper(adjustment)); + range = _dw_round_value(gtk_adjustment_get_upper(adjustment)); } DW_MUTEX_UNLOCK; return range; @@ -3549,7 +3549,7 @@ } } -char _removetilde(char *dest, const char *src) +char _dw_removetilde(char *dest, const char *src) { int z, cur=0; char accel = '\0'; @@ -3597,7 +3597,7 @@ } DW_MUTEX_LOCK; - accel = _removetilde(tempbuf, title); + accel = _dw_removetilde(tempbuf, title); accel_group = (GtkAccelGroup *)g_object_get_data(G_OBJECT(menu), "_dw_accel"); submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu), "_dw_submenucount")); @@ -3673,7 +3673,7 @@ return tmphandle; } -GtkWidget *_find_submenu_id(GtkWidget *start, const char *name) +GtkWidget *_dw_find_submenu_id(GtkWidget *start, const char *name) { GtkWidget *tmp; int z, submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(start), "_dw_submenucount")); @@ -3690,7 +3690,7 @@ if((submenu = g_object_get_data(G_OBJECT(start), tempbuf))) { - if((menuitem = _find_submenu_id(submenu, name))) + if((menuitem = _dw_find_submenu_id(submenu, name))) return menuitem; } } @@ -3716,7 +3716,7 @@ DW_MUTEX_LOCK; snprintf(numbuf, 24, "%lu", id); - tmphandle = _find_submenu_id(menu, numbuf); + tmphandle = _dw_find_submenu_id(menu, numbuf); if(tmphandle) { @@ -3747,7 +3747,7 @@ DW_MUTEX_LOCK; snprintf(numbuf, 24, "%lu", id); - tmphandle = _find_submenu_id(menu, numbuf); + tmphandle = _dw_find_submenu_id(menu, numbuf); if ( (state & DW_MIS_CHECKED) || (state & DW_MIS_UNCHECKED) ) { @@ -3799,7 +3799,7 @@ DW_MUTEX_LOCK; snprintf(numbuf, 24, "%lu", id); - tmphandle = _find_submenu_id(menu, numbuf); + tmphandle = _dw_find_submenu_id(menu, numbuf); if(tmphandle) { @@ -3910,7 +3910,7 @@ #define _DW_TREE_TREE 2 #define _DW_TREE_LISTBOX 3 -GtkWidget *_tree_create(unsigned long id) +GtkWidget *_dw_tree_create(unsigned long id) { GtkWidget *tmp; @@ -3923,7 +3923,7 @@ return tmp; } -GtkWidget *_tree_setup(GtkWidget *tmp, GtkTreeModel *store) +GtkWidget *_dw_tree_setup(GtkWidget *tmp, GtkTreeModel *store) { GtkWidget *tree = gtk_tree_view_new_with_model(store); gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE); @@ -3948,7 +3948,7 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - if(!(tmp = _tree_create(id))) + if(!(tmp = _dw_tree_create(id))) { DW_MUTEX_UNLOCK; return 0; @@ -3975,13 +3975,13 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - if(!(tmp = _tree_create(id))) + if(!(tmp = _dw_tree_create(id))) { DW_MUTEX_UNLOCK; return 0; } store = gtk_tree_store_new(4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_POINTER); - tree = _tree_setup(tmp, GTK_TREE_MODEL(store)); + tree = _dw_tree_setup(tmp, GTK_TREE_MODEL(store)); g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE)); g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE)); col = gtk_tree_view_column_new(); @@ -4476,13 +4476,13 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - if(!(tmp = _tree_create(id))) + if(!(tmp = _dw_tree_create(id))) { DW_MUTEX_UNLOCK; return 0; } store = gtk_list_store_new(1, G_TYPE_STRING); - tree = _tree_setup(tmp, GTK_TREE_MODEL(store)); + tree = _dw_tree_setup(tmp, GTK_TREE_MODEL(store)); g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX)); g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX)); @@ -4523,7 +4523,7 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - icon_pixbuf = _find_pixbuf(icon, NULL, NULL); + icon_pixbuf = _dw_find_pixbuf(icon, NULL, NULL); if(gtk_widget_get_window(handle) && icon_pixbuf) { @@ -4556,7 +4556,7 @@ DW_MUTEX_LOCK; if(id) - tmp = _find_pixbuf((HICN)id, NULL, NULL); + tmp = _dw_find_pixbuf((HICN)id, NULL, NULL); else { char *file = alloca(strlen(filename) + 6); @@ -4576,7 +4576,7 @@ for ( i = 0; i < NUM_EXTS; i++ ) { strcpy( file, filename ); - strcat( file, image_exts[i] ); + strcat( file, _dw_image_exts[i] ); if ( access( file, 04 ) == 0 ) { found_ext = 1; @@ -4656,7 +4656,7 @@ unlink(template); } else if (id) - tmp = _find_pixbuf((HICN)id, NULL, NULL); + tmp = _dw_find_pixbuf((HICN)id, NULL, NULL); if(tmp) { @@ -5221,8 +5221,8 @@ adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment"); if(adjustment) { - int max = _round_value(gtk_adjustment_get_upper(adjustment)) - 1; - int thisval = _round_value(gtk_adjustment_get_value(adjustment)); + int max = _dw_round_value(gtk_adjustment_get_upper(adjustment)) - 1; + int thisval = _dw_round_value(gtk_adjustment_get_value(adjustment)); if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_VERTICAL) val = max - thisval; @@ -5251,7 +5251,7 @@ adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment"); if(adjustment) { - int max = _round_value(gtk_adjustment_get_upper(adjustment)) - 1; + int max = _dw_round_value(gtk_adjustment_get_upper(adjustment)) - 1; if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_VERTICAL) gtk_adjustment_set_value(adjustment, (gfloat)(max - position)); @@ -5277,7 +5277,7 @@ DW_MUTEX_LOCK; adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment"); if(adjustment) - val = _round_value(gtk_adjustment_get_value(adjustment)); + val = _dw_round_value(gtk_adjustment_get_value(adjustment)); DW_MUTEX_UNLOCK; return val; } @@ -5300,9 +5300,9 @@ adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment"); if(adjustment) { - g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_value_changed_event", GINT_TO_POINTER(1)); + g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(1)); gtk_adjustment_set_value(adjustment, (gfloat)position); - g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_value_changed_event", GINT_TO_POINTER(0)); + g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(0)); } DW_MUTEX_UNLOCK; } @@ -5466,7 +5466,7 @@ { iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter)); - pixbuf = _find_pixbuf(icon, NULL, NULL); + pixbuf = _dw_find_pixbuf(icon, NULL, NULL); gtk_tree_store_insert_after(store, iter, (GtkTreeIter *)parent, (GtkTreeIter *)item); gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1); @@ -5505,7 +5505,7 @@ { iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter)); - pixbuf = _find_pixbuf(icon, NULL, NULL); + pixbuf = _dw_find_pixbuf(icon, NULL, NULL); gtk_tree_store_append (store, iter, (GtkTreeIter *)parent); gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1); @@ -5539,7 +5539,7 @@ && GTK_IS_TREE_VIEW(tree) && (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree)))) { - pixbuf = _find_pixbuf(icon, NULL, NULL); + pixbuf = _dw_find_pixbuf(icon, NULL, NULL); gtk_tree_store_set(store, (GtkTreeIter *)item, 0, title, 1, pixbuf, -1); } @@ -5873,7 +5873,7 @@ } /* Create the store and then the tree */ store = gtk_list_store_newv(count + _DW_CONTAINER_STORE_EXTRA + 1, array); - tree = _tree_setup(handle, GTK_TREE_MODEL(store)); + tree = _dw_tree_setup(handle, GTK_TREE_MODEL(store)); g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER)); /* Second loop... create the columns */ for(z=0;z<count;z++) @@ -5929,7 +5929,7 @@ } g_object_set_data(G_OBJECT(col), "_dw_column", GINT_TO_POINTER(z)); params[2] = tree; - g_signal_connect_data(G_OBJECT(col), "clicked", G_CALLBACK(_column_click_event), (gpointer)params, _dw_signal_disconnect, 0); + g_signal_connect_data(G_OBJECT(col), "clicked", G_CALLBACK(_dw_column_click_event), (gpointer)params, _dw_signal_disconnect, 0); gtk_tree_view_column_set_title(col, titles[z]); if(flags[z] & DW_CFA_RIGHT) { @@ -6083,7 +6083,7 @@ for ( i = 0; i < NUM_EXTS; i++ ) { strcpy( file, filename ); - strcat( file, image_exts[i] ); + strcat( file, _dw_image_exts[i] ); if ( access( file, 04 ) == 0 ) { found_ext = 1; @@ -6222,7 +6222,7 @@ void **thisdata = (void **)data; HICN hicon = data ? *((HICN *)thisdata[0]) : 0; char *tmp = data ? (char *)thisdata[1] : NULL; - GdkPixbuf *pixbuf = hicon ? _find_pixbuf(hicon, NULL, NULL) : NULL; + GdkPixbuf *pixbuf = hicon ? _dw_find_pixbuf(hicon, NULL, NULL) : NULL; gtk_list_store_set(store, &iter, _DW_CONTAINER_STORE_EXTRA, pixbuf, -1); gtk_list_store_set(store, &iter, _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1); @@ -6230,7 +6230,7 @@ else if(flag & DW_CFA_BITMAPORICON) { HICN hicon = data ? *((HICN *)data) : 0; - GdkPixbuf *pixbuf = hicon ? _find_pixbuf(hicon, NULL, NULL) : NULL; + GdkPixbuf *pixbuf = hicon ? _dw_find_pixbuf(hicon, NULL, NULL) : NULL; gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, pixbuf, -1); } @@ -6887,7 +6887,7 @@ return retval; } -int _find_iter(GtkListStore *store, GtkTreeIter *iter, void *data, int textcomp) +int _dw_find_iter(GtkListStore *store, GtkTreeIter *iter, void *data, int textcomp) { int z, rows = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL); void *thisdata; @@ -6928,7 +6928,7 @@ { GtkTreeIter iter; - if(_find_iter(store, &iter, data, textcomp)) + if(_dw_find_iter(store, &iter, data, textcomp)) { GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter); @@ -6982,7 +6982,7 @@ GtkTreeIter iter; int rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount")); - if(_find_iter(store, &iter, data, textcomp)) + if(_dw_find_iter(store, &iter, data, textcomp)) { gtk_list_store_remove(store, &iter); rows--; @@ -7035,7 +7035,7 @@ } /* Translate the status message into a message on our buddy window */ -static void _status_translate(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) +static void _dw_status_translate(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) { GdkEventButton event = { 0 }; long x, y; @@ -7064,12 +7064,12 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - pixbuf = _find_pixbuf(icon, NULL, NULL); + pixbuf = _dw_find_pixbuf(icon, NULL, NULL); status = gtk_status_icon_new_from_pixbuf(pixbuf); if(bubbletext) gtk_status_icon_set_tooltip_text(status, bubbletext); g_object_set_data(G_OBJECT(handle), "_dw_taskbar", status); - g_signal_connect(G_OBJECT (status), "popup-menu", G_CALLBACK (_status_translate), handle); + g_signal_connect(G_OBJECT (status), "popup-menu", G_CALLBACK (_dw_status_translate), handle); gtk_status_icon_set_visible(status, TRUE); DW_MUTEX_UNLOCK; } @@ -7144,7 +7144,7 @@ } /* Returns a GdkRGBA from a DW color */ -static GdkRGBA _internal_color(unsigned long value) +static GdkRGBA _dw_internal_color(unsigned long value) { if(DW_RGB_COLOR & value) { @@ -7152,8 +7152,8 @@ return color; } if (value < 16) - return _colors[value]; - return _colors[0]; + return _dw_colors[value]; + return _dw_colors[0]; } /* Sets the current foreground drawing color. @@ -7164,7 +7164,7 @@ */ void dw_color_foreground_set(unsigned long value) { - GdkRGBA color = _internal_color(value); + GdkRGBA color = _dw_internal_color(value); GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key); *foreground = color; @@ -7190,7 +7190,7 @@ } else { - GdkRGBA color = _internal_color(value); + GdkRGBA color = _dw_internal_color(value); if(!background) { @@ -7211,7 +7211,7 @@ unsigned long API dw_color_choose(unsigned long value) { GtkColorChooser *cd; - GdkRGBA color = _internal_color(value); + GdkRGBA color = _dw_internal_color(value); int _locked_by_me = FALSE; unsigned long retcolor = value; @@ -7235,7 +7235,7 @@ static int _dw_color_active = 0; /* Internal function to handle the color OK press */ -static gint _gtk_color_ok(GtkWidget *widget, DWDialog *dwwait) +static gint _dw_color_ok(GtkWidget *widget, DWDialog *dwwait) { GdkRGBA color; unsigned long dw_color; @@ -7254,7 +7254,7 @@ } /* Internal function to handle the color Cancel press */ -static gint _gtk_color_cancel(GtkWidget *widget, DWDialog *dwwait) +static gint _dw_color_cancel(GtkWidget *widget, DWDialog *dwwait) { if(!dwwait) return FALSE; @@ -7277,7 +7277,7 @@ int _locked_by_me = FALSE; DWDialog *dwwait; GtkColorSelection *colorsel; - GdkRGBA color = _internal_color(value); + GdkRGBA color = _dw_internal_color(value); unsigned long dw_color; DW_MUTEX_LOCK; @@ -7299,8 +7299,8 @@ colorsel = (GtkColorSelection *)gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(colorw)); g_object_get(G_OBJECT(colorw), "ok-button", &ok_button, "cancel-button", &cancel_button, NULL); - g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(_gtk_color_ok), dwwait); - g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(_gtk_color_cancel), dwwait); + g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(_dw_color_ok), dwwait); + g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(_dw_color_cancel), dwwait); gtk_color_selection_set_previous_rgba(colorsel,&color); gtk_color_selection_set_current_rgba(colorsel,&color); @@ -7998,7 +7998,7 @@ for ( i = 0; i < NUM_EXTS; i++ ) { strcpy( file, filename ); - strcat( file, image_exts[i] ); + strcat( file, _dw_image_exts[i] ); if ( access( file, 04 ) == 0 ) { found_ext = 1; @@ -8099,7 +8099,7 @@ DW_MUTEX_LOCK; - pixmap->pixbuf = gdk_pixbuf_copy(_find_pixbuf((HICN)id, &pixmap->width, &pixmap->height)); + pixmap->pixbuf = gdk_pixbuf_copy(_dw_find_pixbuf((HICN)id, &pixmap->width, &pixmap->height)); DW_MUTEX_UNLOCK; return pixmap; } @@ -8141,7 +8141,7 @@ { char *oldfont = pixmap->font; - pixmap->font = _convert_font(fontname); + pixmap->font = _dw_convert_font(fontname); if(oldfont) free(oldfont); @@ -9132,7 +9132,7 @@ } /* Internal function to get the recommended size of scrolled items */ -void _get_scrolled_size(GtkWidget *item, gint *thiswidth, gint *thisheight) +void _dw_get_scrolled_size(GtkWidget *item, gint *thiswidth, gint *thisheight) { GtkWidget *widget = g_object_get_data(G_OBJECT(item), "_dw_user"); @@ -9373,7 +9373,7 @@ /* Pre-run the calculation code for MLE/Container/Tree if needed */ if((width < 1 && !hsize) || (height < 1 && !vsize)) - _get_scrolled_size(item, &scrolledwidth, &scrolledheight); + _dw_get_scrolled_size(item, &scrolledwidth, &scrolledheight); if(width > 0) gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), width); @@ -9640,15 +9640,15 @@ } -union extents_union { guchar **gu_extents; unsigned long **extents; }; -static GdkAtom extents_atom = 0; -static time_t extents_time = 0; +union _dw_extents_union { guchar **gu_extents; unsigned long **extents; }; +static GdkAtom _dw_extents_atom = 0; +static time_t _dw_extents_time = 0; static gboolean _dw_property_notify(GtkWidget *window, GdkEventProperty* event, GdkWindow *gdkwindow) { /* Check to see if we got a property change */ - if(event->state == GDK_PROPERTY_NEW_VALUE && event->atom == extents_atom && event->window == gdkwindow) - extents_time = 0; + if(event->state == GDK_PROPERTY_NEW_VALUE && event->atom == _dw_extents_atom && event->window == gdkwindow) + _dw_extents_time = 0; return FALSE; } @@ -9659,13 +9659,13 @@ { const char *request = "_NET_REQUEST_FRAME_EXTENTS"; unsigned long *extents = NULL; - union extents_union eu; + union _dw_extents_union eu; GdkAtom request_extents = gdk_atom_intern(request, FALSE); GdkWindow *gdkwindow = gtk_widget_get_window(window); GdkDisplay *display = gtk_widget_get_display(window); - if(!extents_atom) - extents_atom = gdk_atom_intern("_NET_FRAME_EXTENTS", FALSE); + if(!_dw_extents_atom) + _dw_extents_atom = gdk_atom_intern("_NET_FRAME_EXTENTS", FALSE); /* Set some rational defaults.. just in case */ *vert = 28; @@ -9698,7 +9698,7 @@ connid = g_signal_connect(G_OBJECT(window), "property_notify_event", G_CALLBACK(_dw_property_notify), gdkwindow); /* Record the request time */ - time(&extents_time); + time(&_dw_extents_time); /* Look for the property notify event */ do @@ -9706,7 +9706,7 @@ dw_main_iteration(); time(&currtime); } - while(currtime - extents_time < 2); + while(currtime - _dw_extents_time < 2); /* Remove the signal handler now that we are done */ g_signal_handler_disconnect(G_OBJECT(window), connid); @@ -9715,7 +9715,7 @@ /* Attempt to retrieve window's frame extents. */ eu.extents = &extents; if(gdk_property_get(gdkwindow, - extents_atom, + _dw_extents_atom, gdk_atom_intern("CARDINAL", FALSE), 0, sizeof(unsigned long)*4, FALSE, NULL, NULL, NULL, eu.gu_extents)) @@ -9811,7 +9811,7 @@ { gint scrolledwidth, scrolledheight; - _get_scrolled_size(handle, &scrolledwidth, &scrolledheight); + _dw_get_scrolled_size(handle, &scrolledwidth, &scrolledheight); if(width) *width = scrolledwidth; @@ -10306,7 +10306,7 @@ } /* Return the physical page id from the logical page id */ -int _get_physical_page(HWND handle, unsigned long pageid) +int _dw_get_physical_page(HWND handle, unsigned long pageid) { int z; GtkWidget *thispage, **pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray"); @@ -10337,7 +10337,7 @@ GtkWidget **pagearray; DW_MUTEX_LOCK; - realpage = _get_physical_page(handle, pageid); + realpage = _dw_get_physical_page(handle, pageid); if(realpage > -1 && realpage < 256) { gtk_notebook_remove_page(GTK_NOTEBOOK(handle), realpage); @@ -10359,7 +10359,7 @@ DW_MUTEX_LOCK; phys = gtk_notebook_get_current_page(GTK_NOTEBOOK(handle)); - retval = _get_logical_page(handle, phys); + retval = _dw_get_logical_page(handle, phys); DW_MUTEX_UNLOCK; return retval; } @@ -10375,7 +10375,7 @@ int realpage, _locked_by_me = FALSE; DW_MUTEX_LOCK; - realpage = _get_physical_page(handle, pageid); + realpage = _dw_get_physical_page(handle, pageid); if(realpage > -1 && realpage < 256) gtk_notebook_set_current_page(GTK_NOTEBOOK(handle), pageid); DW_MUTEX_UNLOCK; @@ -10395,7 +10395,7 @@ int realpage, _locked_by_me = FALSE; DW_MUTEX_LOCK; - realpage = _get_physical_page(handle, pageid); + realpage = _dw_get_physical_page(handle, pageid); if(realpage < 0 || realpage > 255) { char ptext[101] = {0}; @@ -11058,7 +11058,7 @@ } /* Function to do delayed positioning */ -gboolean _splitbar_set_percent(gpointer data) +gboolean _dw_splitbar_set_percent(gpointer data) { GtkWidget *widget = data; float *percent = (float *)g_object_get_data(G_OBJECT(widget), "_dw_percent"); @@ -11080,7 +11080,7 @@ } /* Reposition the bar according to the percentage */ -static gint _splitbar_size_allocate(GtkWidget *widget, GtkAllocation *event, gpointer data) +static gint _dw_splitbar_size_allocate(GtkWidget *widget, GtkAllocation *event, gpointer data) { float *percent = (float *)g_object_get_data(G_OBJECT(widget), "_dw_percent"); @@ -11088,7 +11088,7 @@ if(!percent || event->width < 20 || event->height < 20) return FALSE; - g_idle_add(_splitbar_set_percent, widget); + g_idle_add(_dw_splitbar_set_percent, widget); return FALSE; } @@ -11114,7 +11114,7 @@ g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); *percent = 50.0; g_object_set_data(G_OBJECT(tmp), "_dw_percent", (gpointer)percent); - g_signal_connect(G_OBJECT(tmp), "size-allocate", G_CALLBACK(_splitbar_size_allocate), NULL); + g_signal_connect(G_OBJECT(tmp), "size-allocate", G_CALLBACK(_dw_splitbar_size_allocate), NULL); gtk_widget_show(tmp); DW_MUTEX_UNLOCK; return tmp; @@ -11283,7 +11283,7 @@ return; DW_MUTEX_LOCK; - g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(_default_key_press_event), next); + g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(_dw_default_key_press_event), next); DW_MUTEX_UNLOCK; } @@ -11805,7 +11805,7 @@ DW_MUTEX_LOCK; if((web_view = _dw_html_web_view(handle))) #ifdef USE_WEBKIT2 - webkit_web_view_run_javascript(web_view, script, NULL, _html_result_event, scriptdata); + webkit_web_view_run_javascript(web_view, script, NULL, _dw_html_result_event, scriptdata); #else webkit_web_view_execute_script(web_view, script); #endif @@ -12246,7 +12246,7 @@ /* Get the actual signal window handle not the user window handle * Should mimic the code in dw_signal_connect() below. */ -static HWND _find_signal_window(HWND window, const char *signame) +static HWND _dw_find_signal_window(HWND window, const char *signame) { HWND thiswindow = window; @@ -12284,7 +12284,7 @@ if(discfunc) { - SignalHandler work = _get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if(work.window) { @@ -12308,7 +12308,7 @@ */ void dw_signal_connect_data(HWND window, const char *signame, void *sigfunc, void *discfunc, void *data) { - void *thisfunc = _findsigfunc(signame); + void *thisfunc = _dw_findsigfunc(signame); char *thisname = (char *)signame; HWND thiswindow = window; int sigid, _locked_by_me = FALSE; @@ -12352,15 +12352,15 @@ else if (GTK_IS_MENU_ITEM(thiswindow) && strcmp(signame, DW_SIGNAL_CLICKED) == 0) { thisname = "activate"; - thisfunc = _findsigfunc(thisname); + thisfunc = _dw_findsigfunc(thisname); } else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0) { - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; cid = g_signal_connect_data(G_OBJECT(thiswindow), "button_press_event", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); DW_MUTEX_UNLOCK; return; @@ -12372,7 +12372,7 @@ thisname = "changed"; - sigid = _set_signal_handler(widget, window, sigfunc, data, thisfunc, discfunc); + sigid = _dw_set_signal_handler(widget, window, sigfunc, data, thisfunc, discfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; if(GTK_IS_TREE_VIEW(thiswindow)) @@ -12382,9 +12382,9 @@ } else { - cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(_combobox_select_event), params, _dw_signal_disconnect, 0); - } - _set_signal_handler_id(widget, sigid, cid); + cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(_dw_combobox_select_event), params, _dw_signal_disconnect, 0); + } + _dw_set_signal_handler_id(widget, sigid, cid); DW_MUTEX_UNLOCK; return; @@ -12395,23 +12395,23 @@ } else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_ENTER) == 0) { - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _container_enter_event, discfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_container_enter_event, discfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; - cid = g_signal_connect_data(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_container_enter_event), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + cid = g_signal_connect_data(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_dw_container_enter_event), params, _dw_signal_disconnect, 0); + _dw_set_signal_handler_id(thiswindow, sigid, cid); params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS); thisname = "button_press_event"; - thisfunc = _findsigfunc(DW_SIGNAL_ITEM_ENTER); + thisfunc = _dw_findsigfunc(DW_SIGNAL_ITEM_ENTER); } else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_COLUMN_CLICK) == 0) { /* We don't actually need a signal handler here... just need to assign the handler ID * Since the handlers for the columns were already created in _dw_container_setup() */ - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _column_click_event, discfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_column_click_event, discfunc); g_object_set_data(G_OBJECT(thiswindow), "_dw_column_click_id", GINT_TO_POINTER(sigid+1)); DW_MUTEX_UNLOCK; return; @@ -12428,21 +12428,21 @@ #ifdef USE_WEBKIT2 thisname = "load-changed"; #else - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_STARTED); cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-started", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS); - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_LOADING); cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-committed", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS); params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_COMPLETE); @@ -12455,7 +12455,7 @@ /* We don't actually need a signal handler here... just need to assign the handler ID * Since the handler is created in dw_html_javasript_run() */ - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _html_result_event, discfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_html_result_event, discfunc); g_object_set_data(G_OBJECT(thiswindow), "_dw_html_result_id", GINT_TO_POINTER(sigid+1)); #ifndef USE_WEBKIT2 dw_debug("WARNING: DW_SIGNAL_HTML_RESULT will not be generated unless using webkit2gtk!\n"); @@ -12488,11 +12488,11 @@ return; } - sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc); + sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc); params[0] = GINT_TO_POINTER(sigid); params[2] = (void *)thiswindow; cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0); - _set_signal_handler_id(thiswindow, sigid, cid); + _dw_set_signal_handler_id(thiswindow, sigid, cid); DW_MUTEX_UNLOCK; } @@ -12509,19 +12509,19 @@ void **params = alloca(sizeof(void *) * 3); DW_MUTEX_LOCK; - params[2] = _find_signal_window(window, signame); + params[2] = _dw_find_signal_window(window, signame); count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter")); - thisfunc = _findsigfunc(signame); + thisfunc = _dw_findsigfunc(signame); for(z=0;z<count;z++) { - SignalHandler sh; + DWSignalHandler sh; params[0] = GINT_TO_POINTER(z); - sh = _get_signal_handler(params); + sh = _dw_get_signal_handler(params); if(sh.intfunc == thisfunc) - _remove_signal_handler((HWND)params[2], z); + _dw_remove_signal_handler((HWND)params[2], z); } DW_MUTEX_UNLOCK; } @@ -12538,11 +12538,11 @@ int _locked_by_me = FALSE; DW_MUTEX_LOCK; - thiswindow = _find_signal_window(window, NULL); + thiswindow = _dw_find_signal_window(window, NULL); count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter")); for(z=0;z<count;z++) - _remove_signal_handler(thiswindow, z); + _dw_remove_signal_handler(thiswindow, z); g_object_set_data(G_OBJECT(thiswindow), "_dw_sigcounter", NULL); DW_MUTEX_UNLOCK; } @@ -12560,18 +12560,18 @@ void **params = alloca(sizeof(void *) * 3); DW_MUTEX_LOCK; - params[2] = _find_signal_window(window, NULL); + params[2] = _dw_find_signal_window(window, NULL); count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter")); for(z=0;z<count;z++) { - SignalHandler sh; + DWSignalHandler sh; params[0] = GINT_TO_POINTER(z); - sh = _get_signal_handler(params); + sh = _dw_get_signal_handler(params); if(sh.data == data) - _remove_signal_handler((HWND)params[2], z); + _dw_remove_signal_handler((HWND)params[2], z); } DW_MUTEX_UNLOCK; }
--- a/gtk4/dw.c Tue Jul 27 23:09:52 2021 +0000 +++ b/gtk4/dw.c Sun Aug 01 12:17:07 2021 +0000 @@ -341,7 +341,7 @@ * 77 = 119 = 0.4667 * 00 = 0 = 0.0000 */ -GdkRGBA _colors[] = +GdkRGBA _dw_colors[] = { { 0.0000, 0.0000, 0.0000, 1.0 }, /* 0 black */ { 0.7333, 0.0000, 0.0000, 1.0 }, /* 1 red */ @@ -439,7 +439,7 @@ char gname[30]; GObject *(*setup)(struct _dw_signal_list *, GObject *, void *, void *, void *); -} SignalList; +} DWSignalList; /* Signal setup function prototypes */ GObject *_dw_key_setup(struct _dw_signal_list *signal, GObject *object, void *sigfunc, void *discfunc, void *data); @@ -462,10 +462,10 @@ gint cid; void *intfunc; -} SignalHandler; +} DWSignalHandler; /* A list of signal forwarders, to account for paramater differences. */ -static SignalList SignalTranslate[] = { +static DWSignalList DWSignalTranslate[] = { { _dw_configure_event, DW_SIGNAL_CONFIGURE, "resize", NULL }, { _dw_key_press_event, DW_SIGNAL_KEY_PRESS, "key-pressed", _dw_key_setup }, { _dw_button_press_event, DW_SIGNAL_BUTTON_PRESS, "pressed", _dw_mouse_setup }, @@ -523,18 +523,18 @@ int z=0; static SignalList empty = {0}; - while(SignalTranslate[z].func) - { - if(strcasecmp(signame, SignalTranslate[z].name) == 0) - return SignalTranslate[z]; + while(DWSignalTranslate[z].func) + { + if(strcasecmp(signame, DWSignalTranslate[z].name) == 0) + return DWSignalTranslate[z]; z++; } return empty; } -static SignalHandler _dw_get_signal_handler(gpointer data) -{ - SignalHandler sh = {0}; +static DWSignalHandler _dw_get_signal_handler(gpointer data) +{ + DWSignalHandler sh = {0}; if(data) { @@ -620,7 +620,7 @@ _dw_thread = (pthread_t)-1; if(handlerdata) { - SignalHandler work; + DWSignalHandler work; void *params[3] = { GINT_TO_POINTER(handlerdata-1), 0, object }; work = _dw_get_signal_handler(params); @@ -664,7 +664,7 @@ static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); char *location = (char *)webkit_web_view_get_uri(web_view); int status = 0; @@ -693,7 +693,7 @@ static void _dw_set_focus_event(GObject *window, GParamSpec *pspec, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); gboolean active; g_object_get(window, "is-active", &active, NULL); @@ -708,7 +708,7 @@ static gint _dw_button_press_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -728,7 +728,7 @@ static gint _dw_button_release_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -748,7 +748,7 @@ static gint _dw_motion_notify_event(GtkEventControllerMotion *controller, double x, double y, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -772,7 +772,7 @@ static gboolean _dw_delete_event(GtkWidget *window, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -786,7 +786,7 @@ static gint _dw_key_press_event(GtkEventControllerKey *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -805,7 +805,7 @@ static gint _dw_generic_event(GtkWidget *widget, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -819,7 +819,7 @@ static gint _dw_configure_event(GtkWidget *widget, int width, int height, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -893,7 +893,7 @@ static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(g_object_get_data(G_OBJECT(widget), "_dw_recursing")) @@ -939,7 +939,7 @@ static gint _dw_tree_context_event(GtkGestureSingle *gesture, int n_press, double x, double y, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1014,7 +1014,7 @@ if(widget) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if(work.window) { @@ -1106,7 +1106,7 @@ static gint _dw_tree_expand_event(GtkTreeView *widget, GtkTreeIter *iter, GtkTreePath *path, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1119,7 +1119,7 @@ static gint _dw_container_enter_event(GtkEventController *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window && GTK_IS_WIDGET(work.window)) @@ -1194,7 +1194,7 @@ static gint _dw_switch_page_event(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); int retval = FALSE; if(work.window) @@ -1217,7 +1217,7 @@ if(handlerdata) { - SignalHandler work; + DWSignalHandler work; params[0] = GINT_TO_POINTER(handlerdata-1); work = _dw_get_signal_handler(params); @@ -1264,7 +1264,7 @@ if(slider || spinbutton || scrollbar) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if (work.window) { @@ -1355,7 +1355,7 @@ /* Handle menu click callbacks */ static void _dw_menu_handler(GSimpleAction *action, GVariant *param, gpointer data) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); GVariant *action_state = g_action_get_state(G_ACTION(action)); /* Handle toggling checkable menu items automatically, before the callback */ @@ -2309,7 +2309,7 @@ forecolor.blue = (gdouble)DW_BLUE_VALUE(fore) / 255.0; } else if(fore != DW_CLR_DEFAULT) - forecolor = _colors[fore]; + forecolor = _dw_colors[fore]; _dw_override_color(handle, "color", fore != DW_CLR_DEFAULT ? &forecolor : NULL); @@ -2321,7 +2321,7 @@ backcolor.blue = (gdouble)DW_BLUE_VALUE(back) / 255.0; } else if(back != DW_CLR_DEFAULT) - backcolor = _colors[back]; + backcolor = _dw_colors[back]; _dw_override_color(handle, "background-color", back != DW_CLR_DEFAULT ? &backcolor : NULL); @@ -6418,8 +6418,8 @@ return color; } if (value < 16) - return _colors[value]; - return _colors[0]; + return _dw_colors[value]; + return _dw_colors[0]; } /* Sets the current foreground drawing color. @@ -10735,7 +10735,7 @@ if(discfunc) { - SignalHandler work = _dw_get_signal_handler(data); + DWSignalHandler work = _dw_get_signal_handler(data); if(work.window) { @@ -10972,7 +10972,7 @@ { for(z=0;z<count;z++) { - SignalHandler sh; + DWSignalHandler sh; params[0] = GINT_TO_POINTER(z); sh = _dw_get_signal_handler(params); @@ -11017,7 +11017,7 @@ for(z=0;z<count;z++) { - SignalHandler sh; + DWSignalHandler sh; params[0] = GINT_TO_POINTER(z); sh = _dw_get_signal_handler(params);
--- a/ios/dw.m Tue Jul 27 23:09:52 2021 +0000 +++ b/ios/dw.m Sun Aug 01 12:17:07 2021 +0000 @@ -248,9 +248,9 @@ pthread_setspecific(_dw_bg_color_key, NULL); } -typedef struct _sighandler -{ - struct _sighandler *next; +typedef struct _dwsighandler +{ + struct _dwsighandler *next; ULONG message; HWND window; int id; @@ -258,9 +258,9 @@ void *discfunction; void *data; -} SignalHandler; - -static SignalHandler *DWRoot = NULL; +} DWSignalHandler; + +static DWSignalHandler *DWRoot = NULL; /* Some internal prototypes */ static void _dw_do_resize(Box *thisbox, int x, int y); @@ -286,9 +286,9 @@ } } -SignalHandler *_dw_get_handler(HWND window, int messageid) -{ - SignalHandler *tmp = DWRoot; +DWSignalHandler *_dw_get_handler(HWND window, int messageid) +{ + DWSignalHandler *tmp = DWRoot; /* Find any callbacks for this function */ while(tmp) @@ -336,7 +336,7 @@ int _dw_event_handler1(id object, id event, int message) { - SignalHandler *handler = _dw_get_handler(object, message); + DWSignalHandler *handler = _dw_get_handler(object, message); /* NSLog(@"Event handler - type %d\n", message); */ if(handler) @@ -2739,7 +2739,7 @@ */ void _dw_new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *discfunc, void *data) { - SignalHandler *new = malloc(sizeof(SignalHandler)); + DWSignalHandler *new = malloc(sizeof(DWSignalHandler)); new->message = message; new->window = window; @@ -2753,7 +2753,7 @@ DWRoot = new; else { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; while(tmp) { if(tmp->message == message && @@ -9495,7 +9495,7 @@ DW_FUNCTION_NO_RETURN(dw_timer_disconnect) DW_FUNCTION_RESTORE_PARAM1(timerid, HTIMER) { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; /* 0 is an invalid timer ID */ if(timerid) @@ -9579,7 +9579,7 @@ */ void API dw_signal_disconnect_by_name(HWND window, const char *signame) { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; ULONG message; if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0) @@ -9624,7 +9624,7 @@ */ void API dw_signal_disconnect_by_window(HWND window) { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; while(tmp) { @@ -9666,7 +9666,7 @@ */ void API dw_signal_disconnect_by_data(HWND window, void *data) { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; while(tmp) {
--- a/mac/dw.m Tue Jul 27 23:09:52 2021 +0000 +++ b/mac/dw.m Sun Aug 01 12:17:07 2021 +0000 @@ -469,9 +469,9 @@ pthread_setspecific(_dw_bg_color_key, NULL); } -typedef struct _sighandler -{ - struct _sighandler *next; +typedef struct _dwsighandler +{ + struct _dwsighandler *next; ULONG message; HWND window; int id; @@ -479,9 +479,9 @@ void *discfunction; void *data; -} SignalHandler; - -static SignalHandler *DWRoot = NULL; +} DWSignalHandler; + +static DWSignalHandler *DWRoot = NULL; /* Some internal prototypes */ static void _dw_do_resize(Box *thisbox, int x, int y); @@ -507,9 +507,9 @@ } } -SignalHandler *_dw_get_handler(HWND window, int messageid) -{ - SignalHandler *tmp = DWRoot; +DWSignalHandler *_dw_get_handler(HWND window, int messageid) +{ + DWSignalHandler *tmp = DWRoot; /* Find any callbacks for this function */ while(tmp) @@ -557,7 +557,7 @@ int _dw_event_handler1(id object, NSEvent *event, int message) { - SignalHandler *handler = _dw_get_handler(object, message); + DWSignalHandler *handler = _dw_get_handler(object, message); /* NSLog(@"Event handler - type %d\n", message); */ if(handler) @@ -3587,7 +3587,7 @@ */ void _dw_new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *discfunc, void *data) { - SignalHandler *new = malloc(sizeof(SignalHandler)); + DWSignalHandler *new = malloc(sizeof(DWSignalHandler)); new->message = message; new->window = window; @@ -3601,7 +3601,7 @@ DWRoot = new; else { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; while(tmp) { if(tmp->message == message && @@ -11555,7 +11555,7 @@ */ void API dw_timer_disconnect(HTIMER timerid) { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; NSTimer *thistimer; /* 0 is an invalid timer ID */ @@ -11640,7 +11640,7 @@ */ void API dw_signal_disconnect_by_name(HWND window, const char *signame) { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; ULONG message; if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0) @@ -11685,7 +11685,7 @@ */ void API dw_signal_disconnect_by_window(HWND window) { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; while(tmp) { @@ -11727,7 +11727,7 @@ */ void API dw_signal_disconnect_by_data(HWND window, void *data) { - SignalHandler *prev = NULL, *tmp = DWRoot; + DWSignalHandler *prev = NULL, *tmp = DWRoot; while(tmp) {
--- a/os2/dw.c Tue Jul 27 23:09:52 2021 +0000 +++ b/os2/dw.c Sun Aug 01 12:17:07 2021 +0000 @@ -92,7 +92,7 @@ * GBM List of supported formats: BMP, PNG, JPEG, Targa, TIFF and XPM. */ #define NUM_EXTS 8 -char *image_exts[NUM_EXTS] = +char *_dw_image_exts[NUM_EXTS] = { ".bmp", ".png", @@ -114,15 +114,15 @@ HAB dwhab = 0; HMQ dwhmq = 0; DWTID _dwtid = 0; -LONG _foreground = 0xAAAAAA, _background = DW_CLR_DEFAULT; - -HWND hwndApp = NULLHANDLE, hwndBubble = NULLHANDLE, hwndBubbleLast = NULLHANDLE, hwndEmph = NULLHANDLE; -HWND hwndTrayServer = NULLHANDLE, hwndTaskBar = NULLHANDLE; - -PRECORDCORE pCoreEmph = NULL; -ULONG aulBuffer[4]; -HWND lasthcnr = 0, lastitem = 0, popup = 0, desktop; -HMOD wpconfig = 0, pmprintf = 0, pmmerge = 0, gbm = 0; +LONG _dw_foreground = 0xAAAAAA, _dw_background = DW_CLR_DEFAULT; + +HWND _dw_app = NULLHANDLE, _dw_bubble = NULLHANDLE, _dw_bubble_last = NULLHANDLE, _dw_emph = NULLHANDLE; +HWND _dw_tray = NULLHANDLE, _dw_task_bar = NULLHANDLE; + +PRECORDCORE _dw_core_emph = NULL; +ULONG _dw_ver_buf[4]; +HWND _dw_lasthcnr = 0, _dw_lastitem = 0, _dw_popup = 0, _dw_desktop; +HMOD _dw_wpconfig = 0, _dw_pmprintf = 0, _dw_pmmerge = 0, _dw_gbm = 0; static char _dw_exec_dir[MAX_PATH+1] = {0}; #ifdef UNICODE @@ -132,7 +132,7 @@ UconvObject Uconv; /* conversion object */ #endif -unsigned long _colors[] = { +unsigned long _dw_colors[] = { CLR_BLACK, CLR_DARKRED, CLR_DARKGREEN, @@ -153,15 +153,15 @@ #define DW_OS2_NEW_WINDOW 1 -#define IS_WARP4() (aulBuffer[0] == 20 && aulBuffer[1] >= 40) +#define IS_WARP4() (_dw_ver_buf[0] == 20 && _dw_ver_buf[1] >= 40) #ifndef min #define min(a, b) (((a < b) ? a : b)) #endif -typedef struct _sighandler -{ - struct _sighandler *next; +typedef struct _dwsighandler +{ + struct _dwsighandler *next; ULONG message; HWND window; int id; @@ -169,9 +169,9 @@ void *discfunction; void *data; -} SignalHandler; - -SignalHandler *Root = NULL; +} DWSignalHandler; + +DWSignalHandler *Root = NULL; typedef struct { @@ -219,7 +219,7 @@ */ void _dw_new_signal(ULONG message, HWND window, int id, void *signalfunction, void *discfunc, void *data) { - SignalHandler *new = malloc(sizeof(SignalHandler)); + DWSignalHandler *new = malloc(sizeof(DWSignalHandler)); new->message = message; new->window = window; @@ -233,7 +233,7 @@ Root = new; else { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; while(tmp) { if(tmp->message == message && @@ -304,11 +304,11 @@ { HWND box, lastbox = WinQueryWindow(handle, QW_PARENT); - if(lastbox == desktop) + if(lastbox == _dw_desktop) return handle; /* Find the toplevel window */ - while((box = WinQueryWindow(lastbox, QW_PARENT)) != desktop && box) + while((box = WinQueryWindow(lastbox, QW_PARENT)) != _dw_desktop && box) { lastbox = box; } @@ -573,13 +573,13 @@ char buffer[31] = {0}; sprintf(buffer, "_dw_id%d", menuid); - dw_window_set_data( hwndApp, buffer, NULL ); + dw_window_set_data( _dw_app, buffer, NULL ); sprintf(buffer, "_dw_checkable%d", menuid); - dw_window_set_data( hwndApp, buffer, NULL ); + dw_window_set_data( _dw_app, buffer, NULL ); sprintf(buffer, "_dw_ischecked%d", menuid); - dw_window_set_data( hwndApp, buffer, NULL ); + dw_window_set_data( _dw_app, buffer, NULL ); sprintf(buffer, "_dw_isdisabled%d", menuid); - dw_window_set_data( hwndApp, buffer, NULL ); + dw_window_set_data( _dw_app, buffer, NULL ); } /* Check any submenus */ @@ -985,7 +985,7 @@ unsigned long _dw_internal_color(unsigned long color) { if(color < 16) - return _colors[color]; + return _dw_colors[color]; return color; } @@ -1628,10 +1628,10 @@ { case 0x041f: /* Mouse has left the area.. remove tooltip and stop timer */ - if(hwndBubble) + if(_dw_bubble) { - WinDestroyWindow(hwndBubble); - hwndBubble = 0; + WinDestroyWindow(_dw_bubble); + _dw_bubble = 0; } if(hstart) WinStopTimer(dwhab, hstart, 1); @@ -1653,10 +1653,10 @@ case WM_TIMER: if((int)mp1 == 1 || (int)mp1 == 2) { - if(hwndBubble) + if(_dw_bubble) { - WinDestroyWindow(hwndBubble); - hwndBubble = 0; + WinDestroyWindow(_dw_bubble); + _dw_bubble = 0; } /* Either starting or ending... remove tooltip and timers */ if(hstart) @@ -1675,8 +1675,8 @@ ULONG ulColor = CLR_YELLOW; void *bubbleproc; - hwndBubbleLast = hwnd; - hwndBubble = WinCreateWindow(HWND_DESKTOP, + _dw_bubble_last = hwnd; + _dw_bubble = WinCreateWindow(HWND_DESKTOP, WC_STATIC, NULL, SS_TEXT | @@ -1689,23 +1689,23 @@ NULL, NULL); - WinSetPresParam(hwndBubble, + WinSetPresParam(_dw_bubble, PP_FONTNAMESIZE, strlen(DefaultFont)+1, DefaultFont); - WinSetPresParam(hwndBubble, + WinSetPresParam(_dw_bubble, PP_BACKGROUNDCOLORINDEX, sizeof(ulColor), &ulColor); - WinSetWindowText(hwndBubble, + WinSetWindowText(_dw_bubble, (PSZ)blah->bubbletext); WinMapWindowPoints(hwnd, HWND_DESKTOP, &ptlWork, 1); - hpsTemp = WinGetPS(hwndBubble); + hpsTemp = WinGetPS(_dw_bubble); GpiQueryTextBox(hpsTemp, strlen(blah->bubbletext), (PCH)blah->bubbletext, @@ -1729,12 +1729,12 @@ ptlWork.x = 0; } - bubbleproc = (void *)WinSubclassWindow(hwndBubble, _dw_bubbleproc); + bubbleproc = (void *)WinSubclassWindow(_dw_bubble, _dw_bubbleproc); if(bubbleproc) - WinSetWindowPtr(hwndBubble, QWP_USER, bubbleproc); - - WinSetWindowPos(hwndBubble, + WinSetWindowPtr(_dw_bubble, QWP_USER, bubbleproc); + + WinSetWindowPos(_dw_bubble, HWND_TOP, ptlWork.x, ptlWork.y, @@ -2216,7 +2216,7 @@ if(strncmp(tmpbuf, "#3", 3)==0) { /* Generate click on default item */ - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; /* Find any callbacks for this function */ while(tmp) @@ -2898,10 +2898,10 @@ void _dw_clear_emphasis(void) { - if(hwndEmph && WinIsWindow(dwhab, hwndEmph) && pCoreEmph) - WinSendMsg(hwndEmph, CM_SETRECORDEMPHASIS, pCoreEmph, MPFROM2SHORT(FALSE, CRA_SOURCE)); - hwndEmph = NULLHANDLE; - pCoreEmph = NULL; + if(_dw_emph && WinIsWindow(dwhab, _dw_emph) && _dw_core_emph) + WinSendMsg(_dw_emph, CM_SETRECORDEMPHASIS, _dw_core_emph, MPFROM2SHORT(FALSE, CRA_SOURCE)); + _dw_emph = NULLHANDLE; + _dw_core_emph = NULL; } /* Find the desktop window handle */ @@ -2928,7 +2928,7 @@ MRESULT EXPENTRY _dw_run_event(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2) { int result = -1; - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; ULONG origmsg = msg; if(msg == WM_BUTTON2DOWN || msg == WM_BUTTON3DOWN) @@ -3150,7 +3150,7 @@ } else if(tmp->window < 65536 && command == tmp->window) { - result = clickfunc(popup ? popup : tmp->window, tmp->data); + result = clickfunc(_dw_popup ? _dw_popup : tmp->window, tmp->data); tmp = NULL; } } @@ -3243,10 +3243,10 @@ { PRECORDCORE rc = (PRECORDCORE)mp2; - if(pCoreEmph) + if(_dw_core_emph) _dw_clear_emphasis(); - hwndEmph = tmp->window; - pCoreEmph = mp2; + _dw_emph = tmp->window; + _dw_core_emph = mp2; WinSendMsg(tmp->window, CM_SETRECORDEMPHASIS, mp2, MPFROM2SHORT(TRUE, CRA_SOURCE)); user = rc->pszText; } @@ -3281,15 +3281,15 @@ result = treeselectfunc(tmp->window, 0, (char *)prc->pszIcon, tmp->data, (void *)prc->pszText); else { - if(lasthcnr == tmp->window && lastitem == (HWND)pci) + if(_dw_lasthcnr == tmp->window && _dw_lastitem == (HWND)pci) { - lasthcnr = 0; - lastitem = 0; + _dw_lasthcnr = 0; + _dw_lastitem = 0; } else { - lasthcnr = tmp->window; - lastitem = (HWND)pci; + _dw_lasthcnr = tmp->window; + _dw_lastitem = (HWND)pci; result = treeselectfunc(tmp->window, (HTREEITEM)pci, (char *)pci->rc.pszIcon, tmp->data, pci->user); } } @@ -3746,7 +3746,7 @@ break; case WM_DDE_INITIATEACK: /* aswer dde server */ - hwndTrayServer = (HWND)mp1; + _dw_tray = (HWND)mp1; break; case WM_BUTTON1DOWN | 0x2000: case WM_BUTTON2DOWN | 0x2000: @@ -3754,8 +3754,8 @@ case WM_BUTTON1UP | 0x2000: case WM_BUTTON2UP | 0x2000: case WM_BUTTON3UP | 0x2000: - if(hwndTaskBar) - result = (int)_dw_run_event(hwndTaskBar, msg & ~0x2000, mp1, mp2); + if(_dw_task_bar) + result = (int)_dw_run_event(_dw_task_bar, msg & ~0x2000, mp1, mp2); break; case WM_USER+2: _dw_clear_emphasis(); @@ -4119,7 +4119,7 @@ break; case WM_BUTTON1UP: { - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; if(WinIsWindowEnabled(hwnd) && !dw_window_get_data(hwnd, "_dw_disabled")) { @@ -4149,7 +4149,7 @@ break; case WM_USER: { - SignalHandler *tmp = (SignalHandler *)mp1; + DWSignalHandler *tmp = (DWSignalHandler *)mp1; int (API_FUNC clickfunc)(HWND, void *) = NULL; if(tmp) @@ -4167,7 +4167,7 @@ */ if(SHORT1FROMMP(mp2) == '\r' || SHORT1FROMMP(mp2) == ' ') { - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; /* Find any callbacks for this function */ while(tmp) @@ -4452,9 +4452,9 @@ } /* Get the OS/2 version. */ - DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_MS_COUNT,(void *)aulBuffer, 4*sizeof(ULONG)); - - desktop = WinQueryDesktopWindow(dwhab, NULLHANDLE); + DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_MS_COUNT,(void *)_dw_ver_buf, 4*sizeof(ULONG)); + + _dw_desktop = WinQueryDesktopWindow(dwhab, NULLHANDLE); if(!IS_WARP4()) DefaultFont = strdup("8.Helv"); @@ -4464,28 +4464,28 @@ /* This is a window that hangs around as long as the * application does and handles menu messages. */ - hwndApp = dw_window_new(HWND_OBJECT, "", 0); + _dw_app = dw_window_new(HWND_OBJECT, "", 0); /* Attempt to locate a tray server */ - WinDdeInitiate(hwndApp, (PSZ)"SystrayServer", (PSZ)"TRAY", NULL); + WinDdeInitiate(_dw_app, (PSZ)"SystrayServer", (PSZ)"TRAY", NULL); /* Load DLLs for providing extra functionality if available */ - DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)"WPCONFIG", &wpconfig); - if(!DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)"PMPRINTF", &pmprintf)) - DosQueryProcAddr(pmprintf, 0, (PSZ)"PmPrintfString", (PFN*)&_PmPrintfString); - if(!DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)"PMMERGE", &pmmerge)) - DosQueryProcAddr(pmmerge, 5469, NULL, (PFN*)&_WinQueryDesktopWorkArea); - if(!DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)"GBM", &gbm)) + DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)"WPCONFIG", &_dw_wpconfig); + if(!DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)"PMPRINTF", &_dw_pmprintf)) + DosQueryProcAddr(_dw_pmprintf, 0, (PSZ)"PmPrintfString", (PFN*)&_PmPrintfString); + if(!DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)"PMMERGE", &_dw_pmmerge)) + DosQueryProcAddr(_dw_pmmerge, 5469, NULL, (PFN*)&_WinQueryDesktopWorkArea); + if(!DosLoadModule((PSZ)objnamebuf, sizeof(objnamebuf), (PSZ)"GBM", &_dw_gbm)) { /* Load the _System versions of the functions from the library */ - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_err", (PFN*)&_gbm_err); - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_init", (PFN*)&_gbm_init); - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_deinit", (PFN*)&_gbm_deinit); - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_io_open", (PFN*)&_gbm_io_open); - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_io_close", (PFN*)&_gbm_io_close); - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_read_data", (PFN*)&_gbm_read_data); - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_read_header", (PFN*)&_gbm_read_header); - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_read_palette", (PFN*)&_gbm_read_palette); - DosQueryProcAddr(gbm, 0, (PSZ)"Gbm_query_n_filetypes", (PFN*)&_gbm_query_n_filetypes); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_err", (PFN*)&_gbm_err); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_init", (PFN*)&_gbm_init); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_deinit", (PFN*)&_gbm_deinit); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_io_open", (PFN*)&_gbm_io_open); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_io_close", (PFN*)&_gbm_io_close); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_read_data", (PFN*)&_gbm_read_data); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_read_header", (PFN*)&_gbm_read_header); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_read_palette", (PFN*)&_gbm_read_palette); + DosQueryProcAddr(_dw_gbm, 0, (PSZ)"Gbm_query_n_filetypes", (PFN*)&_gbm_query_n_filetypes); /* If we got the functions, try to initialize the library */ if(!_gbm_init || _gbm_init()) { @@ -4788,7 +4788,7 @@ /* If it is an MDI window... * find the MDI area. */ - if(parent && parent != desktop) + if(parent && parent != _dw_desktop) { WinQueryWindowPos(parent, &swp); cx = swp.cx; @@ -4924,7 +4924,7 @@ char buffer[30]; sprintf(buffer, "_dw_id%ld", handle); - menu = (HWND)dw_window_get_data(hwndApp, buffer); + menu = (HWND)dw_window_get_data(_dw_app, buffer); if(menu && WinIsWindow(dwhab, menu)) return dw_menu_delete_item((HMENUI)menu, handle); @@ -4938,7 +4938,7 @@ _dw_free_menu_data(menu); /* If it is a desktop window let WM_DESTROY handle it */ - if(parent != desktop) + if(parent != _dw_desktop) { dw_box_unpack(handle); _dw_free_window_memory(frame ? frame : handle); @@ -6064,7 +6064,7 @@ /* Internal function to make sure menu ID isn't in use */ int _dw_menuid_allocated(int id) { - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; while(tmp) { @@ -6156,13 +6156,13 @@ WinSendMsg(menux, MM_INSERTITEM, MPFROMP(&miSubMenu), MPFROMP(title)); sprintf(buffer, "_dw_id%d", (int)id); - dw_window_set_data(hwndApp, buffer, (void *)menux); + dw_window_set_data(_dw_app, buffer, (void *)menux); sprintf(buffer, "_dw_checkable%ld", id); - dw_window_set_data( hwndApp, buffer, (void *)check ); + dw_window_set_data( _dw_app, buffer, (void *)check ); sprintf(buffer, "_dw_ischecked%ld", id); - dw_window_set_data( hwndApp, buffer, (void *)is_checked ); + dw_window_set_data( _dw_app, buffer, (void *)is_checked ); sprintf(buffer, "_dw_isdisabled%ld", id); - dw_window_set_data( hwndApp, buffer, (void *)is_disabled ); + dw_window_set_data( _dw_app, buffer, (void *)is_disabled ); if ( submenu ) dw_window_set_data(submenu, "_dw_owner", (void *)menux); @@ -6201,9 +6201,9 @@ USHORT fAttribute=0; sprintf( buffer1, "_dw_ischecked%ld", id ); - check = (int)dw_window_get_data( hwndApp, buffer1 ); + check = (int)dw_window_get_data( _dw_app, buffer1 ); sprintf( buffer2, "_dw_isdisabled%ld", id ); - disabled = (int)dw_window_get_data( hwndApp, buffer2 ); + disabled = (int)dw_window_get_data( _dw_app, buffer2 ); if ( (state & DW_MIS_CHECKED) || (state & DW_MIS_UNCHECKED) ) { @@ -6256,8 +6256,8 @@ /* * Keep our internal checked state consistent */ - dw_window_set_data( hwndApp, buffer1, (void *)check ); - dw_window_set_data( hwndApp, buffer2, (void *)disabled ); + dw_window_set_data( _dw_app, buffer1, (void *)check ); + dw_window_set_data( _dw_app, buffer2, (void *)disabled ); } /* @@ -6717,12 +6717,12 @@ { /* Create a disabled style pixmap */ HPIXMAP disabled = dw_pixmap_new(handle, pixmap->width, pixmap->height, dw_color_depth_get()); - LONG fore = _foreground; + LONG fore = _dw_foreground; int z, j, lim; dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0); - dw_color_foreground_set(DW_CLR_PALEGRAY); + dw_color_dw_foreground_set(DW_CLR_PALEGRAY); lim = pixmap->width/2; for(j=0;j<pixmap->height;j++) { @@ -6731,7 +6731,7 @@ for(z=0;z<lim;z++) dw_draw_point(0, disabled, (z*2)+mod, j); } - _foreground = fore; + _dw_foreground = fore; return disabled; } @@ -6791,7 +6791,7 @@ for(z=0;z<(_gbm_init?NUM_EXTS:1);z++) { strcpy(file, filename); - strcat(file, image_exts[z]); + strcat(file, _dw_image_exts[z]); if(access(file, 04) == 0 && _dw_load_bitmap_file(file, tmp, &pixmap->hbm, &pixmap->hdc, &pixmap->hps, &pixmap->width, &pixmap->height, &pixmap->depth, DW_CLR_DEFAULT)) break; @@ -7113,7 +7113,7 @@ } /* Code from GBM to convert to 24bpp if it isn't currently */ -static int _To24Bit(GBM *gbm, GBMRGB *gbmrgb, BYTE **ppbData) +static int _dw_to_24_bit(GBM *gbm, GBMRGB *gbmrgb, BYTE **ppbData) { unsigned long stride = (((unsigned long)gbm -> w * gbm -> bpp + 31)/32) * 4; unsigned long new_stride = (((unsigned long)gbm -> w * 3 + 3) & ~3); @@ -7316,7 +7316,7 @@ _gbm_io_close(fd); /* Convert to 24bpp for use in the application */ - if(_To24Bit(&gbm, gbmrgb, &BitmapFileBegin)) + if(_dw_to_24_bit(&gbm, gbmrgb, &BitmapFileBegin)) *depth = 24; else { @@ -7554,7 +7554,7 @@ for(z=0;z<(_gbm_init?NUM_EXTS:1);z++) { strcpy(file, filename); - strcat(file, image_exts[z]); + strcat(file, _dw_image_exts[z]); if(access(file, 04) == 0 && _dw_load_bitmap_file(file, handle, &hbm, &hdc, &hps, &width, &height, &depth, DW_CLR_DEFAULT)) break; @@ -7746,7 +7746,7 @@ HMENUI mymenu; sprintf(buffer, "_dw_id%ld", handle); - mymenu = (HMENUI)dw_window_get_data(hwndApp, buffer); + mymenu = (HMENUI)dw_window_get_data(_dw_app, buffer); if(mymenu && WinIsWindow(dwhab, mymenu)) dw_menu_item_set_state(mymenu, handle, DW_MIS_DISABLED); @@ -7811,7 +7811,7 @@ HMENUI mymenu; sprintf(buffer, "_dw_id%ld", handle); - mymenu = (HMENUI)dw_window_get_data(hwndApp, buffer); + mymenu = (HMENUI)dw_window_get_data(_dw_app, buffer); if(mymenu && WinIsWindow(dwhab, mymenu)) dw_menu_item_set_state(mymenu, handle, DW_MIS_ENABLED); @@ -7981,7 +7981,7 @@ { HWND parent = WinQueryWindow(handle, QW_PARENT); - if(parent != desktop) + if(parent != _dw_desktop) { Box *thisbox = WinQueryWindowPtr(parent, QWP_USER); @@ -8409,7 +8409,7 @@ HMENUI mymenu; sprintf(buffer, "_dw_id%ld", handle); - mymenu = (HMENUI)dw_window_get_data(hwndApp, buffer); + mymenu = (HMENUI)dw_window_get_data(_dw_app, buffer); if(mymenu && WinIsWindow(dwhab, mymenu)) dw_menu_item_set_state(mymenu, handle, style & mask); @@ -9301,8 +9301,8 @@ pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)pCore, MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER)); } WinSendMsg(handle, CM_SETRECORDEMPHASIS, (MPARAM)item, MPFROM2SHORT(TRUE, CRA_SELECTED | CRA_CURSORED)); - lastitem = 0; - lasthcnr = 0; + _dw_lastitem = 0; + _dw_lasthcnr = 0; } /* @@ -9553,11 +9553,11 @@ /* Internal function to create an icon from an existing pixmap */ HICN _dw_create_icon(HPIXMAP src, unsigned long backrgb) { - HPIXMAP pntr = dw_pixmap_new(hwndApp, WinQuerySysValue(HWND_DESKTOP, SV_CXICON), WinQuerySysValue(HWND_DESKTOP, SV_CYICON), src->depth); - HPIXMAP mask = dw_pixmap_new(hwndApp, pntr->width, pntr->height*2, 1); - HPIXMAP minipntr = dw_pixmap_new(hwndApp, pntr->width/2, pntr->height/2, src->depth); - HPIXMAP minimask = dw_pixmap_new(hwndApp, minipntr->width, minipntr->height*2, 1); - ULONG oldcol = _foreground; + HPIXMAP pntr = dw_pixmap_new(_dw_app, WinQuerySysValue(HWND_DESKTOP, SV_CXICON), WinQuerySysValue(HWND_DESKTOP, SV_CYICON), src->depth); + HPIXMAP mask = dw_pixmap_new(_dw_app, pntr->width, pntr->height*2, 1); + HPIXMAP minipntr = dw_pixmap_new(_dw_app, pntr->width/2, pntr->height/2, src->depth); + HPIXMAP minimask = dw_pixmap_new(_dw_app, minipntr->width, minipntr->height*2, 1); + ULONG oldcol = _dw_foreground; POINTERINFO pi = {0}; /* Create the color pointers, stretching it to the necessary size */ @@ -9565,7 +9565,7 @@ dw_pixmap_stretch_bitblt(0, minipntr, 0, 0, minipntr->width, minipntr->height, 0, src, 0, 0, src->width, src->height); /* Create the masks, all in black */ - dw_color_foreground_set(DW_CLR_BLACK); + dw_color_dw_foreground_set(DW_CLR_BLACK); dw_draw_rect(0, mask, DW_DRAW_FILL, 0, 0, mask->width, mask->height); dw_draw_rect(0, minimask, DW_DRAW_FILL, 0, 0, minimask->width, minimask->height); #if 0 @@ -9576,7 +9576,7 @@ _dw_create_mask(minipntr, minimask, backrgb); } #endif - _foreground = oldcol; + _dw_foreground = oldcol; /* Assemble the Pointer Info structure */ pi.hbmPointer = mask->hbm; @@ -9628,16 +9628,16 @@ for(z=0;z<(_gbm_init?NUM_EXTS:1);z++) { strcpy(file, filename); - strcat(file, image_exts[z]); + strcat(file, _dw_image_exts[z]); if(access(file, 04) == 0 && - _dw_load_bitmap_file(file, hwndApp, &src->hbm, &src->hdc, &src->hps, &src->width, &src->height, &src->depth, defcol)) + _dw_load_bitmap_file(file, _dw_app, &src->hbm, &src->hdc, &src->hps, &src->width, &src->height, &src->depth, defcol)) { icon = _dw_create_icon(src, defcol); break; } } } - else if(_dw_load_bitmap_file(file, hwndApp, &src->hbm, &src->hdc, &src->hps, &src->width, &src->height, &src->depth, defcol)) + else if(_dw_load_bitmap_file(file, _dw_app, &src->hbm, &src->hdc, &src->hps, &src->width, &src->height, &src->depth, defcol)) icon = _dw_create_icon(src, defcol); /* Free temporary resources if in use */ if(icon) @@ -10241,7 +10241,7 @@ PCNRITEM pCore; int container = (int)dw_window_get_data(handle, "_dw_container"); - if(hwndEmph == handle) + if(_dw_emph == handle) _dw_clear_emphasis(); pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER)); @@ -10566,12 +10566,12 @@ void API dw_taskbar_insert(HWND handle, HICN icon, const char *bubbletext) { /* Make sure we have our server */ - if(!hwndTrayServer) + if(!_dw_tray) return; - WinSendMsg(hwndApp, WM_SETICON, (MPARAM)icon, 0); - hwndTaskBar = handle; - WinPostMsg(hwndTrayServer, WM_USER+1, (MPARAM)hwndApp, (MPARAM)icon); + WinSendMsg(_dw_app, WM_SETICON, (MPARAM)icon, 0); + _dw_task_bar = handle; + WinPostMsg(_dw_tray, WM_USER+1, (MPARAM)_dw_app, (MPARAM)icon); } /* @@ -10583,11 +10583,11 @@ void API dw_taskbar_delete(HWND handle, HICN icon) { /* Make sure we have our server */ - if(!hwndTrayServer) + if(!_dw_tray) return; - WinPostMsg(hwndTrayServer, WM_USER+2, (MPARAM)hwndApp, (MPARAM)0); - hwndTaskBar = NULLHANDLE; + WinPostMsg(_dw_tray, WM_USER+2, (MPARAM)_dw_app, (MPARAM)0); + _dw_task_bar = NULLHANDLE; } /* @@ -10621,9 +10621,9 @@ * green: green value. * blue: blue value. */ -void API dw_color_foreground_set(unsigned long value) -{ - _foreground = value; +void API dw_color_dw_foreground_set(unsigned long value) +{ + _dw_foreground = value; } /* Sets the current background drawing color. @@ -10632,9 +10632,9 @@ * green: green value. * blue: blue value. */ -void API dw_color_background_set(unsigned long value) -{ - _background = value; +void API dw_color_dw_background_set(unsigned long value) +{ + _dw_background = value; } int DWSIGNAL _dw_color_cancel_func(HWND window, void *data) @@ -10767,8 +10767,8 @@ { LONG alTable[2]; - alTable[0] = DW_RED_VALUE(_foreground) << 16 | DW_GREEN_VALUE(_foreground) << 8 | DW_BLUE_VALUE(_foreground); - alTable[1] = DW_RED_VALUE(_background) << 16 | DW_GREEN_VALUE(_background) << 8 | DW_BLUE_VALUE(_background); + alTable[0] = DW_RED_VALUE(_dw_foreground) << 16 | DW_GREEN_VALUE(_dw_foreground) << 8 | DW_BLUE_VALUE(_dw_foreground); + alTable[1] = DW_RED_VALUE(_dw_background) << 16 | DW_GREEN_VALUE(_dw_background) << 8 | DW_BLUE_VALUE(_dw_background); GpiCreateLogColorTable(hps, LCOL_RESET, @@ -10776,18 +10776,18 @@ 16, 2, alTable); - if(_foreground & DW_RGB_COLOR) + if(_dw_foreground & DW_RGB_COLOR) GpiSetColor(hps, 16); else - GpiSetColor(hps, _dw_internal_color(_foreground)); - if(_background & DW_RGB_COLOR) + GpiSetColor(hps, _dw_internal_color(_dw_foreground)); + if(_dw_background & DW_RGB_COLOR) GpiSetBackColor(hps, 17); else - GpiSetBackColor(hps, _dw_internal_color(_background)); + GpiSetBackColor(hps, _dw_internal_color(_dw_background)); return hps; } -HPS _set_colors(HWND handle) +HPS _dw_set_colors(HWND handle) { HPS hps = WinGetPS(handle); @@ -10810,7 +10810,7 @@ if(handle) { - hps = _set_colors(handle); + hps = _dw_set_colors(handle); height = _dw_get_height(handle); } else if(pixmap) @@ -10846,7 +10846,7 @@ if(handle) { - hps = _set_colors(handle); + hps = _dw_set_colors(handle); height = _dw_get_height(handle); } else if(pixmap) @@ -10913,7 +10913,7 @@ if(handle) { - hps = _set_colors(handle); + hps = _dw_set_colors(handle); height = _dw_get_height(handle); _dw_get_pp_font(handle, fontname); } @@ -10943,10 +10943,10 @@ rcl.yBottom = rcl.yTop - (aptl[TXTBOX_TOPLEFT].y - aptl[TXTBOX_BOTTOMLEFT].y); rcl.xRight = rcl.xLeft + (aptl[TXTBOX_TOPRIGHT].x - aptl[TXTBOX_TOPLEFT].x); - if(_background == DW_CLR_DEFAULT) + if(_dw_background == DW_CLR_DEFAULT) WinDrawText(hps, -1, (PCH)text, &rcl, DT_TEXTATTRS, DT_TEXTATTRS, DT_VCENTER | DT_LEFT | DT_TEXTATTRS); else - WinDrawText(hps, -1, (PCH)text, &rcl, _dw_internal_color(_foreground), _dw_internal_color(_background), DT_VCENTER | DT_LEFT | DT_ERASERECT); + WinDrawText(hps, -1, (PCH)text, &rcl, _dw_internal_color(_dw_foreground), _dw_internal_color(_dw_background), DT_VCENTER | DT_LEFT | DT_ERASERECT); if(handle) WinReleasePS(hps); @@ -10967,7 +10967,7 @@ if(handle) { - hps = _set_colors(handle); + hps = _dw_set_colors(handle); } else if(pixmap) { @@ -11012,7 +11012,7 @@ if(handle) { - hps = _set_colors(handle); + hps = _dw_set_colors(handle); thisheight = _dw_get_height(handle); } else if(pixmap) @@ -11076,7 +11076,7 @@ if(handle) { - hps = _set_colors(handle); + hps = _dw_set_colors(handle); thisheight = _dw_get_height(handle); } else if(pixmap) @@ -11127,7 +11127,7 @@ if(handle) { - hps = _set_colors(handle); + hps = _dw_set_colors(handle); thisheight = _dw_get_height(handle); } else if(pixmap) @@ -11283,7 +11283,7 @@ for(z=0;z<(_gbm_init?NUM_EXTS:1);z++) { strcpy(file, filename); - strcat(file, image_exts[z]); + strcat(file, _dw_image_exts[z]); if(access(file, 04) == 0 && _dw_load_bitmap_file(file, handle, &pixmap->hbm, &pixmap->hdc, &pixmap->hps, &pixmap->width, &pixmap->height, &pixmap->depth, DW_CLR_DEFAULT)) break; @@ -12075,7 +12075,7 @@ void API dw_shutdown(void) { /* Destroy the menu message window */ - dw_window_destroy(hwndApp); + dw_window_destroy(_dw_app); /* In case we are in a signal handler, don't * try to free memory that could possibly be @@ -12102,10 +12102,10 @@ WinTerminate(dwhab); /* Free any in use modules */ - DosFreeModule(wpconfig); - DosFreeModule(pmprintf); - DosFreeModule(pmmerge); - DosFreeModule(gbm); + DosFreeModule(_dw_wpconfig); + DosFreeModule(_dw_pmprintf); + DosFreeModule(_dw_pmmerge); + DosFreeModule(_dw_gbm); } /* @@ -12474,9 +12474,9 @@ env->MinorBuild = Build & 0xFFFF; env->MajorBuild = Build >> 16; - if (aulBuffer[0] == 20) - { - int i = (unsigned int)aulBuffer[1]; + if (_dw_ver_buf[0] == 20) + { + int i = (unsigned int)_dw_ver_buf[1]; if (i > 20) { strcpy(env->osName,"Warp"); @@ -13551,7 +13551,7 @@ */ void API dw_timer_disconnect(HTIMER id) { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; /* 0 is an invalid timer ID */ if(!id) @@ -13621,7 +13621,7 @@ HWND owner; sprintf(buffer, "_dw_id%d", (int)window); - owner = (HWND)dw_window_get_data(hwndApp, buffer); + owner = (HWND)dw_window_get_data(_dw_app, buffer); /* Make sure there are no dupes from popups */ dw_signal_disconnect_by_window(window); @@ -13644,7 +13644,7 @@ */ void API dw_signal_disconnect_by_name(HWND window, const char *signame) { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; ULONG message; if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0) @@ -13689,7 +13689,7 @@ */ void API dw_signal_disconnect_by_window(HWND window) { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; while(tmp) { @@ -13731,7 +13731,7 @@ */ void API dw_signal_disconnect_by_data(HWND window, void *data) { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; while(tmp) { @@ -13894,7 +13894,7 @@ return DW_FEATURE_ENABLED; case DW_FEATURE_TASK_BAR: { - if(hwndTrayServer) + if(_dw_tray) return DW_FEATURE_ENABLED; return DW_FEATURE_UNSUPPORTED; } @@ -13933,7 +13933,7 @@ return DW_ERROR_GENERAL; case DW_FEATURE_TASK_BAR: { - if(hwndTrayServer) + if(_dw_tray) return DW_ERROR_GENERAL; return DW_FEATURE_UNSUPPORTED; }
--- a/win/dw.c Tue Jul 27 23:09:52 2021 +0000 +++ b/win/dw.c Sun Aug 01 12:17:07 2021 +0000 @@ -361,9 +361,9 @@ } } -typedef struct _sighandler -{ - struct _sighandler *next; +typedef struct _dwsighandler +{ + struct _dwsighandler *next; ULONG message; HWND window; int id; @@ -371,9 +371,9 @@ void *discfunction; void *data; -} SignalHandler; - -SignalHandler *Root = NULL; +} DWSignalHandler; + +DWSignalHandler *Root = NULL; typedef struct { @@ -1085,7 +1085,7 @@ */ void _dw_new_signal(ULONG message, HWND window, int id, void *signalfunction, void *discfunc, void *data) { - SignalHandler *new = malloc(sizeof(SignalHandler)); + DWSignalHandler *new = malloc(sizeof(DWSignalHandler)); new->message = message; new->window = window; @@ -1101,7 +1101,7 @@ } else { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; while(tmp) { if(tmp->message == message && @@ -2151,7 +2151,7 @@ LRESULT CALLBACK _dw_wndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2) { int result = -1, taskbar = FALSE; - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; void (DWSIGNAL *windowfunc)(PVOID); ULONG origmsg = msg; @@ -3265,7 +3265,7 @@ ) { /* Generate click on default item */ - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; /* Find any callbacks for this function */ while (tmp) @@ -3693,7 +3693,7 @@ } { - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; while(tmp) { @@ -3712,7 +3712,7 @@ break; case WM_CONTEXTMENU: { - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; void **params = NULL; while(tmp) { @@ -4402,7 +4402,7 @@ break; case WM_LBUTTONUP: { - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; /* Find any callbacks for this function */ while(tmp) @@ -4438,7 +4438,7 @@ */ if(LOWORD(mp1) == '\r' || LOWORD(mp1) == ' ') { - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; /* Find any callbacks for this function */ while(tmp) @@ -6492,7 +6492,7 @@ /* Internal function to make sure menu ID isn't in use */ int _dw_menuid_allocated(int id) { - SignalHandler *tmp = Root; + DWSignalHandler *tmp = Root; while(tmp) { @@ -13600,7 +13600,7 @@ */ void API dw_timer_disconnect(HTIMER id) { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; /* 0 is an invalid timer ID */ if(!id) @@ -13696,7 +13696,7 @@ */ void API dw_signal_disconnect_by_name(HWND window, const char *signame) { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; ULONG message; if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0) @@ -13741,7 +13741,7 @@ */ void API dw_signal_disconnect_by_window(HWND window) { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; while(tmp) { @@ -13783,7 +13783,7 @@ */ void API dw_signal_disconnect_by_data(HWND window, void *data) { - SignalHandler *prev = NULL, *tmp = Root; + DWSignalHandler *prev = NULL, *tmp = Root; while(tmp) {