Mercurial > dwindows
comparison gtk4/dw.c @ 2312:ada8f7610df0
GTK4: Fix building with -D_DW_SINGLE_THREADED and code cleanup.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Tue, 16 Feb 2021 01:26:50 +0000 |
parents | f6a6ea6b28fe |
children | c6ea79c74c03 |
comparison
equal
deleted
inserted
replaced
2311:f6a6ea6b28fe | 2312:ada8f7610df0 |
---|---|
303 #define DW_FUNCTION_ADD_PARAM5(param1, param2, param3, param4, param5) | 303 #define DW_FUNCTION_ADD_PARAM5(param1, param2, param3, param4, param5) |
304 #define DW_FUNCTION_ADD_PARAM6(param1, param2, param3, param4, param5, param6) | 304 #define DW_FUNCTION_ADD_PARAM6(param1, param2, param3, param4, param5, param6) |
305 #define DW_FUNCTION_ADD_PARAM7(param1, param2, param3, param4, param5, param6, param7) | 305 #define DW_FUNCTION_ADD_PARAM7(param1, param2, param3, param4, param5, param6, param7) |
306 #define DW_FUNCTION_ADD_PARAM8(param1, param2, param3, param4, param5, param6, param7, param8) | 306 #define DW_FUNCTION_ADD_PARAM8(param1, param2, param3, param4, param5, param6, param7, param8) |
307 #define DW_FUNCTION_ADD_PARAM9(param1, param2, param3, param4, param5, param6, param7, param8, param9) | 307 #define DW_FUNCTION_ADD_PARAM9(param1, param2, param3, param4, param5, param6, param7, param8, param9) |
308 #define DW_FUNCTION_ADD_PARAM10(param1, param2, param3, param4, param5, param6, param7, param8, param9. param10) | 308 #define DW_FUNCTION_ADD_PARAM10(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) |
309 #define DW_FUNCTION_ADD_PARAM11(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) | 309 #define DW_FUNCTION_ADD_PARAM11(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) |
310 #define DW_FUNCTION_ADD_PARAM12(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) | 310 #define DW_FUNCTION_ADD_PARAM12(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) |
311 #define DW_FUNCTION_RESTORE_PARAM1(param1, vartype1) | 311 #define DW_FUNCTION_RESTORE_PARAM1(param1, vartype1) |
312 #define DW_FUNCTION_RESTORE_PARAM2(param1, vartype1, param2, vartype2) | 312 #define DW_FUNCTION_RESTORE_PARAM2(param1, vartype1, param2, vartype2) |
313 #define DW_FUNCTION_RESTORE_PARAM3(param1, vartype1, param2, vartype2, param3, vartype3) | 313 #define DW_FUNCTION_RESTORE_PARAM3(param1, vartype1, param2, vartype2, param3, vartype3) |
357 | 357 |
358 /* | 358 /* |
359 * List those icons that have transparency first | 359 * List those icons that have transparency first |
360 */ | 360 */ |
361 #define NUM_EXTS 9 | 361 #define NUM_EXTS 9 |
362 char *image_exts[NUM_EXTS] = | 362 char *_dw_image_exts[NUM_EXTS+1] = |
363 { | 363 { |
364 ".xpm", | 364 ".xpm", |
365 ".png", | 365 ".png", |
366 ".ico", | 366 ".ico", |
367 ".icns", | 367 ".icns", |
368 ".gif", | 368 ".gif", |
369 ".jpg", | 369 ".jpg", |
370 ".jpeg", | 370 ".jpeg", |
371 ".tiff", | 371 ".tiff", |
372 ".bmp" | 372 ".bmp", |
373 NULL | |
373 }; | 374 }; |
374 | 375 |
375 #ifndef max | 376 #ifndef max |
376 # define max(a,b) (((a) > (b)) ? (a) : (b)) | 377 # define max(a,b) (((a) > (b)) ? (a) : (b)) |
377 #endif | 378 #endif |
381 #endif | 382 #endif |
382 | 383 |
383 pthread_key_t _dw_fg_color_key; | 384 pthread_key_t _dw_fg_color_key; |
384 pthread_key_t _dw_bg_color_key; | 385 pthread_key_t _dw_bg_color_key; |
385 pthread_key_t _dw_event_key; | 386 pthread_key_t _dw_event_key; |
386 | |
387 GtkWidget *last_window = NULL, *popup = NULL; | |
388 | 387 |
389 static int _dw_ignore_expand = 0; | 388 static int _dw_ignore_expand = 0; |
390 static pthread_t _dw_thread = (pthread_t)-1; | 389 static pthread_t _dw_thread = (pthread_t)-1; |
391 | 390 |
392 #define DEFAULT_SIZE_WIDTH 12 | 391 #define DEFAULT_SIZE_WIDTH 12 |
3593 { | 3592 { |
3594 /* Try with various extentions */ | 3593 /* Try with various extentions */ |
3595 for(i=0; i<NUM_EXTS; i++) | 3594 for(i=0; i<NUM_EXTS; i++) |
3596 { | 3595 { |
3597 strcpy(file, filename); | 3596 strcpy(file, filename); |
3598 strcat(file, image_exts[i]); | 3597 strcat(file, _dw_image_exts[i]); |
3599 if(access(file, 04) == 0) | 3598 if(access(file, 04) == 0) |
3600 { | 3599 { |
3601 found_ext = 1; | 3600 found_ext = 1; |
3602 break; | 3601 break; |
3603 } | 3602 } |
5132 { | 5131 { |
5133 /* Try with various extentions */ | 5132 /* Try with various extentions */ |
5134 for ( i = 0; i < NUM_EXTS; i++ ) | 5133 for ( i = 0; i < NUM_EXTS; i++ ) |
5135 { | 5134 { |
5136 strcpy( file, filename ); | 5135 strcpy( file, filename ); |
5137 strcat( file, image_exts[i] ); | 5136 strcat( file, _dw_image_exts[i] ); |
5138 if ( access( file, 04 ) == 0 ) | 5137 if ( access( file, 04 ) == 0 ) |
5139 { | 5138 { |
5140 found_ext = 1; | 5139 found_ext = 1; |
5141 break; | 5140 break; |
5142 } | 5141 } |
6797 { | 6796 { |
6798 /* Try with various extentions */ | 6797 /* Try with various extentions */ |
6799 for ( i = 0; i < NUM_EXTS; i++ ) | 6798 for ( i = 0; i < NUM_EXTS; i++ ) |
6800 { | 6799 { |
6801 strcpy( file, filename ); | 6800 strcpy( file, filename ); |
6802 strcat( file, image_exts[i] ); | 6801 strcat( file, _dw_image_exts[i] ); |
6803 if ( access( file, 04 ) == 0 ) | 6802 if ( access( file, 04 ) == 0 ) |
6804 { | 6803 { |
6805 found_ext = 1; | 6804 found_ext = 1; |
6806 break; | 6805 break; |
6807 } | 6806 } |