diff options
author | 2013-01-11 07:32:46 +0000 | |
---|---|---|
committer | 2013-01-11 07:32:46 +0000 | |
commit | 0e19f641d3186cdbf51f8ca857e2b07ab95779c2 (patch) | |
tree | 234109de1123b13f217494af4b3f8efad346d5cc /src/osd | |
parent | 111157ca09a9ff60fe4a9ba49173c315e94314fa (diff) |
Cleanups and version bumpmame0148
Diffstat (limited to 'src/osd')
115 files changed, 7835 insertions, 7859 deletions
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h index f44c661d4d1..b2bfad5370d 100644 --- a/src/osd/osdcomm.h +++ b/src/osd/osdcomm.h @@ -60,26 +60,26 @@ /* Some optimizations/warnings cleanups for GCC */ #if defined(__GNUC__) && (__GNUC__ >= 3) -#define ATTR_UNUSED __attribute__((__unused__)) -#define ATTR_NORETURN __attribute__((noreturn)) -#define ATTR_PRINTF(x,y) __attribute__((format(printf, x, y))) -#define ATTR_MALLOC __attribute__((malloc)) -#define ATTR_PURE __attribute__((pure)) -#define ATTR_CONST __attribute__((const)) -#define ATTR_FORCE_INLINE __attribute__((always_inline)) -#define ATTR_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) +#define ATTR_UNUSED __attribute__((__unused__)) +#define ATTR_NORETURN __attribute__((noreturn)) +#define ATTR_PRINTF(x,y) __attribute__((format(printf, x, y))) +#define ATTR_MALLOC __attribute__((malloc)) +#define ATTR_PURE __attribute__((pure)) +#define ATTR_CONST __attribute__((const)) +#define ATTR_FORCE_INLINE __attribute__((always_inline)) +#define ATTR_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) /* not supported in GCC prior to 4.4.x */ #if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4) -#define ATTR_HOT __attribute__((hot)) -#define ATTR_COLD __attribute__((cold)) +#define ATTR_HOT __attribute__((hot)) +#define ATTR_COLD __attribute__((cold)) #else #define ATTR_HOT #define ATTR_COLD #endif -#define UNEXPECTED(exp) __builtin_expect(!!(exp), 0) -#define EXPECTED(exp) __builtin_expect(!!(exp), 1) -#define RESTRICT __restrict__ -#define SETJMP_GNUC_PROTECT() (void)__builtin_return_address(1) +#define UNEXPECTED(exp) __builtin_expect(!!(exp), 0) +#define EXPECTED(exp) __builtin_expect(!!(exp), 1) +#define RESTRICT __restrict__ +#define SETJMP_GNUC_PROTECT() (void)__builtin_return_address(1) #else #define ATTR_UNUSED #define ATTR_NORETURN @@ -91,16 +91,16 @@ #define ATTR_NONNULL(...) #define ATTR_HOT #define ATTR_COLD -#define UNEXPECTED(exp) (exp) -#define EXPECTED(exp) (exp) +#define UNEXPECTED(exp) (exp) +#define EXPECTED(exp) (exp) #define RESTRICT -#define SETJMP_GNUC_PROTECT() do {} while (0) +#define SETJMP_GNUC_PROTECT() do {} while (0) #endif /* And some MSVC optimizations/warnings */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) -#define DECL_NORETURN __declspec(noreturn) +#define DECL_NORETURN __declspec(noreturn) #else #define DECL_NORETURN #endif @@ -117,27 +117,27 @@ #ifndef OSD_TYPES_DEFINED /* 8-bit values */ -typedef unsigned char UINT8; -typedef signed char INT8; +typedef unsigned char UINT8; +typedef signed char INT8; /* 16-bit values */ -typedef unsigned short UINT16; -typedef signed short INT16; +typedef unsigned short UINT16; +typedef signed short INT16; /* 32-bit values */ #ifndef _WINDOWS_H -typedef unsigned int UINT32; -typedef signed int INT32; +typedef unsigned int UINT32; +typedef signed int INT32; #endif /* 64-bit values */ #ifndef _WINDOWS_H #ifdef _MSC_VER -typedef signed __int64 INT64; -typedef unsigned __int64 UINT64; +typedef signed __int64 INT64; +typedef unsigned __int64 UINT64; #else -__extension__ typedef unsigned long long UINT64; -__extension__ typedef signed long long INT64; +__extension__ typedef unsigned long long UINT64; +__extension__ typedef signed long long INT64; #endif #endif @@ -151,11 +151,11 @@ __extension__ typedef signed long long INT64; /* Ensure that TRUE/FALSE are defined */ #ifndef TRUE -#define TRUE 1 +#define TRUE 1 #endif #ifndef FALSE -#define FALSE 0 +#define FALSE 0 #endif @@ -166,10 +166,10 @@ __extension__ typedef signed long long INT64; /* Standard MIN/MAX macros */ #ifndef MIN -#define MIN(x,y) ((x) < (y) ? (x) : (y)) +#define MIN(x,y) ((x) < (y) ? (x) : (y)) #endif #ifndef MAX -#define MAX(x,y) ((x) > (y) ? (x) : (y)) +#define MAX(x,y) ((x) > (y) ? (x) : (y)) #endif @@ -184,9 +184,9 @@ __extension__ typedef signed long long INT64; /* Concatenate/extract 32-bit halves of 64-bit values */ -#define CONCAT_64(hi,lo) (((UINT64)(hi) << 32) | (UINT32)(lo)) -#define EXTRACT_64HI(val) ((UINT32)((val) >> 32)) -#define EXTRACT_64LO(val) ((UINT32)(val)) +#define CONCAT_64(hi,lo) (((UINT64)(hi) << 32) | (UINT32)(lo)) +#define EXTRACT_64HI(val) ((UINT32)((val) >> 32)) +#define EXTRACT_64LO(val) ((UINT32)(val)) /* MINGW has adopted the MSVC formatting for 64-bit ints as of gcc 4.4 */ @@ -198,40 +198,40 @@ __extension__ typedef signed long long INT64; /* Highly useful macro for compile-time knowledge of an array size */ -#define ARRAY_LENGTH(x) (sizeof(x) / sizeof(x[0])) +#define ARRAY_LENGTH(x) (sizeof(x) / sizeof(x[0])) /* Macros for normalizing data into big or little endian formats */ -#define FLIPENDIAN_INT16(x) (((((UINT16) (x)) >> 8) | ((x) << 8)) & 0xffff) -#define FLIPENDIAN_INT32(x) ((((UINT32) (x)) << 24) | (((UINT32) (x)) >> 24) | \ +#define FLIPENDIAN_INT16(x) (((((UINT16) (x)) >> 8) | ((x) << 8)) & 0xffff) +#define FLIPENDIAN_INT32(x) ((((UINT32) (x)) << 24) | (((UINT32) (x)) >> 24) | \ (( ((UINT32) (x)) & 0x0000ff00) << 8) | (( ((UINT32) (x)) & 0x00ff0000) >> 8)) -#define FLIPENDIAN_INT64(x) \ - ( \ - (((((UINT64) (x)) >> 56) & ((UINT64) 0xFF)) << 0) | \ - (((((UINT64) (x)) >> 48) & ((UINT64) 0xFF)) << 8) | \ - (((((UINT64) (x)) >> 40) & ((UINT64) 0xFF)) << 16) | \ - (((((UINT64) (x)) >> 32) & ((UINT64) 0xFF)) << 24) | \ - (((((UINT64) (x)) >> 24) & ((UINT64) 0xFF)) << 32) | \ - (((((UINT64) (x)) >> 16) & ((UINT64) 0xFF)) << 40) | \ - (((((UINT64) (x)) >> 8) & ((UINT64) 0xFF)) << 48) | \ - (((((UINT64) (x)) >> 0) & ((UINT64) 0xFF)) << 56) \ +#define FLIPENDIAN_INT64(x) \ + ( \ + (((((UINT64) (x)) >> 56) & ((UINT64) 0xFF)) << 0) | \ + (((((UINT64) (x)) >> 48) & ((UINT64) 0xFF)) << 8) | \ + (((((UINT64) (x)) >> 40) & ((UINT64) 0xFF)) << 16) | \ + (((((UINT64) (x)) >> 32) & ((UINT64) 0xFF)) << 24) | \ + (((((UINT64) (x)) >> 24) & ((UINT64) 0xFF)) << 32) | \ + (((((UINT64) (x)) >> 16) & ((UINT64) 0xFF)) << 40) | \ + (((((UINT64) (x)) >> 8) & ((UINT64) 0xFF)) << 48) | \ + (((((UINT64) (x)) >> 0) & ((UINT64) 0xFF)) << 56) \ ) #ifdef LSB_FIRST -#define BIG_ENDIANIZE_INT16(x) (FLIPENDIAN_INT16(x)) -#define BIG_ENDIANIZE_INT32(x) (FLIPENDIAN_INT32(x)) -#define BIG_ENDIANIZE_INT64(x) (FLIPENDIAN_INT64(x)) -#define LITTLE_ENDIANIZE_INT16(x) (x) -#define LITTLE_ENDIANIZE_INT32(x) (x) -#define LITTLE_ENDIANIZE_INT64(x) (x) +#define BIG_ENDIANIZE_INT16(x) (FLIPENDIAN_INT16(x)) +#define BIG_ENDIANIZE_INT32(x) (FLIPENDIAN_INT32(x)) +#define BIG_ENDIANIZE_INT64(x) (FLIPENDIAN_INT64(x)) +#define LITTLE_ENDIANIZE_INT16(x) (x) +#define LITTLE_ENDIANIZE_INT32(x) (x) +#define LITTLE_ENDIANIZE_INT64(x) (x) #else -#define BIG_ENDIANIZE_INT16(x) (x) -#define BIG_ENDIANIZE_INT32(x) (x) -#define BIG_ENDIANIZE_INT64(x) (x) -#define LITTLE_ENDIANIZE_INT16(x) (FLIPENDIAN_INT16(x)) -#define LITTLE_ENDIANIZE_INT32(x) (FLIPENDIAN_INT32(x)) -#define LITTLE_ENDIANIZE_INT64(x) (FLIPENDIAN_INT64(x)) +#define BIG_ENDIANIZE_INT16(x) (x) +#define BIG_ENDIANIZE_INT32(x) (x) +#define BIG_ENDIANIZE_INT64(x) (x) +#define LITTLE_ENDIANIZE_INT16(x) (FLIPENDIAN_INT16(x)) +#define LITTLE_ENDIANIZE_INT32(x) (FLIPENDIAN_INT32(x)) +#define LITTLE_ENDIANIZE_INT64(x) (FLIPENDIAN_INT64(x)) #endif /* LSB_FIRST */ -#endif /* __OSDCOMM_H__ */ +#endif /* __OSDCOMM_H__ */ diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h index 039b19aedbf..c2f8ffb2e6c 100644 --- a/src/osd/osdcore.h +++ b/src/osd/osdcore.h @@ -61,15 +61,15 @@ extern "C" { /* Make sure we have a path separator (default to /) */ #ifndef PATH_SEPARATOR -#define PATH_SEPARATOR "/" +#define PATH_SEPARATOR "/" #endif /* flags controlling file access */ -#define OPEN_FLAG_READ 0x0001 /* open for read */ -#define OPEN_FLAG_WRITE 0x0002 /* open for write */ -#define OPEN_FLAG_CREATE 0x0004 /* create & truncate file */ -#define OPEN_FLAG_CREATE_PATHS 0x0008 /* create paths as necessary */ -#define OPEN_FLAG_NO_PRELOAD 0x0010 /* do not decompress on open */ +#define OPEN_FLAG_READ 0x0001 /* open for read */ +#define OPEN_FLAG_WRITE 0x0002 /* open for write */ +#define OPEN_FLAG_CREATE 0x0004 /* create & truncate file */ +#define OPEN_FLAG_CREATE_PATHS 0x0008 /* create paths as necessary */ +#define OPEN_FLAG_NO_PRELOAD 0x0010 /* do not decompress on open */ /* error codes returned by routines below */ enum file_error @@ -281,9 +281,9 @@ struct osd_directory; /* a directory */ struct osd_directory_entry { - const char * name; /* name of the entry */ - osd_dir_entry_type type; /* type of the entry */ - UINT64 size; /* size of the entry */ + const char * name; /* name of the entry */ + osd_dir_entry_type type; /* type of the entry */ + UINT64 size; /* size of the entry */ }; @@ -512,17 +512,17 @@ void osd_lock_free(osd_lock *lock); /* this is the maximum number of supported threads for a single work queue */ /* threadid values are expected to range from 0..WORK_MAX_THREADS-1 */ -#define WORK_MAX_THREADS 16 +#define WORK_MAX_THREADS 16 /* these flags can be set when creating a queue to give hints to the code about how to configure the queue */ -#define WORK_QUEUE_FLAG_IO 0x0001 -#define WORK_QUEUE_FLAG_MULTI 0x0002 -#define WORK_QUEUE_FLAG_HIGH_FREQ 0x0004 +#define WORK_QUEUE_FLAG_IO 0x0001 +#define WORK_QUEUE_FLAG_MULTI 0x0002 +#define WORK_QUEUE_FLAG_HIGH_FREQ 0x0004 /* these flags can be set when queueing a work item to indicate how to handle its deconstruction */ -#define WORK_ITEM_FLAG_AUTO_RELEASE 0x0001 +#define WORK_ITEM_FLAG_AUTO_RELEASE 0x0001 /* osd_work_queue is an opaque type which represents a queue of work items */ struct osd_work_queue; @@ -918,4 +918,4 @@ const char *osd_get_volume_name(int idx); } #endif -#endif /* __OSDEPEND_H__ */ +#endif /* __OSDEPEND_H__ */ diff --git a/src/osd/osdepend.c b/src/osd/osdepend.c index effc05a204f..2130eb3b458 100644 --- a/src/osd/osdepend.c +++ b/src/osd/osdepend.c @@ -171,10 +171,10 @@ void osd_interface::set_mastervolume(int attenuation) // // Attenuation is the attenuation in dB (a negative number). // To convert from dB to a linear volume scale do the following: - // volume = MAX_VOLUME; - // while (attenuation++ < 0) - // volume /= 1.122018454; // = (10 ^ (1/20)) = 1dB - // + // volume = MAX_VOLUME; + // while (attenuation++ < 0) + // volume /= 1.122018454; // = (10 ^ (1/20)) = 1dB + // } diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h index 659b44d63a2..e3d47dc5b86 100644 --- a/src/osd/osdepend.h +++ b/src/osd/osdepend.h @@ -96,8 +96,8 @@ public: private: // internal state - running_machine * m_machine; + running_machine * m_machine; }; -#endif /* __OSDEPEND_H__ */ +#endif /* __OSDEPEND_H__ */ diff --git a/src/osd/sdl/SDL1211_opengl.h b/src/osd/sdl/SDL1211_opengl.h index 5e163d8027d..d4706f2d518 100644 --- a/src/osd/sdl/SDL1211_opengl.h +++ b/src/osd/sdl/SDL1211_opengl.h @@ -27,7 +27,7 @@ #ifdef __WIN32__ #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX -#define NOMINMAX /* Don't defined min() and max() */ +#define NOMINMAX /* Don't defined min() and max() */ #endif #include <windows.h> #endif @@ -35,14 +35,14 @@ #define __glext_h_ /* Don't let gl.h include glext.h */ #endif #if defined(__MACOSX__) -#include <OpenGL/gl.h> /* Header File For The OpenGL Library */ -#include <OpenGL/glu.h> /* Header File For The GLU Library */ +#include <OpenGL/gl.h> /* Header File For The OpenGL Library */ +#include <OpenGL/glu.h> /* Header File For The GLU Library */ #elif defined(__MACOS__) -#include <gl.h> /* Header File For The OpenGL Library */ -#include <glu.h> /* Header File For The GLU Library */ +#include <gl.h> /* Header File For The OpenGL Library */ +#include <glu.h> /* Header File For The GLU Library */ #else -#include <GL/gl.h> /* Header File For The OpenGL Library */ -#include <GL/glu.h> /* Header File For The GLU Library */ +#include <GL/gl.h> /* Header File For The OpenGL Library */ +#include <GL/glu.h> /* Header File For The GLU Library */ #endif #ifndef NO_SDL_GLEXT #undef __glext_h_ @@ -3099,7 +3099,7 @@ extern "C" { #include <stddef.h> #ifndef GL_VERSION_2_0 /* GL type for program/shader text */ -typedef char GLchar; /* native character */ +typedef char GLchar; /* native character */ #endif #ifndef GL_VERSION_1_5 @@ -3116,8 +3116,8 @@ typedef ptrdiff_t GLsizeiptrARB; #ifndef GL_ARB_shader_objects /* GL types for handling shader object handles and program/shader text */ -typedef char GLcharARB; /* native character */ -typedef unsigned int GLhandleARB; /* shader object handle */ +typedef char GLcharARB; /* native character */ +typedef unsigned int GLhandleARB; /* shader object handle */ #endif /* GL types for "half" precision (s10e5) float data in host memory */ diff --git a/src/osd/sdl/blit13.h b/src/osd/sdl/blit13.h index 389c53e9812..c55b1f49a94 100644 --- a/src/osd/sdl/blit13.h +++ b/src/osd/sdl/blit13.h @@ -54,8 +54,8 @@ INLINE UINT32 pixel_ycc_to_rgb_pal(UINT16 *pixel, const rgb_t *palette) #define OP_RGB32PAL_ARGB32(_src) \ (texsource->palette[0x200 + RGB_RED(_src)] | \ - texsource->palette[0x100 + RGB_GREEN(_src)] | \ - texsource->palette[RGB_BLUE(_src)] | 0xff000000) + texsource->palette[0x100 + RGB_GREEN(_src)] | \ + texsource->palette[RGB_BLUE(_src)] | 0xff000000) #define OP_PAL16_ARGB32(_src) (0xff000000 | texsource->palette[_src]) @@ -72,14 +72,14 @@ INLINE UINT32 pixel_ycc_to_rgb_pal(UINT16 *pixel, const rgb_t *palette) #define OP_PAL16A_RGB32(_src) premult32(texsource->palette[_src]) #define OP_PAL16_ARGB1555(_src) ((texsource->palette[_src]&0xf80000) >> 9 | \ - (texsource->palette[_src]&0x00f800) >> 6 | \ - (texsource->palette[_src]&0x0000f8) >> 3 | 0x8000) + (texsource->palette[_src]&0x00f800) >> 6 | \ + (texsource->palette[_src]&0x0000f8) >> 3 | 0x8000) #define OP_RGB15_ARGB1555(_src) ((_src) | 0x8000) #define OP_RGB15PAL_ARGB1555(_src) ((texsource->palette[(_src) >> 10] & 0xf8) << 7 | \ - (texsource->palette[((_src) >> 5) & 0x1f] & 0xf8) << 2 | \ - (texsource->palette[(_src) & 0x1f] & 0xf8) >> 3 | 0x8000) + (texsource->palette[((_src) >> 5) & 0x1f] & 0xf8) << 2 | \ + (texsource->palette[(_src) & 0x1f] & 0xf8) >> 3 | 0x8000) #define OP_YUV16_UYVY(_src) (_src) @@ -97,7 +97,7 @@ INLINE UINT32 pixel_ycc_to_rgb_pal(UINT16 *pixel, const rgb_t *palette) (((_src)<<8)&0xff00ff00) ) #define OP_YUV16_ARGB32(_src) \ - (UINT64) ycc_to_rgb(((_src) >> 8) & 0xff, (_src) & 0xff , ((_src)>>16) & 0xff) \ + (UINT64) ycc_to_rgb(((_src) >> 8) & 0xff, (_src) & 0xff , ((_src)>>16) & 0xff) \ | ((UINT64)ycc_to_rgb(((_src) >> 24) & 0xff, (_src) & 0xff , ((_src)>>16) & 0xff) << 32) #define OP_YUV16PAL_ARGB32(_src) \ diff --git a/src/osd/sdl/debug-cb.h b/src/osd/sdl/debug-cb.h index de4096dee40..84ef8f33db7 100644 --- a/src/osd/sdl/debug-cb.h +++ b/src/osd/sdl/debug-cb.h @@ -32,11 +32,11 @@ on_step_out_activate (GtkWidget *win); GtkWidget* debug_view_new (gchar *widget_name, gchar *string1, gchar *string2, - gint int1, gint int2); + gint int1, gint int2); GtkWidget* dview_new (const gchar *widget_name, const gchar *string1, const gchar *string2, - gint int1, gint int2); + gint int1, gint int2); void on_raw_opcodes_activate (GtkWidget *win); @@ -79,7 +79,7 @@ on_dbpl_activate (GtkWidget *win); GtkWidget* dview_new (const gchar *widget_name, const gchar *string1, const gchar *string2, - gint int1, gint int2); + gint int1, gint int2); void on_run_to_cursor_activate (GtkWidget *win); @@ -89,23 +89,21 @@ on_set_breakpoint_at_cursor_activate (GtkWidget *win); gboolean on_disasm_button_press_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data); + GdkEventButton *event, + gpointer user_data); gboolean on_memoryview_button_press_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data); + GdkEventButton *event, + gpointer user_data); gboolean on_memoryview_key_press_event (GtkWidget *widget, - GdkEventKey *event, - gpointer user_data); + GdkEventKey *event, + gpointer user_data); void on_logical_addresses_group_changed (GtkWidget *win); void on_physical_addresses_group_changed (GtkWidget *win); - - diff --git a/src/osd/sdl/debug-intf.c b/src/osd/sdl/debug-intf.c index a4398d03def..e13b1eaacbe 100644 --- a/src/osd/sdl/debug-intf.c +++ b/src/osd/sdl/debug-intf.c @@ -20,1485 +20,1484 @@ #include "debug-sup.h" #define GLADE_HOOKUP_OBJECT(component,widget,name) \ - g_object_set_data_full (G_OBJECT (component), name, \ - gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) + g_object_set_data_full (G_OBJECT (component), name, \ + gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ - g_object_set_data (G_OBJECT (component), name, widget) + g_object_set_data (G_OBJECT (component), name, widget) GtkWidget* create_debugmain (void) { - GtkWidget *debugmain; - GtkWidget *vbox1; - GtkWidget *menu; - GtkWidget *menuitem4; - GtkWidget *menuitem4_menu; - GtkWidget *new_mem; - GtkWidget *new_disasm; - GtkWidget *new_errorlog; - GtkWidget *separator2; - GtkWidget *run; - GtkWidget *run_h; - GtkWidget *run_cpu; - GtkWidget *run_irq; - GtkWidget *run_vbl; - GtkWidget *separator3; - GtkWidget *step_into; - GtkWidget *step_over; - GtkWidget *step_out; - GtkWidget *separator4; - GtkWidget *soft_reset; - GtkWidget *hard_reset; - GtkWidget *exit; - GtkWidget *item1; - GtkWidget *item1_menu; - GtkWidget *set_breakpoint_at_cursor; - GtkWidget *run_to_cursor; - GtkWidget *separator7; - GSList *raw_opcodes_group = NULL; - GtkWidget *raw_opcodes; - GtkWidget *enc_opcodes; - GtkWidget *comments; - GtkWidget *hbox1; - GtkWidget *registers; - GtkWidget *vbox2; - GtkWidget *vpaned1; - GtkWidget *disasm; - GtkWidget *console; - GtkWidget *edit; - GtkAccelGroup *accel_group; - - accel_group = gtk_accel_group_new (); - - debugmain = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_name (debugmain, "debugmain"); - gtk_window_set_title (GTK_WINDOW (debugmain), "Debug main window"); - gtk_window_set_default_size (GTK_WINDOW (debugmain), 350, 300); - - vbox1 = gtk_vbox_new (FALSE, 0); - gtk_widget_set_name (vbox1, "vbox1"); - gtk_widget_show (vbox1); - gtk_container_add (GTK_CONTAINER (debugmain), vbox1); - - menu = gtk_menu_bar_new (); - gtk_widget_set_name (menu, "menu"); - gtk_widget_show (menu); - gtk_box_pack_start (GTK_BOX (vbox1), menu, FALSE, FALSE, 0); - - menuitem4 = gtk_menu_item_new_with_mnemonic ("_Debug"); - gtk_widget_set_name (menuitem4, "menuitem4"); - gtk_widget_show (menuitem4); - gtk_container_add (GTK_CONTAINER (menu), menuitem4); - - menuitem4_menu = gtk_menu_new (); - gtk_widget_set_name (menuitem4_menu, "menuitem4_menu"); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem4), menuitem4_menu); - - new_mem = gtk_menu_item_new_with_mnemonic ("New Memory Window"); - gtk_widget_set_name (new_mem, "new_mem"); - gtk_widget_show (new_mem); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), new_mem); - gtk_widget_add_accelerator (new_mem, "activate", accel_group, - GDK_m, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - new_disasm = gtk_menu_item_new_with_mnemonic ("New Disassembly Window"); - gtk_widget_set_name (new_disasm, "new_disasm"); - gtk_widget_show (new_disasm); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), new_disasm); - gtk_widget_add_accelerator (new_disasm, "activate", accel_group, - GDK_d, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - new_errorlog = gtk_menu_item_new_with_mnemonic ("New Error Log Window"); - gtk_widget_set_name (new_errorlog, "new_errorlog"); - gtk_widget_show (new_errorlog); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), new_errorlog); - gtk_widget_add_accelerator (new_errorlog, "activate", accel_group, - GDK_l, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - separator2 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator2, "separator2"); - gtk_widget_show (separator2); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), separator2); - gtk_widget_set_sensitive (separator2, FALSE); - - run = gtk_menu_item_new_with_mnemonic ("Run"); - gtk_widget_set_name (run, "run"); - gtk_widget_show (run); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), run); - gtk_widget_add_accelerator (run, "activate", accel_group, - GDK_F5, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - run_h = gtk_menu_item_new_with_mnemonic ("Run and Hide Debugger"); - gtk_widget_set_name (run_h, "run_h"); - gtk_widget_show (run_h); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), run_h); - gtk_widget_add_accelerator (run_h, "activate", accel_group, - GDK_F12, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - run_cpu = gtk_menu_item_new_with_mnemonic ("Run to Next CPU"); - gtk_widget_set_name (run_cpu, "run_cpu"); - gtk_widget_show (run_cpu); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), run_cpu); - gtk_widget_add_accelerator (run_cpu, "activate", accel_group, - GDK_F6, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - run_irq = gtk_menu_item_new_with_mnemonic ("Run until Next Interrupt on This CPU"); - gtk_widget_set_name (run_irq, "run_irq"); - gtk_widget_show (run_irq); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), run_irq); - gtk_widget_add_accelerator (run_irq, "activate", accel_group, - GDK_F7, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - run_vbl = gtk_menu_item_new_with_mnemonic ("Run until Next VBLANK"); - gtk_widget_set_name (run_vbl, "run_vbl"); - gtk_widget_show (run_vbl); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), run_vbl); - gtk_widget_add_accelerator (run_vbl, "activate", accel_group, - GDK_F8, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - separator3 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator3, "separator3"); - gtk_widget_show (separator3); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), separator3); - gtk_widget_set_sensitive (separator3, FALSE); - - step_into = gtk_menu_item_new_with_mnemonic ("Step Into"); - gtk_widget_set_name (step_into, "step_into"); - gtk_widget_show (step_into); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), step_into); - gtk_widget_add_accelerator (step_into, "activate", accel_group, - GDK_F11, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - step_over = gtk_menu_item_new_with_mnemonic ("Step Over"); - gtk_widget_set_name (step_over, "step_over"); - gtk_widget_show (step_over); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), step_over); - gtk_widget_add_accelerator (step_over, "activate", accel_group, - GDK_F9, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - step_out = gtk_menu_item_new_with_mnemonic ("Step Out"); - gtk_widget_set_name (step_out, "step_out"); - gtk_widget_show (step_out); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), step_out); - gtk_widget_add_accelerator (step_out, "activate", accel_group, - GDK_F11, (GdkModifierType) GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - - separator4 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator4, "separator4"); - gtk_widget_show (separator4); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), separator4); - gtk_widget_set_sensitive (separator4, FALSE); - - soft_reset = gtk_menu_item_new_with_mnemonic ("Soft Reset"); - gtk_widget_set_name (soft_reset, "soft_reset"); - gtk_widget_show (soft_reset); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), soft_reset); - gtk_widget_add_accelerator (soft_reset, "activate", accel_group, - GDK_F3, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - hard_reset = gtk_menu_item_new_with_mnemonic ("Hard Reset"); - gtk_widget_set_name (hard_reset, "hard_reset"); - gtk_widget_show (hard_reset); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), hard_reset); - gtk_widget_add_accelerator (hard_reset, "activate", accel_group, - GDK_F3, (GdkModifierType) GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - - exit = gtk_menu_item_new_with_mnemonic ("Exit"); - gtk_widget_set_name (exit, "exit"); - gtk_widget_show (exit); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), exit); - - item1 = gtk_menu_item_new_with_mnemonic ("_Options"); - gtk_widget_set_name (item1, "item1"); - gtk_widget_show (item1); - gtk_container_add (GTK_CONTAINER (menu), item1); - - item1_menu = gtk_menu_new (); - gtk_widget_set_name (item1_menu, "item1_menu"); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item1), item1_menu); - - set_breakpoint_at_cursor = gtk_menu_item_new_with_mnemonic ("Set breakpoint at cursor"); - gtk_widget_set_name (set_breakpoint_at_cursor, "set_breakpoint_at_cursor"); - gtk_widget_show (set_breakpoint_at_cursor); - gtk_container_add (GTK_CONTAINER (item1_menu), set_breakpoint_at_cursor); - - run_to_cursor = gtk_menu_item_new_with_mnemonic ("Run to cursor"); - gtk_widget_set_name (run_to_cursor, "run_to_cursor"); - gtk_widget_show (run_to_cursor); - gtk_container_add (GTK_CONTAINER (item1_menu), run_to_cursor); - gtk_widget_add_accelerator (run_to_cursor, "activate", accel_group, - GDK_F4, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - separator7 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator7, "separator7"); - gtk_widget_show (separator7); - gtk_container_add (GTK_CONTAINER (item1_menu), separator7); - gtk_widget_set_sensitive (separator7, FALSE); - - raw_opcodes = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Raw Opcodes"); - raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (raw_opcodes)); - gtk_widget_set_name (raw_opcodes, "raw_opcodes"); - gtk_widget_show (raw_opcodes); - gtk_container_add (GTK_CONTAINER (item1_menu), raw_opcodes); - gtk_widget_add_accelerator (raw_opcodes, "activate", accel_group, - GDK_r, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (raw_opcodes), TRUE); - - enc_opcodes = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Encryped Opcodes"); - raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (enc_opcodes)); - gtk_widget_set_name (enc_opcodes, "enc_opcodes"); - gtk_widget_show (enc_opcodes); - gtk_container_add (GTK_CONTAINER (item1_menu), enc_opcodes); - gtk_widget_add_accelerator (enc_opcodes, "activate", accel_group, - GDK_e, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - comments = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Comments"); - raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (comments)); - gtk_widget_set_name (comments, "comments"); - gtk_widget_show (comments); - gtk_container_add (GTK_CONTAINER (item1_menu), comments); - gtk_widget_add_accelerator (comments, "activate", accel_group, - GDK_c, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (comments), TRUE); - - hbox1 = gtk_hbox_new (FALSE, 0); - gtk_widget_set_name (hbox1, "hbox1"); - gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 2); - - registers = dview_new ("registers", "", "", 0, 0); - gtk_widget_set_name (registers, "registers"); - gtk_widget_show (registers); - gtk_box_pack_start (GTK_BOX (hbox1), registers, FALSE, TRUE, 0); - GTK_WIDGET_UNSET_FLAGS (registers, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (registers, GTK_CAN_DEFAULT); - - vbox2 = gtk_vbox_new (FALSE, 0); - gtk_widget_set_name (vbox2, "vbox2"); - gtk_widget_show (vbox2); - gtk_box_pack_start (GTK_BOX (hbox1), vbox2, TRUE, TRUE, 0); - - vpaned1 = gtk_vpaned_new (); - gtk_widget_set_name (vpaned1, "vpaned1"); - gtk_widget_show (vpaned1); - gtk_box_pack_start (GTK_BOX (vbox2), vpaned1, TRUE, TRUE, 0); - - disasm = dview_new ("disasm", "", "", 0, 0); - gtk_widget_set_name (disasm, "disasm"); - gtk_widget_show (disasm); - gtk_paned_pack1 (GTK_PANED (vpaned1), disasm, FALSE, TRUE); - GTK_WIDGET_UNSET_FLAGS (disasm, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (disasm, GTK_CAN_DEFAULT); - - console = dview_new ("console", "", "", 0, 0); - gtk_widget_set_name (console, "console"); - gtk_widget_show (console); - gtk_paned_pack2 (GTK_PANED (vpaned1), console, TRUE, TRUE); - GTK_WIDGET_UNSET_FLAGS (console, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (console, GTK_CAN_DEFAULT); - - edit = gtk_entry_new (); - gtk_widget_set_name (edit, "edit"); - gtk_widget_show (edit); - gtk_box_pack_start (GTK_BOX (vbox2), edit, FALSE, FALSE, 0); - gtk_entry_set_invisible_char (GTK_ENTRY (edit), 9679); - gtk_entry_set_activates_default (GTK_ENTRY (edit), TRUE); - gtk_entry_set_width_chars (GTK_ENTRY (edit), 30); - - g_signal_connect_swapped ((gpointer) new_mem, "activate", - G_CALLBACK (on_new_mem_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) new_disasm, "activate", - G_CALLBACK (on_new_disasm_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) new_errorlog, "activate", - G_CALLBACK (on_new_errorlog_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) run, "activate", - G_CALLBACK (on_run_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) run_h, "activate", - G_CALLBACK (on_run_h_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) run_cpu, "activate", - G_CALLBACK (on_run_cpu_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) run_irq, "activate", - G_CALLBACK (on_run_irq_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) run_vbl, "activate", - G_CALLBACK (on_run_vbl_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) step_into, "activate", - G_CALLBACK (on_step_into_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) step_over, "activate", - G_CALLBACK (on_step_over_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) step_out, "activate", - G_CALLBACK (on_step_out_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) soft_reset, "activate", - G_CALLBACK (on_soft_reset_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) hard_reset, "activate", - G_CALLBACK (on_hard_reset_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) exit, "activate", - G_CALLBACK (on_exit_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) set_breakpoint_at_cursor, "activate", - G_CALLBACK (on_set_breakpoint_at_cursor_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) run_to_cursor, "activate", - G_CALLBACK (on_run_to_cursor_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) raw_opcodes, "activate", - G_CALLBACK (on_raw_opcodes_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) enc_opcodes, "activate", - G_CALLBACK (on_enc_opcodes_activate), - GTK_OBJECT (debugmain)); - g_signal_connect_swapped ((gpointer) comments, "activate", - G_CALLBACK (on_comments_activate), - GTK_OBJECT (debugmain)); - g_signal_connect ((gpointer) disasm, "button_press_event", - G_CALLBACK (on_disasm_button_press_event), - NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (debugmain, debugmain, "debugmain"); - GLADE_HOOKUP_OBJECT (debugmain, vbox1, "vbox1"); - GLADE_HOOKUP_OBJECT (debugmain, menu, "menu"); - GLADE_HOOKUP_OBJECT (debugmain, menuitem4, "menuitem4"); - GLADE_HOOKUP_OBJECT (debugmain, menuitem4_menu, "menuitem4_menu"); - GLADE_HOOKUP_OBJECT (debugmain, new_mem, "new_mem"); - GLADE_HOOKUP_OBJECT (debugmain, new_disasm, "new_disasm"); - GLADE_HOOKUP_OBJECT (debugmain, new_errorlog, "new_errorlog"); - GLADE_HOOKUP_OBJECT (debugmain, separator2, "separator2"); - GLADE_HOOKUP_OBJECT (debugmain, run, "run"); - GLADE_HOOKUP_OBJECT (debugmain, run_h, "run_h"); - GLADE_HOOKUP_OBJECT (debugmain, run_cpu, "run_cpu"); - GLADE_HOOKUP_OBJECT (debugmain, run_irq, "run_irq"); - GLADE_HOOKUP_OBJECT (debugmain, run_vbl, "run_vbl"); - GLADE_HOOKUP_OBJECT (debugmain, separator3, "separator3"); - GLADE_HOOKUP_OBJECT (debugmain, step_into, "step_into"); - GLADE_HOOKUP_OBJECT (debugmain, step_over, "step_over"); - GLADE_HOOKUP_OBJECT (debugmain, step_out, "step_out"); - GLADE_HOOKUP_OBJECT (debugmain, separator4, "separator4"); - GLADE_HOOKUP_OBJECT (debugmain, soft_reset, "soft_reset"); - GLADE_HOOKUP_OBJECT (debugmain, hard_reset, "hard_reset"); - GLADE_HOOKUP_OBJECT (debugmain, exit, "exit"); - GLADE_HOOKUP_OBJECT (debugmain, item1, "item1"); - GLADE_HOOKUP_OBJECT (debugmain, item1_menu, "item1_menu"); - GLADE_HOOKUP_OBJECT (debugmain, set_breakpoint_at_cursor, "set_breakpoint_at_cursor"); - GLADE_HOOKUP_OBJECT (debugmain, run_to_cursor, "run_to_cursor"); - GLADE_HOOKUP_OBJECT (debugmain, separator7, "separator7"); - GLADE_HOOKUP_OBJECT (debugmain, raw_opcodes, "raw_opcodes"); - GLADE_HOOKUP_OBJECT (debugmain, enc_opcodes, "enc_opcodes"); - GLADE_HOOKUP_OBJECT (debugmain, comments, "comments"); - GLADE_HOOKUP_OBJECT (debugmain, hbox1, "hbox1"); - GLADE_HOOKUP_OBJECT (debugmain, registers, "registers"); - GLADE_HOOKUP_OBJECT (debugmain, vbox2, "vbox2"); - GLADE_HOOKUP_OBJECT (debugmain, vpaned1, "vpaned1"); - GLADE_HOOKUP_OBJECT (debugmain, disasm, "disasm"); - GLADE_HOOKUP_OBJECT (debugmain, console, "console"); - GLADE_HOOKUP_OBJECT (debugmain, edit, "edit"); - - gtk_widget_grab_focus (edit); - gtk_window_add_accel_group (GTK_WINDOW (debugmain), accel_group); - - return debugmain; + GtkWidget *debugmain; + GtkWidget *vbox1; + GtkWidget *menu; + GtkWidget *menuitem4; + GtkWidget *menuitem4_menu; + GtkWidget *new_mem; + GtkWidget *new_disasm; + GtkWidget *new_errorlog; + GtkWidget *separator2; + GtkWidget *run; + GtkWidget *run_h; + GtkWidget *run_cpu; + GtkWidget *run_irq; + GtkWidget *run_vbl; + GtkWidget *separator3; + GtkWidget *step_into; + GtkWidget *step_over; + GtkWidget *step_out; + GtkWidget *separator4; + GtkWidget *soft_reset; + GtkWidget *hard_reset; + GtkWidget *exit; + GtkWidget *item1; + GtkWidget *item1_menu; + GtkWidget *set_breakpoint_at_cursor; + GtkWidget *run_to_cursor; + GtkWidget *separator7; + GSList *raw_opcodes_group = NULL; + GtkWidget *raw_opcodes; + GtkWidget *enc_opcodes; + GtkWidget *comments; + GtkWidget *hbox1; + GtkWidget *registers; + GtkWidget *vbox2; + GtkWidget *vpaned1; + GtkWidget *disasm; + GtkWidget *console; + GtkWidget *edit; + GtkAccelGroup *accel_group; + + accel_group = gtk_accel_group_new (); + + debugmain = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_widget_set_name (debugmain, "debugmain"); + gtk_window_set_title (GTK_WINDOW (debugmain), "Debug main window"); + gtk_window_set_default_size (GTK_WINDOW (debugmain), 350, 300); + + vbox1 = gtk_vbox_new (FALSE, 0); + gtk_widget_set_name (vbox1, "vbox1"); + gtk_widget_show (vbox1); + gtk_container_add (GTK_CONTAINER (debugmain), vbox1); + + menu = gtk_menu_bar_new (); + gtk_widget_set_name (menu, "menu"); + gtk_widget_show (menu); + gtk_box_pack_start (GTK_BOX (vbox1), menu, FALSE, FALSE, 0); + + menuitem4 = gtk_menu_item_new_with_mnemonic ("_Debug"); + gtk_widget_set_name (menuitem4, "menuitem4"); + gtk_widget_show (menuitem4); + gtk_container_add (GTK_CONTAINER (menu), menuitem4); + + menuitem4_menu = gtk_menu_new (); + gtk_widget_set_name (menuitem4_menu, "menuitem4_menu"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem4), menuitem4_menu); + + new_mem = gtk_menu_item_new_with_mnemonic ("New Memory Window"); + gtk_widget_set_name (new_mem, "new_mem"); + gtk_widget_show (new_mem); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), new_mem); + gtk_widget_add_accelerator (new_mem, "activate", accel_group, + GDK_m, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + new_disasm = gtk_menu_item_new_with_mnemonic ("New Disassembly Window"); + gtk_widget_set_name (new_disasm, "new_disasm"); + gtk_widget_show (new_disasm); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), new_disasm); + gtk_widget_add_accelerator (new_disasm, "activate", accel_group, + GDK_d, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + new_errorlog = gtk_menu_item_new_with_mnemonic ("New Error Log Window"); + gtk_widget_set_name (new_errorlog, "new_errorlog"); + gtk_widget_show (new_errorlog); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), new_errorlog); + gtk_widget_add_accelerator (new_errorlog, "activate", accel_group, + GDK_l, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + separator2 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator2, "separator2"); + gtk_widget_show (separator2); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), separator2); + gtk_widget_set_sensitive (separator2, FALSE); + + run = gtk_menu_item_new_with_mnemonic ("Run"); + gtk_widget_set_name (run, "run"); + gtk_widget_show (run); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), run); + gtk_widget_add_accelerator (run, "activate", accel_group, + GDK_F5, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + run_h = gtk_menu_item_new_with_mnemonic ("Run and Hide Debugger"); + gtk_widget_set_name (run_h, "run_h"); + gtk_widget_show (run_h); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), run_h); + gtk_widget_add_accelerator (run_h, "activate", accel_group, + GDK_F12, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + run_cpu = gtk_menu_item_new_with_mnemonic ("Run to Next CPU"); + gtk_widget_set_name (run_cpu, "run_cpu"); + gtk_widget_show (run_cpu); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), run_cpu); + gtk_widget_add_accelerator (run_cpu, "activate", accel_group, + GDK_F6, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + run_irq = gtk_menu_item_new_with_mnemonic ("Run until Next Interrupt on This CPU"); + gtk_widget_set_name (run_irq, "run_irq"); + gtk_widget_show (run_irq); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), run_irq); + gtk_widget_add_accelerator (run_irq, "activate", accel_group, + GDK_F7, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + run_vbl = gtk_menu_item_new_with_mnemonic ("Run until Next VBLANK"); + gtk_widget_set_name (run_vbl, "run_vbl"); + gtk_widget_show (run_vbl); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), run_vbl); + gtk_widget_add_accelerator (run_vbl, "activate", accel_group, + GDK_F8, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + separator3 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator3, "separator3"); + gtk_widget_show (separator3); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), separator3); + gtk_widget_set_sensitive (separator3, FALSE); + + step_into = gtk_menu_item_new_with_mnemonic ("Step Into"); + gtk_widget_set_name (step_into, "step_into"); + gtk_widget_show (step_into); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), step_into); + gtk_widget_add_accelerator (step_into, "activate", accel_group, + GDK_F11, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + step_over = gtk_menu_item_new_with_mnemonic ("Step Over"); + gtk_widget_set_name (step_over, "step_over"); + gtk_widget_show (step_over); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), step_over); + gtk_widget_add_accelerator (step_over, "activate", accel_group, + GDK_F9, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + step_out = gtk_menu_item_new_with_mnemonic ("Step Out"); + gtk_widget_set_name (step_out, "step_out"); + gtk_widget_show (step_out); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), step_out); + gtk_widget_add_accelerator (step_out, "activate", accel_group, + GDK_F11, (GdkModifierType) GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + separator4 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator4, "separator4"); + gtk_widget_show (separator4); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), separator4); + gtk_widget_set_sensitive (separator4, FALSE); + + soft_reset = gtk_menu_item_new_with_mnemonic ("Soft Reset"); + gtk_widget_set_name (soft_reset, "soft_reset"); + gtk_widget_show (soft_reset); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), soft_reset); + gtk_widget_add_accelerator (soft_reset, "activate", accel_group, + GDK_F3, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + hard_reset = gtk_menu_item_new_with_mnemonic ("Hard Reset"); + gtk_widget_set_name (hard_reset, "hard_reset"); + gtk_widget_show (hard_reset); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), hard_reset); + gtk_widget_add_accelerator (hard_reset, "activate", accel_group, + GDK_F3, (GdkModifierType) GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + exit = gtk_menu_item_new_with_mnemonic ("Exit"); + gtk_widget_set_name (exit, "exit"); + gtk_widget_show (exit); + gtk_container_add (GTK_CONTAINER (menuitem4_menu), exit); + + item1 = gtk_menu_item_new_with_mnemonic ("_Options"); + gtk_widget_set_name (item1, "item1"); + gtk_widget_show (item1); + gtk_container_add (GTK_CONTAINER (menu), item1); + + item1_menu = gtk_menu_new (); + gtk_widget_set_name (item1_menu, "item1_menu"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item1), item1_menu); + + set_breakpoint_at_cursor = gtk_menu_item_new_with_mnemonic ("Set breakpoint at cursor"); + gtk_widget_set_name (set_breakpoint_at_cursor, "set_breakpoint_at_cursor"); + gtk_widget_show (set_breakpoint_at_cursor); + gtk_container_add (GTK_CONTAINER (item1_menu), set_breakpoint_at_cursor); + + run_to_cursor = gtk_menu_item_new_with_mnemonic ("Run to cursor"); + gtk_widget_set_name (run_to_cursor, "run_to_cursor"); + gtk_widget_show (run_to_cursor); + gtk_container_add (GTK_CONTAINER (item1_menu), run_to_cursor); + gtk_widget_add_accelerator (run_to_cursor, "activate", accel_group, + GDK_F4, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + separator7 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator7, "separator7"); + gtk_widget_show (separator7); + gtk_container_add (GTK_CONTAINER (item1_menu), separator7); + gtk_widget_set_sensitive (separator7, FALSE); + + raw_opcodes = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Raw Opcodes"); + raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (raw_opcodes)); + gtk_widget_set_name (raw_opcodes, "raw_opcodes"); + gtk_widget_show (raw_opcodes); + gtk_container_add (GTK_CONTAINER (item1_menu), raw_opcodes); + gtk_widget_add_accelerator (raw_opcodes, "activate", accel_group, + GDK_r, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (raw_opcodes), TRUE); + + enc_opcodes = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Encryped Opcodes"); + raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (enc_opcodes)); + gtk_widget_set_name (enc_opcodes, "enc_opcodes"); + gtk_widget_show (enc_opcodes); + gtk_container_add (GTK_CONTAINER (item1_menu), enc_opcodes); + gtk_widget_add_accelerator (enc_opcodes, "activate", accel_group, + GDK_e, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + comments = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Comments"); + raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (comments)); + gtk_widget_set_name (comments, "comments"); + gtk_widget_show (comments); + gtk_container_add (GTK_CONTAINER (item1_menu), comments); + gtk_widget_add_accelerator (comments, "activate", accel_group, + GDK_c, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (comments), TRUE); + + hbox1 = gtk_hbox_new (FALSE, 0); + gtk_widget_set_name (hbox1, "hbox1"); + gtk_widget_show (hbox1); + gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 2); + + registers = dview_new ("registers", "", "", 0, 0); + gtk_widget_set_name (registers, "registers"); + gtk_widget_show (registers); + gtk_box_pack_start (GTK_BOX (hbox1), registers, FALSE, TRUE, 0); + GTK_WIDGET_UNSET_FLAGS (registers, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS (registers, GTK_CAN_DEFAULT); + + vbox2 = gtk_vbox_new (FALSE, 0); + gtk_widget_set_name (vbox2, "vbox2"); + gtk_widget_show (vbox2); + gtk_box_pack_start (GTK_BOX (hbox1), vbox2, TRUE, TRUE, 0); + + vpaned1 = gtk_vpaned_new (); + gtk_widget_set_name (vpaned1, "vpaned1"); + gtk_widget_show (vpaned1); + gtk_box_pack_start (GTK_BOX (vbox2), vpaned1, TRUE, TRUE, 0); + + disasm = dview_new ("disasm", "", "", 0, 0); + gtk_widget_set_name (disasm, "disasm"); + gtk_widget_show (disasm); + gtk_paned_pack1 (GTK_PANED (vpaned1), disasm, FALSE, TRUE); + GTK_WIDGET_UNSET_FLAGS (disasm, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS (disasm, GTK_CAN_DEFAULT); + + console = dview_new ("console", "", "", 0, 0); + gtk_widget_set_name (console, "console"); + gtk_widget_show (console); + gtk_paned_pack2 (GTK_PANED (vpaned1), console, TRUE, TRUE); + GTK_WIDGET_UNSET_FLAGS (console, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS (console, GTK_CAN_DEFAULT); + + edit = gtk_entry_new (); + gtk_widget_set_name (edit, "edit"); + gtk_widget_show (edit); + gtk_box_pack_start (GTK_BOX (vbox2), edit, FALSE, FALSE, 0); + gtk_entry_set_invisible_char (GTK_ENTRY (edit), 9679); + gtk_entry_set_activates_default (GTK_ENTRY (edit), TRUE); + gtk_entry_set_width_chars (GTK_ENTRY (edit), 30); + + g_signal_connect_swapped ((gpointer) new_mem, "activate", + G_CALLBACK (on_new_mem_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) new_disasm, "activate", + G_CALLBACK (on_new_disasm_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) new_errorlog, "activate", + G_CALLBACK (on_new_errorlog_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) run, "activate", + G_CALLBACK (on_run_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) run_h, "activate", + G_CALLBACK (on_run_h_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) run_cpu, "activate", + G_CALLBACK (on_run_cpu_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) run_irq, "activate", + G_CALLBACK (on_run_irq_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) run_vbl, "activate", + G_CALLBACK (on_run_vbl_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) step_into, "activate", + G_CALLBACK (on_step_into_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) step_over, "activate", + G_CALLBACK (on_step_over_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) step_out, "activate", + G_CALLBACK (on_step_out_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) soft_reset, "activate", + G_CALLBACK (on_soft_reset_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) hard_reset, "activate", + G_CALLBACK (on_hard_reset_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) exit, "activate", + G_CALLBACK (on_exit_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) set_breakpoint_at_cursor, "activate", + G_CALLBACK (on_set_breakpoint_at_cursor_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) run_to_cursor, "activate", + G_CALLBACK (on_run_to_cursor_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) raw_opcodes, "activate", + G_CALLBACK (on_raw_opcodes_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) enc_opcodes, "activate", + G_CALLBACK (on_enc_opcodes_activate), + GTK_OBJECT (debugmain)); + g_signal_connect_swapped ((gpointer) comments, "activate", + G_CALLBACK (on_comments_activate), + GTK_OBJECT (debugmain)); + g_signal_connect ((gpointer) disasm, "button_press_event", + G_CALLBACK (on_disasm_button_press_event), + NULL); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (debugmain, debugmain, "debugmain"); + GLADE_HOOKUP_OBJECT (debugmain, vbox1, "vbox1"); + GLADE_HOOKUP_OBJECT (debugmain, menu, "menu"); + GLADE_HOOKUP_OBJECT (debugmain, menuitem4, "menuitem4"); + GLADE_HOOKUP_OBJECT (debugmain, menuitem4_menu, "menuitem4_menu"); + GLADE_HOOKUP_OBJECT (debugmain, new_mem, "new_mem"); + GLADE_HOOKUP_OBJECT (debugmain, new_disasm, "new_disasm"); + GLADE_HOOKUP_OBJECT (debugmain, new_errorlog, "new_errorlog"); + GLADE_HOOKUP_OBJECT (debugmain, separator2, "separator2"); + GLADE_HOOKUP_OBJECT (debugmain, run, "run"); + GLADE_HOOKUP_OBJECT (debugmain, run_h, "run_h"); + GLADE_HOOKUP_OBJECT (debugmain, run_cpu, "run_cpu"); + GLADE_HOOKUP_OBJECT (debugmain, run_irq, "run_irq"); + GLADE_HOOKUP_OBJECT (debugmain, run_vbl, "run_vbl"); + GLADE_HOOKUP_OBJECT (debugmain, separator3, "separator3"); + GLADE_HOOKUP_OBJECT (debugmain, step_into, "step_into"); + GLADE_HOOKUP_OBJECT (debugmain, step_over, "step_over"); + GLADE_HOOKUP_OBJECT (debugmain, step_out, "step_out"); + GLADE_HOOKUP_OBJECT (debugmain, separator4, "separator4"); + GLADE_HOOKUP_OBJECT (debugmain, soft_reset, "soft_reset"); + GLADE_HOOKUP_OBJECT (debugmain, hard_reset, "hard_reset"); + GLADE_HOOKUP_OBJECT (debugmain, exit, "exit"); + GLADE_HOOKUP_OBJECT (debugmain, item1, "item1"); + GLADE_HOOKUP_OBJECT (debugmain, item1_menu, "item1_menu"); + GLADE_HOOKUP_OBJECT (debugmain, set_breakpoint_at_cursor, "set_breakpoint_at_cursor"); + GLADE_HOOKUP_OBJECT (debugmain, run_to_cursor, "run_to_cursor"); + GLADE_HOOKUP_OBJECT (debugmain, separator7, "separator7"); + GLADE_HOOKUP_OBJECT (debugmain, raw_opcodes, "raw_opcodes"); + GLADE_HOOKUP_OBJECT (debugmain, enc_opcodes, "enc_opcodes"); + GLADE_HOOKUP_OBJECT (debugmain, comments, "comments"); + GLADE_HOOKUP_OBJECT (debugmain, hbox1, "hbox1"); + GLADE_HOOKUP_OBJECT (debugmain, registers, "registers"); + GLADE_HOOKUP_OBJECT (debugmain, vbox2, "vbox2"); + GLADE_HOOKUP_OBJECT (debugmain, vpaned1, "vpaned1"); + GLADE_HOOKUP_OBJECT (debugmain, disasm, "disasm"); + GLADE_HOOKUP_OBJECT (debugmain, console, "console"); + GLADE_HOOKUP_OBJECT (debugmain, edit, "edit"); + + gtk_widget_grab_focus (edit); + gtk_window_add_accel_group (GTK_WINDOW (debugmain), accel_group); + + return debugmain; } GtkWidget* create_memorywin (void) { - GtkWidget *memorywin; - GtkWidget *vbox3; - GtkWidget *menu; - GtkWidget *debug; - GtkWidget *debug_menu; - GtkWidget *new_mem; - GtkWidget *new_disasm; - GtkWidget *new_errorlog; - GtkWidget *separator2; - GtkWidget *run; - GtkWidget *run_h; - GtkWidget *run_cpu; - GtkWidget *run_irq; - GtkWidget *run_vbl; - GtkWidget *separator3; - GtkWidget *step_into; - GtkWidget *step_over; - GtkWidget *step_out; - GtkWidget *separator4; - GtkWidget *soft_reset; - GtkWidget *hard_reset; - GtkWidget *exit; - GtkWidget *options; - GtkWidget *options_menu; - GSList *chunks_1_group = NULL; - GtkWidget *chunks_1; - GtkWidget *chunks_2; - GtkWidget *chunks_4; - GtkWidget *separator5; - GSList *logical_addresses_group = NULL; - GtkWidget *logical_addresses; - GtkWidget *physical_addresses; - GtkWidget *separatormenuitem1; - GtkWidget *reverse; - GtkWidget *separator6; - GtkWidget *ibpl; - GtkWidget *dbpl; - GtkWidget *hbox2; - GtkWidget *edit; - GtkWidget *zone; - GtkWidget *memoryview; - GtkAccelGroup *accel_group; - - accel_group = gtk_accel_group_new (); - - memorywin = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_name (memorywin, "memorywin"); - gtk_window_set_title (GTK_WINDOW (memorywin), "Memory View"); - - vbox3 = gtk_vbox_new (FALSE, 0); - gtk_widget_set_name (vbox3, "vbox3"); - gtk_widget_show (vbox3); - gtk_container_add (GTK_CONTAINER (memorywin), vbox3); - - menu = gtk_menu_bar_new (); - gtk_widget_set_name (menu, "menu"); - gtk_widget_show (menu); - gtk_box_pack_start (GTK_BOX (vbox3), menu, FALSE, FALSE, 0); - - debug = gtk_menu_item_new_with_mnemonic ("_Debug"); - gtk_widget_set_name (debug, "debug"); - gtk_widget_show (debug); - gtk_container_add (GTK_CONTAINER (menu), debug); - - debug_menu = gtk_menu_new (); - gtk_widget_set_name (debug_menu, "debug_menu"); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (debug), debug_menu); - - new_mem = gtk_menu_item_new_with_mnemonic ("New Memory Window"); - gtk_widget_set_name (new_mem, "new_mem"); - gtk_widget_show (new_mem); - gtk_container_add (GTK_CONTAINER (debug_menu), new_mem); - gtk_widget_add_accelerator (new_mem, "activate", accel_group, - GDK_m, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - new_disasm = gtk_menu_item_new_with_mnemonic ("New Disassembly Window"); - gtk_widget_set_name (new_disasm, "new_disasm"); - gtk_widget_show (new_disasm); - gtk_container_add (GTK_CONTAINER (debug_menu), new_disasm); - gtk_widget_add_accelerator (new_disasm, "activate", accel_group, - GDK_d, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - new_errorlog = gtk_menu_item_new_with_mnemonic ("New Error Log Window"); - gtk_widget_set_name (new_errorlog, "new_errorlog"); - gtk_widget_show (new_errorlog); - gtk_container_add (GTK_CONTAINER (debug_menu), new_errorlog); - gtk_widget_add_accelerator (new_errorlog, "activate", accel_group, - GDK_l, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - separator2 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator2, "separator2"); - gtk_widget_show (separator2); - gtk_container_add (GTK_CONTAINER (debug_menu), separator2); - gtk_widget_set_sensitive (separator2, FALSE); - - run = gtk_menu_item_new_with_mnemonic ("Run"); - gtk_widget_set_name (run, "run"); - gtk_widget_show (run); - gtk_container_add (GTK_CONTAINER (debug_menu), run); - gtk_widget_add_accelerator (run, "activate", accel_group, - GDK_F5, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - run_h = gtk_menu_item_new_with_mnemonic ("Run and Hide Debugger"); - gtk_widget_set_name (run_h, "run_h"); - gtk_widget_show (run_h); - gtk_container_add (GTK_CONTAINER (debug_menu), run_h); - gtk_widget_add_accelerator (run_h, "activate", accel_group, - GDK_F12, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - run_cpu = gtk_menu_item_new_with_mnemonic ("Run to Next CPU"); - gtk_widget_set_name (run_cpu, "run_cpu"); - gtk_widget_show (run_cpu); - gtk_container_add (GTK_CONTAINER (debug_menu), run_cpu); - gtk_widget_add_accelerator (run_cpu, "activate", accel_group, - GDK_F6, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - run_irq = gtk_menu_item_new_with_mnemonic ("Run until Next Interrupt on This CPU"); - gtk_widget_set_name (run_irq, "run_irq"); - gtk_widget_show (run_irq); - gtk_container_add (GTK_CONTAINER (debug_menu), run_irq); - gtk_widget_add_accelerator (run_irq, "activate", accel_group, - GDK_F7, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - run_vbl = gtk_menu_item_new_with_mnemonic ("Run until Next VBLANK"); - gtk_widget_set_name (run_vbl, "run_vbl"); - gtk_widget_show (run_vbl); - gtk_container_add (GTK_CONTAINER (debug_menu), run_vbl); - gtk_widget_add_accelerator (run_vbl, "activate", accel_group, - GDK_F8, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - separator3 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator3, "separator3"); - gtk_widget_show (separator3); - gtk_container_add (GTK_CONTAINER (debug_menu), separator3); - gtk_widget_set_sensitive (separator3, FALSE); - - step_into = gtk_menu_item_new_with_mnemonic ("Step Into"); - gtk_widget_set_name (step_into, "step_into"); - gtk_widget_show (step_into); - gtk_container_add (GTK_CONTAINER (debug_menu), step_into); - gtk_widget_add_accelerator (step_into, "activate", accel_group, - GDK_F11, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - step_over = gtk_menu_item_new_with_mnemonic ("Step Over"); - gtk_widget_set_name (step_over, "step_over"); - gtk_widget_show (step_over); - gtk_container_add (GTK_CONTAINER (debug_menu), step_over); - gtk_widget_add_accelerator (step_over, "activate", accel_group, - GDK_F10, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - step_out = gtk_menu_item_new_with_mnemonic ("Step Out"); - gtk_widget_set_name (step_out, "step_out"); - gtk_widget_show (step_out); - gtk_container_add (GTK_CONTAINER (debug_menu), step_out); - gtk_widget_add_accelerator (step_out, "activate", accel_group, - GDK_F11, (GdkModifierType) GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - - separator4 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator4, "separator4"); - gtk_widget_show (separator4); - gtk_container_add (GTK_CONTAINER (debug_menu), separator4); - gtk_widget_set_sensitive (separator4, FALSE); - - soft_reset = gtk_menu_item_new_with_mnemonic ("Soft Reset"); - gtk_widget_set_name (soft_reset, "soft_reset"); - gtk_widget_show (soft_reset); - gtk_container_add (GTK_CONTAINER (debug_menu), soft_reset); - gtk_widget_add_accelerator (soft_reset, "activate", accel_group, - GDK_F3, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - hard_reset = gtk_menu_item_new_with_mnemonic ("Hard Reset"); - gtk_widget_set_name (hard_reset, "hard_reset"); - gtk_widget_show (hard_reset); - gtk_container_add (GTK_CONTAINER (debug_menu), hard_reset); - gtk_widget_add_accelerator (hard_reset, "activate", accel_group, - GDK_F3, (GdkModifierType) GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - - exit = gtk_menu_item_new_with_mnemonic ("Exit"); - gtk_widget_set_name (exit, "exit"); - gtk_widget_show (exit); - gtk_container_add (GTK_CONTAINER (debug_menu), exit); - - options = gtk_menu_item_new_with_mnemonic ("_Options"); - gtk_widget_set_name (options, "options"); - gtk_widget_show (options); - gtk_container_add (GTK_CONTAINER (menu), options); - - options_menu = gtk_menu_new (); - gtk_widget_set_name (options_menu, "options_menu"); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (options), options_menu); - - chunks_1 = gtk_radio_menu_item_new_with_mnemonic (chunks_1_group, "1-byte chunks"); - chunks_1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (chunks_1)); - gtk_widget_set_name (chunks_1, "chunks_1"); - gtk_widget_show (chunks_1); - gtk_container_add (GTK_CONTAINER (options_menu), chunks_1); - gtk_widget_add_accelerator (chunks_1, "activate", accel_group, - GDK_1, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (chunks_1), TRUE); - - chunks_2 = gtk_radio_menu_item_new_with_mnemonic (chunks_1_group, "2-bytes chunks"); - chunks_1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (chunks_2)); - gtk_widget_set_name (chunks_2, "chunks_2"); - gtk_widget_show (chunks_2); - gtk_container_add (GTK_CONTAINER (options_menu), chunks_2); - gtk_widget_add_accelerator (chunks_2, "activate", accel_group, - GDK_2, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - chunks_4 = gtk_radio_menu_item_new_with_mnemonic (chunks_1_group, "4-bytes chunks"); - chunks_1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (chunks_4)); - gtk_widget_set_name (chunks_4, "chunks_4"); - gtk_widget_show (chunks_4); - gtk_container_add (GTK_CONTAINER (options_menu), chunks_4); - gtk_widget_add_accelerator (chunks_4, "activate", accel_group, - GDK_4, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - separator5 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator5, "separator5"); - gtk_widget_show (separator5); - gtk_container_add (GTK_CONTAINER (options_menu), separator5); - gtk_widget_set_sensitive (separator5, FALSE); - - logical_addresses = gtk_radio_menu_item_new_with_mnemonic (logical_addresses_group, "Logical Addresses"); - logical_addresses_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (logical_addresses)); - gtk_widget_set_name (logical_addresses, "logical_addresses"); - gtk_widget_show (logical_addresses); - gtk_container_add (GTK_CONTAINER (options_menu), logical_addresses); - gtk_widget_add_accelerator (logical_addresses, "activate", accel_group, - GDK_l, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (logical_addresses), TRUE); - - physical_addresses = gtk_radio_menu_item_new_with_mnemonic (logical_addresses_group, "Physical Addresses"); - logical_addresses_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (physical_addresses)); - gtk_widget_set_name (physical_addresses, "physical_addresses"); - gtk_widget_show (physical_addresses); - gtk_container_add (GTK_CONTAINER (options_menu), physical_addresses); - gtk_widget_add_accelerator (physical_addresses, "activate", accel_group, - GDK_y, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - separatormenuitem1 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separatormenuitem1, "separatormenuitem1"); - gtk_widget_show (separatormenuitem1); - gtk_container_add (GTK_CONTAINER (options_menu), separatormenuitem1); - gtk_widget_set_sensitive (separatormenuitem1, FALSE); - - reverse = gtk_check_menu_item_new_with_mnemonic ("Reverse View"); - gtk_widget_set_name (reverse, "reverse"); - gtk_widget_show (reverse); - gtk_container_add (GTK_CONTAINER (options_menu), reverse); - gtk_widget_add_accelerator (reverse, "activate", accel_group, - GDK_r, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - separator6 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separator6, "separator6"); - gtk_widget_show (separator6); - gtk_container_add (GTK_CONTAINER (options_menu), separator6); - gtk_widget_set_sensitive (separator6, FALSE); - - ibpl = gtk_menu_item_new_with_mnemonic ("Increase bytes per line"); - gtk_widget_set_name (ibpl, "ibpl"); - gtk_widget_show (ibpl); - gtk_container_add (GTK_CONTAINER (options_menu), ibpl); - gtk_widget_add_accelerator (ibpl, "activate", accel_group, - GDK_p, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - dbpl = gtk_menu_item_new_with_mnemonic ("Decrease bytes per line"); - gtk_widget_set_name (dbpl, "dbpl"); - gtk_widget_show (dbpl); - gtk_container_add (GTK_CONTAINER (options_menu), dbpl); - gtk_widget_add_accelerator (dbpl, "activate", accel_group, - GDK_o, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - hbox2 = gtk_hbox_new (FALSE, 0); - gtk_widget_set_name (hbox2, "hbox2"); - gtk_widget_show (hbox2); - gtk_box_pack_start (GTK_BOX (vbox3), hbox2, FALSE, TRUE, 0); - - edit = gtk_entry_new (); - gtk_widget_set_name (edit, "edit"); - gtk_widget_show (edit); - gtk_box_pack_start (GTK_BOX (hbox2), edit, TRUE, TRUE, 0); - gtk_entry_set_invisible_char (GTK_ENTRY (edit), 9679); - - zone = gtk_combo_box_new_text (); - gtk_widget_set_name (zone, "zone"); - gtk_widget_show (zone); - gtk_box_pack_start (GTK_BOX (hbox2), zone, TRUE, TRUE, 0); - - memoryview = dview_new ("memoryview", "", "", 0, 0); - gtk_widget_set_name (memoryview, "memoryview"); - gtk_widget_show (memoryview); - gtk_box_pack_start (GTK_BOX (vbox3), memoryview, TRUE, TRUE, 0); - GTK_WIDGET_UNSET_FLAGS (memoryview, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (memoryview, GTK_CAN_DEFAULT); - - g_signal_connect_swapped ((gpointer) new_mem, "activate", - G_CALLBACK (on_new_mem_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) new_disasm, "activate", - G_CALLBACK (on_new_disasm_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) new_errorlog, "activate", - G_CALLBACK (on_new_errorlog_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) run, "activate", - G_CALLBACK (on_run_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) run_h, "activate", - G_CALLBACK (on_run_h_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) run_cpu, "activate", - G_CALLBACK (on_run_cpu_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) run_irq, "activate", - G_CALLBACK (on_run_irq_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) run_vbl, "activate", - G_CALLBACK (on_run_vbl_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) step_into, "activate", - G_CALLBACK (on_step_into_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) step_over, "activate", - G_CALLBACK (on_step_over_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) step_out, "activate", - G_CALLBACK (on_step_out_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) soft_reset, "activate", - G_CALLBACK (on_soft_reset_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) hard_reset, "activate", - G_CALLBACK (on_hard_reset_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) exit, "activate", - G_CALLBACK (on_exit_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) chunks_1, "activate", - G_CALLBACK (on_chunks_1_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) chunks_2, "activate", - G_CALLBACK (on_chunks_2_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) chunks_4, "activate", - G_CALLBACK (on_chunks_4_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) logical_addresses, "activate", - G_CALLBACK (on_logical_addresses_group_changed), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) physical_addresses, "activate", - G_CALLBACK (on_physical_addresses_group_changed), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) reverse, "activate", - G_CALLBACK (on_reverse_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) ibpl, "activate", - G_CALLBACK (on_ibpl_activate), - GTK_OBJECT (memorywin)); - g_signal_connect_swapped ((gpointer) dbpl, "activate", - G_CALLBACK (on_dbpl_activate), - GTK_OBJECT (memorywin)); - g_signal_connect ((gpointer) memoryview, "button_press_event", - G_CALLBACK (on_memoryview_button_press_event), - NULL); - g_signal_connect ((gpointer) memoryview, "key_press_event", - G_CALLBACK (on_memoryview_key_press_event), - NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (memorywin, memorywin, "memorywin"); - GLADE_HOOKUP_OBJECT (memorywin, vbox3, "vbox3"); - GLADE_HOOKUP_OBJECT (memorywin, menu, "menu"); - GLADE_HOOKUP_OBJECT (memorywin, debug, "debug"); - GLADE_HOOKUP_OBJECT (memorywin, debug_menu, "debug_menu"); - GLADE_HOOKUP_OBJECT (memorywin, new_mem, "new_mem"); - GLADE_HOOKUP_OBJECT (memorywin, new_disasm, "new_disasm"); - GLADE_HOOKUP_OBJECT (memorywin, new_errorlog, "new_errorlog"); - GLADE_HOOKUP_OBJECT (memorywin, separator2, "separator2"); - GLADE_HOOKUP_OBJECT (memorywin, run, "run"); - GLADE_HOOKUP_OBJECT (memorywin, run_h, "run_h"); - GLADE_HOOKUP_OBJECT (memorywin, run_cpu, "run_cpu"); - GLADE_HOOKUP_OBJECT (memorywin, run_irq, "run_irq"); - GLADE_HOOKUP_OBJECT (memorywin, run_vbl, "run_vbl"); - GLADE_HOOKUP_OBJECT (memorywin, separator3, "separator3"); - GLADE_HOOKUP_OBJECT (memorywin, step_into, "step_into"); - GLADE_HOOKUP_OBJECT (memorywin, step_over, "step_over"); - GLADE_HOOKUP_OBJECT (memorywin, step_out, "step_out"); - GLADE_HOOKUP_OBJECT (memorywin, separator4, "separator4"); - GLADE_HOOKUP_OBJECT (memorywin, soft_reset, "soft_reset"); - GLADE_HOOKUP_OBJECT (memorywin, hard_reset, "hard_reset"); - GLADE_HOOKUP_OBJECT (memorywin, exit, "exit"); - GLADE_HOOKUP_OBJECT (memorywin, options, "options"); - GLADE_HOOKUP_OBJECT (memorywin, options_menu, "options_menu"); - GLADE_HOOKUP_OBJECT (memorywin, chunks_1, "chunks_1"); - GLADE_HOOKUP_OBJECT (memorywin, chunks_2, "chunks_2"); - GLADE_HOOKUP_OBJECT (memorywin, chunks_4, "chunks_4"); - GLADE_HOOKUP_OBJECT (memorywin, separator5, "separator5"); - GLADE_HOOKUP_OBJECT (memorywin, logical_addresses, "logical_addresses"); - GLADE_HOOKUP_OBJECT (memorywin, physical_addresses, "physical_addresses"); - GLADE_HOOKUP_OBJECT (memorywin, separatormenuitem1, "separatormenuitem1"); - GLADE_HOOKUP_OBJECT (memorywin, reverse, "reverse"); - GLADE_HOOKUP_OBJECT (memorywin, separator6, "separator6"); - GLADE_HOOKUP_OBJECT (memorywin, ibpl, "ibpl"); - GLADE_HOOKUP_OBJECT (memorywin, dbpl, "dbpl"); - GLADE_HOOKUP_OBJECT (memorywin, hbox2, "hbox2"); - GLADE_HOOKUP_OBJECT (memorywin, edit, "edit"); - GLADE_HOOKUP_OBJECT (memorywin, zone, "zone"); - GLADE_HOOKUP_OBJECT (memorywin, memoryview, "memoryview"); - - gtk_window_add_accel_group (GTK_WINDOW (memorywin), accel_group); - - return memorywin; + GtkWidget *memorywin; + GtkWidget *vbox3; + GtkWidget *menu; + GtkWidget *debug; + GtkWidget *debug_menu; + GtkWidget *new_mem; + GtkWidget *new_disasm; + GtkWidget *new_errorlog; + GtkWidget *separator2; + GtkWidget *run; + GtkWidget *run_h; + GtkWidget *run_cpu; + GtkWidget *run_irq; + GtkWidget *run_vbl; + GtkWidget *separator3; + GtkWidget *step_into; + GtkWidget *step_over; + GtkWidget *step_out; + GtkWidget *separator4; + GtkWidget *soft_reset; + GtkWidget *hard_reset; + GtkWidget *exit; + GtkWidget *options; + GtkWidget *options_menu; + GSList *chunks_1_group = NULL; + GtkWidget *chunks_1; + GtkWidget *chunks_2; + GtkWidget *chunks_4; + GtkWidget *separator5; + GSList *logical_addresses_group = NULL; + GtkWidget *logical_addresses; + GtkWidget *physical_addresses; + GtkWidget *separatormenuitem1; + GtkWidget *reverse; + GtkWidget *separator6; + GtkWidget *ibpl; + GtkWidget *dbpl; + GtkWidget *hbox2; + GtkWidget *edit; + GtkWidget *zone; + GtkWidget *memoryview; + GtkAccelGroup *accel_group; + + accel_group = gtk_accel_group_new (); + + memorywin = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_widget_set_name (memorywin, "memorywin"); + gtk_window_set_title (GTK_WINDOW (memorywin), "Memory View"); + + vbox3 = gtk_vbox_new (FALSE, 0); + gtk_widget_set_name (vbox3, "vbox3"); + gtk_widget_show (vbox3); + gtk_container_add (GTK_CONTAINER (memorywin), vbox3); + + menu = gtk_menu_bar_new (); + gtk_widget_set_name (menu, "menu"); + gtk_widget_show (menu); + gtk_box_pack_start (GTK_BOX (vbox3), menu, FALSE, FALSE, 0); + + debug = gtk_menu_item_new_with_mnemonic ("_Debug"); + gtk_widget_set_name (debug, "debug"); + gtk_widget_show (debug); + gtk_container_add (GTK_CONTAINER (menu), debug); + + debug_menu = gtk_menu_new (); + gtk_widget_set_name (debug_menu, "debug_menu"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (debug), debug_menu); + + new_mem = gtk_menu_item_new_with_mnemonic ("New Memory Window"); + gtk_widget_set_name (new_mem, "new_mem"); + gtk_widget_show (new_mem); + gtk_container_add (GTK_CONTAINER (debug_menu), new_mem); + gtk_widget_add_accelerator (new_mem, "activate", accel_group, + GDK_m, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + new_disasm = gtk_menu_item_new_with_mnemonic ("New Disassembly Window"); + gtk_widget_set_name (new_disasm, "new_disasm"); + gtk_widget_show (new_disasm); + gtk_container_add (GTK_CONTAINER (debug_menu), new_disasm); + gtk_widget_add_accelerator (new_disasm, "activate", accel_group, + GDK_d, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + new_errorlog = gtk_menu_item_new_with_mnemonic ("New Error Log Window"); + gtk_widget_set_name (new_errorlog, "new_errorlog"); + gtk_widget_show (new_errorlog); + gtk_container_add (GTK_CONTAINER (debug_menu), new_errorlog); + gtk_widget_add_accelerator (new_errorlog, "activate", accel_group, + GDK_l, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + separator2 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator2, "separator2"); + gtk_widget_show (separator2); + gtk_container_add (GTK_CONTAINER (debug_menu), separator2); + gtk_widget_set_sensitive (separator2, FALSE); + + run = gtk_menu_item_new_with_mnemonic ("Run"); + gtk_widget_set_name (run, "run"); + gtk_widget_show (run); + gtk_container_add (GTK_CONTAINER (debug_menu), run); + gtk_widget_add_accelerator (run, "activate", accel_group, + GDK_F5, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + run_h = gtk_menu_item_new_with_mnemonic ("Run and Hide Debugger"); + gtk_widget_set_name (run_h, "run_h"); + gtk_widget_show (run_h); + gtk_container_add (GTK_CONTAINER (debug_menu), run_h); + gtk_widget_add_accelerator (run_h, "activate", accel_group, + GDK_F12, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + run_cpu = gtk_menu_item_new_with_mnemonic ("Run to Next CPU"); + gtk_widget_set_name (run_cpu, "run_cpu"); + gtk_widget_show (run_cpu); + gtk_container_add (GTK_CONTAINER (debug_menu), run_cpu); + gtk_widget_add_accelerator (run_cpu, "activate", accel_group, + GDK_F6, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + run_irq = gtk_menu_item_new_with_mnemonic ("Run until Next Interrupt on This CPU"); + gtk_widget_set_name (run_irq, "run_irq"); + gtk_widget_show (run_irq); + gtk_container_add (GTK_CONTAINER (debug_menu), run_irq); + gtk_widget_add_accelerator (run_irq, "activate", accel_group, + GDK_F7, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + run_vbl = gtk_menu_item_new_with_mnemonic ("Run until Next VBLANK"); + gtk_widget_set_name (run_vbl, "run_vbl"); + gtk_widget_show (run_vbl); + gtk_container_add (GTK_CONTAINER (debug_menu), run_vbl); + gtk_widget_add_accelerator (run_vbl, "activate", accel_group, + GDK_F8, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + separator3 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator3, "separator3"); + gtk_widget_show (separator3); + gtk_container_add (GTK_CONTAINER (debug_menu), separator3); + gtk_widget_set_sensitive (separator3, FALSE); + + step_into = gtk_menu_item_new_with_mnemonic ("Step Into"); + gtk_widget_set_name (step_into, "step_into"); + gtk_widget_show (step_into); + gtk_container_add (GTK_CONTAINER (debug_menu), step_into); + gtk_widget_add_accelerator (step_into, "activate", accel_group, + GDK_F11, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + step_over = gtk_menu_item_new_with_mnemonic ("Step Over"); + gtk_widget_set_name (step_over, "step_over"); + gtk_widget_show (step_over); + gtk_container_add (GTK_CONTAINER (debug_menu), step_over); + gtk_widget_add_accelerator (step_over, "activate", accel_group, + GDK_F10, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + step_out = gtk_menu_item_new_with_mnemonic ("Step Out"); + gtk_widget_set_name (step_out, "step_out"); + gtk_widget_show (step_out); + gtk_container_add (GTK_CONTAINER (debug_menu), step_out); + gtk_widget_add_accelerator (step_out, "activate", accel_group, + GDK_F11, (GdkModifierType) GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + separator4 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator4, "separator4"); + gtk_widget_show (separator4); + gtk_container_add (GTK_CONTAINER (debug_menu), separator4); + gtk_widget_set_sensitive (separator4, FALSE); + + soft_reset = gtk_menu_item_new_with_mnemonic ("Soft Reset"); + gtk_widget_set_name (soft_reset, "soft_reset"); + gtk_widget_show (soft_reset); + gtk_container_add (GTK_CONTAINER (debug_menu), soft_reset); + gtk_widget_add_accelerator (soft_reset, "activate", accel_group, + GDK_F3, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + hard_reset = gtk_menu_item_new_with_mnemonic ("Hard Reset"); + gtk_widget_set_name (hard_reset, "hard_reset"); + gtk_widget_show (hard_reset); + gtk_container_add (GTK_CONTAINER (debug_menu), hard_reset); + gtk_widget_add_accelerator (hard_reset, "activate", accel_group, + GDK_F3, (GdkModifierType) GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + exit = gtk_menu_item_new_with_mnemonic ("Exit"); + gtk_widget_set_name (exit, "exit"); + gtk_widget_show (exit); + gtk_container_add (GTK_CONTAINER (debug_menu), exit); + + options = gtk_menu_item_new_with_mnemonic ("_Options"); + gtk_widget_set_name (options, "options"); + gtk_widget_show (options); + gtk_container_add (GTK_CONTAINER (menu), options); + + options_menu = gtk_menu_new (); + gtk_widget_set_name (options_menu, "options_menu"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (options), options_menu); + + chunks_1 = gtk_radio_menu_item_new_with_mnemonic (chunks_1_group, "1-byte chunks"); + chunks_1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (chunks_1)); + gtk_widget_set_name (chunks_1, "chunks_1"); + gtk_widget_show (chunks_1); + gtk_container_add (GTK_CONTAINER (options_menu), chunks_1); + gtk_widget_add_accelerator (chunks_1, "activate", accel_group, + GDK_1, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (chunks_1), TRUE); + + chunks_2 = gtk_radio_menu_item_new_with_mnemonic (chunks_1_group, "2-bytes chunks"); + chunks_1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (chunks_2)); + gtk_widget_set_name (chunks_2, "chunks_2"); + gtk_widget_show (chunks_2); + gtk_container_add (GTK_CONTAINER (options_menu), chunks_2); + gtk_widget_add_accelerator (chunks_2, "activate", accel_group, + GDK_2, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + chunks_4 = gtk_radio_menu_item_new_with_mnemonic (chunks_1_group, "4-bytes chunks"); + chunks_1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (chunks_4)); + gtk_widget_set_name (chunks_4, "chunks_4"); + gtk_widget_show (chunks_4); + gtk_container_add (GTK_CONTAINER (options_menu), chunks_4); + gtk_widget_add_accelerator (chunks_4, "activate", accel_group, + GDK_4, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + separator5 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator5, "separator5"); + gtk_widget_show (separator5); + gtk_container_add (GTK_CONTAINER (options_menu), separator5); + gtk_widget_set_sensitive (separator5, FALSE); + + logical_addresses = gtk_radio_menu_item_new_with_mnemonic (logical_addresses_group, "Logical Addresses"); + logical_addresses_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (logical_addresses)); + gtk_widget_set_name (logical_addresses, "logical_addresses"); + gtk_widget_show (logical_addresses); + gtk_container_add (GTK_CONTAINER (options_menu), logical_addresses); + gtk_widget_add_accelerator (logical_addresses, "activate", accel_group, + GDK_l, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (logical_addresses), TRUE); + + physical_addresses = gtk_radio_menu_item_new_with_mnemonic (logical_addresses_group, "Physical Addresses"); + logical_addresses_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (physical_addresses)); + gtk_widget_set_name (physical_addresses, "physical_addresses"); + gtk_widget_show (physical_addresses); + gtk_container_add (GTK_CONTAINER (options_menu), physical_addresses); + gtk_widget_add_accelerator (physical_addresses, "activate", accel_group, + GDK_y, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + separatormenuitem1 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separatormenuitem1, "separatormenuitem1"); + gtk_widget_show (separatormenuitem1); + gtk_container_add (GTK_CONTAINER (options_menu), separatormenuitem1); + gtk_widget_set_sensitive (separatormenuitem1, FALSE); + + reverse = gtk_check_menu_item_new_with_mnemonic ("Reverse View"); + gtk_widget_set_name (reverse, "reverse"); + gtk_widget_show (reverse); + gtk_container_add (GTK_CONTAINER (options_menu), reverse); + gtk_widget_add_accelerator (reverse, "activate", accel_group, + GDK_r, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + separator6 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separator6, "separator6"); + gtk_widget_show (separator6); + gtk_container_add (GTK_CONTAINER (options_menu), separator6); + gtk_widget_set_sensitive (separator6, FALSE); + + ibpl = gtk_menu_item_new_with_mnemonic ("Increase bytes per line"); + gtk_widget_set_name (ibpl, "ibpl"); + gtk_widget_show (ibpl); + gtk_container_add (GTK_CONTAINER (options_menu), ibpl); + gtk_widget_add_accelerator (ibpl, "activate", accel_group, + GDK_p, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + dbpl = gtk_menu_item_new_with_mnemonic ("Decrease bytes per line"); + gtk_widget_set_name (dbpl, "dbpl"); + gtk_widget_show (dbpl); + gtk_container_add (GTK_CONTAINER (options_menu), dbpl); + gtk_widget_add_accelerator (dbpl, "activate", accel_group, + GDK_o, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + hbox2 = gtk_hbox_new (FALSE, 0); + gtk_widget_set_name (hbox2, "hbox2"); + gtk_widget_show (hbox2); + gtk_box_pack_start (GTK_BOX (vbox3), hbox2, FALSE, TRUE, 0); + + edit = gtk_entry_new (); + gtk_widget_set_name (edit, "edit"); + gtk_widget_show (edit); + gtk_box_pack_start (GTK_BOX (hbox2), edit, TRUE, TRUE, 0); + gtk_entry_set_invisible_char (GTK_ENTRY (edit), 9679); + + zone = gtk_combo_box_new_text (); + gtk_widget_set_name (zone, "zone"); + gtk_widget_show (zone); + gtk_box_pack_start (GTK_BOX (hbox2), zone, TRUE, TRUE, 0); + + memoryview = dview_new ("memoryview", "", "", 0, 0); + gtk_widget_set_name (memoryview, "memoryview"); + gtk_widget_show (memoryview); + gtk_box_pack_start (GTK_BOX (vbox3), memoryview, TRUE, TRUE, 0); + GTK_WIDGET_UNSET_FLAGS (memoryview, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS (memoryview, GTK_CAN_DEFAULT); + + g_signal_connect_swapped ((gpointer) new_mem, "activate", + G_CALLBACK (on_new_mem_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) new_disasm, "activate", + G_CALLBACK (on_new_disasm_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) new_errorlog, "activate", + G_CALLBACK (on_new_errorlog_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) run, "activate", + G_CALLBACK (on_run_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) run_h, "activate", + G_CALLBACK (on_run_h_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) run_cpu, "activate", + G_CALLBACK (on_run_cpu_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) run_irq, "activate", + G_CALLBACK (on_run_irq_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) run_vbl, "activate", + G_CALLBACK (on_run_vbl_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) step_into, "activate", + G_CALLBACK (on_step_into_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) step_over, "activate", + G_CALLBACK (on_step_over_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) step_out, "activate", + G_CALLBACK (on_step_out_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) soft_reset, "activate", + G_CALLBACK (on_soft_reset_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) hard_reset, "activate", + G_CALLBACK (on_hard_reset_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) exit, "activate", + G_CALLBACK (on_exit_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) chunks_1, "activate", + G_CALLBACK (on_chunks_1_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) chunks_2, "activate", + G_CALLBACK (on_chunks_2_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) chunks_4, "activate", + G_CALLBACK (on_chunks_4_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) logical_addresses, "activate", + G_CALLBACK (on_logical_addresses_group_changed), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) physical_addresses, "activate", + G_CALLBACK (on_physical_addresses_group_changed), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) reverse, "activate", + G_CALLBACK (on_reverse_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) ibpl, "activate", + G_CALLBACK (on_ibpl_activate), + GTK_OBJECT (memorywin)); + g_signal_connect_swapped ((gpointer) dbpl, "activate", + G_CALLBACK (on_dbpl_activate), + GTK_OBJECT (memorywin)); + g_signal_connect ((gpointer) memoryview, "button_press_event", + G_CALLBACK (on_memoryview_button_press_event), + NULL); + g_signal_connect ((gpointer) memoryview, "key_press_event", + G_CALLBACK (on_memoryview_key_press_event), + NULL); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (memorywin, memorywin, "memorywin"); + GLADE_HOOKUP_OBJECT (memorywin, vbox3, "vbox3"); + GLADE_HOOKUP_OBJECT (memorywin, menu, "menu"); + GLADE_HOOKUP_OBJECT (memorywin, debug, "debug"); + GLADE_HOOKUP_OBJECT (memorywin, debug_menu, "debug_menu"); + GLADE_HOOKUP_OBJECT (memorywin, new_mem, "new_mem"); + GLADE_HOOKUP_OBJECT (memorywin, new_disasm, "new_disasm"); + GLADE_HOOKUP_OBJECT (memorywin, new_errorlog, "new_errorlog"); + GLADE_HOOKUP_OBJECT (memorywin, separator2, "separator2"); + GLADE_HOOKUP_OBJECT (memorywin, run, "run"); + GLADE_HOOKUP_OBJECT (memorywin, run_h, "run_h"); + GLADE_HOOKUP_OBJECT (memorywin, run_cpu, "run_cpu"); + GLADE_HOOKUP_OBJECT (memorywin, run_irq, "run_irq"); + GLADE_HOOKUP_OBJECT (memorywin, run_vbl, "run_vbl"); + GLADE_HOOKUP_OBJECT (memorywin, separator3, "separator3"); + GLADE_HOOKUP_OBJECT (memorywin, step_into, "step_into"); + GLADE_HOOKUP_OBJECT (memorywin, step_over, "step_over"); + GLADE_HOOKUP_OBJECT (memorywin, step_out, "step_out"); + GLADE_HOOKUP_OBJECT (memorywin, separator4, "separator4"); + GLADE_HOOKUP_OBJECT (memorywin, soft_reset, "soft_reset"); + GLADE_HOOKUP_OBJECT (memorywin, hard_reset, "hard_reset"); + GLADE_HOOKUP_OBJECT (memorywin, exit, "exit"); + GLADE_HOOKUP_OBJECT (memorywin, options, "options"); + GLADE_HOOKUP_OBJECT (memorywin, options_menu, "options_menu"); + GLADE_HOOKUP_OBJECT (memorywin, chunks_1, "chunks_1"); + GLADE_HOOKUP_OBJECT (memorywin, chunks_2, "chunks_2"); + GLADE_HOOKUP_OBJECT (memorywin, chunks_4, "chunks_4"); + GLADE_HOOKUP_OBJECT (memorywin, separator5, "separator5"); + GLADE_HOOKUP_OBJECT (memorywin, logical_addresses, "logical_addresses"); + GLADE_HOOKUP_OBJECT (memorywin, physical_addresses, "physical_addresses"); + GLADE_HOOKUP_OBJECT (memorywin, separatormenuitem1, "separatormenuitem1"); + GLADE_HOOKUP_OBJECT (memorywin, reverse, "reverse"); + GLADE_HOOKUP_OBJECT (memorywin, separator6, "separator6"); + GLADE_HOOKUP_OBJECT (memorywin, ibpl, "ibpl"); + GLADE_HOOKUP_OBJECT (memorywin, dbpl, "dbpl"); + GLADE_HOOKUP_OBJECT (memorywin, hbox2, "hbox2"); + GLADE_HOOKUP_OBJECT (memorywin, edit, "edit"); + GLADE_HOOKUP_OBJECT (memorywin, zone, "zone"); + GLADE_HOOKUP_OBJECT (memorywin, memoryview, "memoryview"); + + gtk_window_add_accel_group (GTK_WINDOW (memorywin), accel_group); + + return memorywin; } GtkWidget* create_disasmwin (void) { - GtkWidget *disasmwin; - GtkWidget *vbox4; - GtkWidget *menubar1; - GtkWidget *menuitem5; - GtkWidget *menuitem5_menu; - GtkWidget *menuitem6; - GtkWidget *menuitem7; - GtkWidget *menuitem8; - GtkWidget *separatormenuitem1; - GtkWidget *menuitem9; - GtkWidget *menuitem10; - GtkWidget *menuitem11; - GtkWidget *menuitem12; - GtkWidget *menuitem13; - GtkWidget *separatormenuitem2; - GtkWidget *menuitem14; - GtkWidget *menuitem15; - GtkWidget *menuitem16; - GtkWidget *separatormenuitem3; - GtkWidget *menuitem17; - GtkWidget *menuitem18; - GtkWidget *menuitem19; - GtkWidget *menuitem20; - GtkWidget *menuitem20_menu; - GtkWidget *set_breakpoint_at_cursor; - GtkWidget *run_to_cursor1; - GtkWidget *separatormenuitem4; - GSList *raw_opcodes_group = NULL; - GtkWidget *raw_opcodes; - GtkWidget *enc_opcodes; - GtkWidget *comments; - GtkWidget *hbox3; - GtkWidget *edit; - GtkWidget *cpu; - GtkWidget *disasmview; - GtkAccelGroup *accel_group; - - accel_group = gtk_accel_group_new (); - - disasmwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_name (disasmwin, "disasmwin"); - gtk_window_set_title (GTK_WINDOW (disasmwin), "Disassembly"); - - vbox4 = gtk_vbox_new (FALSE, 0); - gtk_widget_set_name (vbox4, "vbox4"); - gtk_widget_show (vbox4); - gtk_container_add (GTK_CONTAINER (disasmwin), vbox4); - - menubar1 = gtk_menu_bar_new (); - gtk_widget_set_name (menubar1, "menubar1"); - gtk_widget_show (menubar1); - gtk_box_pack_start (GTK_BOX (vbox4), menubar1, FALSE, FALSE, 0); - - menuitem5 = gtk_menu_item_new_with_mnemonic ("_Debug"); - gtk_widget_set_name (menuitem5, "menuitem5"); - gtk_widget_show (menuitem5); - gtk_container_add (GTK_CONTAINER (menubar1), menuitem5); - - menuitem5_menu = gtk_menu_new (); - gtk_widget_set_name (menuitem5_menu, "menuitem5_menu"); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem5), menuitem5_menu); - - menuitem6 = gtk_menu_item_new_with_mnemonic ("New Memory Window"); - gtk_widget_set_name (menuitem6, "menuitem6"); - gtk_widget_show (menuitem6); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem6); - gtk_widget_add_accelerator (menuitem6, "activate", accel_group, - GDK_m, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - menuitem7 = gtk_menu_item_new_with_mnemonic ("New Disassembly Window"); - gtk_widget_set_name (menuitem7, "menuitem7"); - gtk_widget_show (menuitem7); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem7); - gtk_widget_add_accelerator (menuitem7, "activate", accel_group, - GDK_d, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - menuitem8 = gtk_menu_item_new_with_mnemonic ("New Error Log Window"); - gtk_widget_set_name (menuitem8, "menuitem8"); - gtk_widget_show (menuitem8); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem8); - gtk_widget_add_accelerator (menuitem8, "activate", accel_group, - GDK_l, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - separatormenuitem1 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separatormenuitem1, "separatormenuitem1"); - gtk_widget_show (separatormenuitem1); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), separatormenuitem1); - gtk_widget_set_sensitive (separatormenuitem1, FALSE); - - menuitem9 = gtk_menu_item_new_with_mnemonic ("Run"); - gtk_widget_set_name (menuitem9, "menuitem9"); - gtk_widget_show (menuitem9); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem9); - gtk_widget_add_accelerator (menuitem9, "activate", accel_group, - GDK_F5, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem10 = gtk_menu_item_new_with_mnemonic ("Run and Hide Debugger"); - gtk_widget_set_name (menuitem10, "menuitem10"); - gtk_widget_show (menuitem10); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem10); - gtk_widget_add_accelerator (menuitem10, "activate", accel_group, - GDK_F12, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem11 = gtk_menu_item_new_with_mnemonic ("Run to Next CPU"); - gtk_widget_set_name (menuitem11, "menuitem11"); - gtk_widget_show (menuitem11); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem11); - gtk_widget_add_accelerator (menuitem11, "activate", accel_group, - GDK_F6, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem12 = gtk_menu_item_new_with_mnemonic ("Run until Next Interrupt on This CPU"); - gtk_widget_set_name (menuitem12, "menuitem12"); - gtk_widget_show (menuitem12); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem12); - gtk_widget_add_accelerator (menuitem12, "activate", accel_group, - GDK_F7, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem13 = gtk_menu_item_new_with_mnemonic ("Run until Next VBLANK"); - gtk_widget_set_name (menuitem13, "menuitem13"); - gtk_widget_show (menuitem13); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem13); - gtk_widget_add_accelerator (menuitem13, "activate", accel_group, - GDK_F8, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - separatormenuitem2 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separatormenuitem2, "separatormenuitem2"); - gtk_widget_show (separatormenuitem2); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), separatormenuitem2); - gtk_widget_set_sensitive (separatormenuitem2, FALSE); - - menuitem14 = gtk_menu_item_new_with_mnemonic ("Step Into"); - gtk_widget_set_name (menuitem14, "menuitem14"); - gtk_widget_show (menuitem14); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem14); - gtk_widget_add_accelerator (menuitem14, "activate", accel_group, - GDK_F11, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem15 = gtk_menu_item_new_with_mnemonic ("Step Over"); - gtk_widget_set_name (menuitem15, "menuitem15"); - gtk_widget_show (menuitem15); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem15); - gtk_widget_add_accelerator (menuitem15, "activate", accel_group, - GDK_F10, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem16 = gtk_menu_item_new_with_mnemonic ("Step Out"); - gtk_widget_set_name (menuitem16, "menuitem16"); - gtk_widget_show (menuitem16); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem16); - gtk_widget_add_accelerator (menuitem16, "activate", accel_group, - GDK_F11, (GdkModifierType) GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - - separatormenuitem3 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separatormenuitem3, "separatormenuitem3"); - gtk_widget_show (separatormenuitem3); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), separatormenuitem3); - gtk_widget_set_sensitive (separatormenuitem3, FALSE); - - menuitem17 = gtk_menu_item_new_with_mnemonic ("Soft Reset"); - gtk_widget_set_name (menuitem17, "menuitem17"); - gtk_widget_show (menuitem17); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem17); - gtk_widget_add_accelerator (menuitem17, "activate", accel_group, - GDK_F3, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem18 = gtk_menu_item_new_with_mnemonic ("Hard Reset"); - gtk_widget_set_name (menuitem18, "menuitem18"); - gtk_widget_show (menuitem18); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem18); - gtk_widget_add_accelerator (menuitem18, "activate", accel_group, - GDK_F3, (GdkModifierType) GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - - menuitem19 = gtk_menu_item_new_with_mnemonic ("Exit"); - gtk_widget_set_name (menuitem19, "menuitem19"); - gtk_widget_show (menuitem19); - gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem19); - - menuitem20 = gtk_menu_item_new_with_mnemonic ("_Options"); - gtk_widget_set_name (menuitem20, "menuitem20"); - gtk_widget_show (menuitem20); - gtk_container_add (GTK_CONTAINER (menubar1), menuitem20); - - menuitem20_menu = gtk_menu_new (); - gtk_widget_set_name (menuitem20_menu, "menuitem20_menu"); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem20), menuitem20_menu); - - set_breakpoint_at_cursor = gtk_menu_item_new_with_mnemonic ("Set breakpoint at cursor"); - gtk_widget_set_name (set_breakpoint_at_cursor, "set_breakpoint_at_cursor"); - gtk_widget_show (set_breakpoint_at_cursor); - gtk_container_add (GTK_CONTAINER (menuitem20_menu), set_breakpoint_at_cursor); - - run_to_cursor1 = gtk_menu_item_new_with_mnemonic ("Run to cursor"); - gtk_widget_set_name (run_to_cursor1, "run_to_cursor1"); - gtk_widget_show (run_to_cursor1); - gtk_container_add (GTK_CONTAINER (menuitem20_menu), run_to_cursor1); - gtk_widget_add_accelerator (run_to_cursor1, "activate", accel_group, - GDK_F4, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - separatormenuitem4 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separatormenuitem4, "separatormenuitem4"); - gtk_widget_show (separatormenuitem4); - gtk_container_add (GTK_CONTAINER (menuitem20_menu), separatormenuitem4); - gtk_widget_set_sensitive (separatormenuitem4, FALSE); - - raw_opcodes = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Raw Opcodes"); - raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (raw_opcodes)); - gtk_widget_set_name (raw_opcodes, "raw_opcodes"); - gtk_widget_show (raw_opcodes); - gtk_container_add (GTK_CONTAINER (menuitem20_menu), raw_opcodes); - gtk_widget_add_accelerator (raw_opcodes, "activate", accel_group, - GDK_r, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (raw_opcodes), TRUE); - - enc_opcodes = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Encrypted Opcodes"); - raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (enc_opcodes)); - gtk_widget_set_name (enc_opcodes, "enc_opcodes"); - gtk_widget_show (enc_opcodes); - gtk_container_add (GTK_CONTAINER (menuitem20_menu), enc_opcodes); - gtk_widget_add_accelerator (enc_opcodes, "activate", accel_group, - GDK_e, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (enc_opcodes), TRUE); - - comments = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Comments"); - raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (comments)); - gtk_widget_set_name (comments, "comments"); - gtk_widget_show (comments); - gtk_container_add (GTK_CONTAINER (menuitem20_menu), comments); - gtk_widget_add_accelerator (comments, "activate", accel_group, - GDK_c, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (comments), TRUE); - - hbox3 = gtk_hbox_new (FALSE, 0); - gtk_widget_set_name (hbox3, "hbox3"); - gtk_widget_show (hbox3); - gtk_box_pack_start (GTK_BOX (vbox4), hbox3, FALSE, TRUE, 0); - - edit = gtk_entry_new (); - gtk_widget_set_name (edit, "edit"); - gtk_widget_show (edit); - gtk_box_pack_start (GTK_BOX (hbox3), edit, TRUE, TRUE, 0); - gtk_entry_set_invisible_char (GTK_ENTRY (edit), 9679); - - cpu = gtk_combo_box_new_text (); - gtk_widget_set_name (cpu, "cpu"); - gtk_widget_show (cpu); - gtk_box_pack_start (GTK_BOX (hbox3), cpu, TRUE, TRUE, 0); - - disasmview = dview_new ("disasmview", "", "", 0, 0); - gtk_widget_set_name (disasmview, "disasmview"); - gtk_widget_show (disasmview); - gtk_box_pack_start (GTK_BOX (vbox4), disasmview, TRUE, TRUE, 0); - GTK_WIDGET_UNSET_FLAGS (disasmview, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (disasmview, GTK_CAN_DEFAULT); - - g_signal_connect_swapped ((gpointer) menuitem6, "activate", - G_CALLBACK (on_new_mem_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem7, "activate", - G_CALLBACK (on_new_disasm_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem8, "activate", - G_CALLBACK (on_new_errorlog_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem9, "activate", - G_CALLBACK (on_run_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem10, "activate", - G_CALLBACK (on_run_h_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem11, "activate", - G_CALLBACK (on_run_cpu_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem12, "activate", - G_CALLBACK (on_run_irq_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem13, "activate", - G_CALLBACK (on_run_vbl_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem14, "activate", - G_CALLBACK (on_step_into_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem15, "activate", - G_CALLBACK (on_step_over_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem16, "activate", - G_CALLBACK (on_step_out_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem17, "activate", - G_CALLBACK (on_soft_reset_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem18, "activate", - G_CALLBACK (on_hard_reset_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) menuitem19, "activate", - G_CALLBACK (on_exit_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) set_breakpoint_at_cursor, "activate", - G_CALLBACK (on_set_breakpoint_at_cursor_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) run_to_cursor1, "activate", - G_CALLBACK (on_run_to_cursor_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) raw_opcodes, "activate", - G_CALLBACK (on_raw_opcodes_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) enc_opcodes, "activate", - G_CALLBACK (on_enc_opcodes_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect_swapped ((gpointer) comments, "activate", - G_CALLBACK (on_comments_activate), - GTK_OBJECT (disasmwin)); - g_signal_connect ((gpointer) disasmview, "button_press_event", - G_CALLBACK (on_disasm_button_press_event), - NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (disasmwin, disasmwin, "disasmwin"); - GLADE_HOOKUP_OBJECT (disasmwin, vbox4, "vbox4"); - GLADE_HOOKUP_OBJECT (disasmwin, menubar1, "menubar1"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem5, "menuitem5"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem5_menu, "menuitem5_menu"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem6, "menuitem6"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem7, "menuitem7"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem8, "menuitem8"); - GLADE_HOOKUP_OBJECT (disasmwin, separatormenuitem1, "separatormenuitem1"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem9, "menuitem9"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem10, "menuitem10"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem11, "menuitem11"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem12, "menuitem12"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem13, "menuitem13"); - GLADE_HOOKUP_OBJECT (disasmwin, separatormenuitem2, "separatormenuitem2"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem14, "menuitem14"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem15, "menuitem15"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem16, "menuitem16"); - GLADE_HOOKUP_OBJECT (disasmwin, separatormenuitem3, "separatormenuitem3"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem17, "menuitem17"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem18, "menuitem18"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem19, "menuitem19"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem20, "menuitem20"); - GLADE_HOOKUP_OBJECT (disasmwin, menuitem20_menu, "menuitem20_menu"); - GLADE_HOOKUP_OBJECT (disasmwin, set_breakpoint_at_cursor, "set_breakpoint_at_cursor"); - GLADE_HOOKUP_OBJECT (disasmwin, run_to_cursor1, "run_to_cursor1"); - GLADE_HOOKUP_OBJECT (disasmwin, separatormenuitem4, "separatormenuitem4"); - GLADE_HOOKUP_OBJECT (disasmwin, raw_opcodes, "raw_opcodes"); - GLADE_HOOKUP_OBJECT (disasmwin, enc_opcodes, "enc_opcodes"); - GLADE_HOOKUP_OBJECT (disasmwin, comments, "comments"); - GLADE_HOOKUP_OBJECT (disasmwin, hbox3, "hbox3"); - GLADE_HOOKUP_OBJECT (disasmwin, edit, "edit"); - GLADE_HOOKUP_OBJECT (disasmwin, cpu, "cpu"); - GLADE_HOOKUP_OBJECT (disasmwin, disasmview, "disasmview"); - - gtk_window_add_accel_group (GTK_WINDOW (disasmwin), accel_group); - - return disasmwin; + GtkWidget *disasmwin; + GtkWidget *vbox4; + GtkWidget *menubar1; + GtkWidget *menuitem5; + GtkWidget *menuitem5_menu; + GtkWidget *menuitem6; + GtkWidget *menuitem7; + GtkWidget *menuitem8; + GtkWidget *separatormenuitem1; + GtkWidget *menuitem9; + GtkWidget *menuitem10; + GtkWidget *menuitem11; + GtkWidget *menuitem12; + GtkWidget *menuitem13; + GtkWidget *separatormenuitem2; + GtkWidget *menuitem14; + GtkWidget *menuitem15; + GtkWidget *menuitem16; + GtkWidget *separatormenuitem3; + GtkWidget *menuitem17; + GtkWidget *menuitem18; + GtkWidget *menuitem19; + GtkWidget *menuitem20; + GtkWidget *menuitem20_menu; + GtkWidget *set_breakpoint_at_cursor; + GtkWidget *run_to_cursor1; + GtkWidget *separatormenuitem4; + GSList *raw_opcodes_group = NULL; + GtkWidget *raw_opcodes; + GtkWidget *enc_opcodes; + GtkWidget *comments; + GtkWidget *hbox3; + GtkWidget *edit; + GtkWidget *cpu; + GtkWidget *disasmview; + GtkAccelGroup *accel_group; + + accel_group = gtk_accel_group_new (); + + disasmwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_widget_set_name (disasmwin, "disasmwin"); + gtk_window_set_title (GTK_WINDOW (disasmwin), "Disassembly"); + + vbox4 = gtk_vbox_new (FALSE, 0); + gtk_widget_set_name (vbox4, "vbox4"); + gtk_widget_show (vbox4); + gtk_container_add (GTK_CONTAINER (disasmwin), vbox4); + + menubar1 = gtk_menu_bar_new (); + gtk_widget_set_name (menubar1, "menubar1"); + gtk_widget_show (menubar1); + gtk_box_pack_start (GTK_BOX (vbox4), menubar1, FALSE, FALSE, 0); + + menuitem5 = gtk_menu_item_new_with_mnemonic ("_Debug"); + gtk_widget_set_name (menuitem5, "menuitem5"); + gtk_widget_show (menuitem5); + gtk_container_add (GTK_CONTAINER (menubar1), menuitem5); + + menuitem5_menu = gtk_menu_new (); + gtk_widget_set_name (menuitem5_menu, "menuitem5_menu"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem5), menuitem5_menu); + + menuitem6 = gtk_menu_item_new_with_mnemonic ("New Memory Window"); + gtk_widget_set_name (menuitem6, "menuitem6"); + gtk_widget_show (menuitem6); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem6); + gtk_widget_add_accelerator (menuitem6, "activate", accel_group, + GDK_m, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + menuitem7 = gtk_menu_item_new_with_mnemonic ("New Disassembly Window"); + gtk_widget_set_name (menuitem7, "menuitem7"); + gtk_widget_show (menuitem7); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem7); + gtk_widget_add_accelerator (menuitem7, "activate", accel_group, + GDK_d, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + menuitem8 = gtk_menu_item_new_with_mnemonic ("New Error Log Window"); + gtk_widget_set_name (menuitem8, "menuitem8"); + gtk_widget_show (menuitem8); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem8); + gtk_widget_add_accelerator (menuitem8, "activate", accel_group, + GDK_l, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + separatormenuitem1 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separatormenuitem1, "separatormenuitem1"); + gtk_widget_show (separatormenuitem1); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), separatormenuitem1); + gtk_widget_set_sensitive (separatormenuitem1, FALSE); + + menuitem9 = gtk_menu_item_new_with_mnemonic ("Run"); + gtk_widget_set_name (menuitem9, "menuitem9"); + gtk_widget_show (menuitem9); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem9); + gtk_widget_add_accelerator (menuitem9, "activate", accel_group, + GDK_F5, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem10 = gtk_menu_item_new_with_mnemonic ("Run and Hide Debugger"); + gtk_widget_set_name (menuitem10, "menuitem10"); + gtk_widget_show (menuitem10); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem10); + gtk_widget_add_accelerator (menuitem10, "activate", accel_group, + GDK_F12, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem11 = gtk_menu_item_new_with_mnemonic ("Run to Next CPU"); + gtk_widget_set_name (menuitem11, "menuitem11"); + gtk_widget_show (menuitem11); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem11); + gtk_widget_add_accelerator (menuitem11, "activate", accel_group, + GDK_F6, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem12 = gtk_menu_item_new_with_mnemonic ("Run until Next Interrupt on This CPU"); + gtk_widget_set_name (menuitem12, "menuitem12"); + gtk_widget_show (menuitem12); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem12); + gtk_widget_add_accelerator (menuitem12, "activate", accel_group, + GDK_F7, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem13 = gtk_menu_item_new_with_mnemonic ("Run until Next VBLANK"); + gtk_widget_set_name (menuitem13, "menuitem13"); + gtk_widget_show (menuitem13); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem13); + gtk_widget_add_accelerator (menuitem13, "activate", accel_group, + GDK_F8, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + separatormenuitem2 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separatormenuitem2, "separatormenuitem2"); + gtk_widget_show (separatormenuitem2); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), separatormenuitem2); + gtk_widget_set_sensitive (separatormenuitem2, FALSE); + + menuitem14 = gtk_menu_item_new_with_mnemonic ("Step Into"); + gtk_widget_set_name (menuitem14, "menuitem14"); + gtk_widget_show (menuitem14); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem14); + gtk_widget_add_accelerator (menuitem14, "activate", accel_group, + GDK_F11, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem15 = gtk_menu_item_new_with_mnemonic ("Step Over"); + gtk_widget_set_name (menuitem15, "menuitem15"); + gtk_widget_show (menuitem15); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem15); + gtk_widget_add_accelerator (menuitem15, "activate", accel_group, + GDK_F10, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem16 = gtk_menu_item_new_with_mnemonic ("Step Out"); + gtk_widget_set_name (menuitem16, "menuitem16"); + gtk_widget_show (menuitem16); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem16); + gtk_widget_add_accelerator (menuitem16, "activate", accel_group, + GDK_F11, (GdkModifierType) GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + separatormenuitem3 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separatormenuitem3, "separatormenuitem3"); + gtk_widget_show (separatormenuitem3); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), separatormenuitem3); + gtk_widget_set_sensitive (separatormenuitem3, FALSE); + + menuitem17 = gtk_menu_item_new_with_mnemonic ("Soft Reset"); + gtk_widget_set_name (menuitem17, "menuitem17"); + gtk_widget_show (menuitem17); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem17); + gtk_widget_add_accelerator (menuitem17, "activate", accel_group, + GDK_F3, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem18 = gtk_menu_item_new_with_mnemonic ("Hard Reset"); + gtk_widget_set_name (menuitem18, "menuitem18"); + gtk_widget_show (menuitem18); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem18); + gtk_widget_add_accelerator (menuitem18, "activate", accel_group, + GDK_F3, (GdkModifierType) GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + menuitem19 = gtk_menu_item_new_with_mnemonic ("Exit"); + gtk_widget_set_name (menuitem19, "menuitem19"); + gtk_widget_show (menuitem19); + gtk_container_add (GTK_CONTAINER (menuitem5_menu), menuitem19); + + menuitem20 = gtk_menu_item_new_with_mnemonic ("_Options"); + gtk_widget_set_name (menuitem20, "menuitem20"); + gtk_widget_show (menuitem20); + gtk_container_add (GTK_CONTAINER (menubar1), menuitem20); + + menuitem20_menu = gtk_menu_new (); + gtk_widget_set_name (menuitem20_menu, "menuitem20_menu"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem20), menuitem20_menu); + + set_breakpoint_at_cursor = gtk_menu_item_new_with_mnemonic ("Set breakpoint at cursor"); + gtk_widget_set_name (set_breakpoint_at_cursor, "set_breakpoint_at_cursor"); + gtk_widget_show (set_breakpoint_at_cursor); + gtk_container_add (GTK_CONTAINER (menuitem20_menu), set_breakpoint_at_cursor); + + run_to_cursor1 = gtk_menu_item_new_with_mnemonic ("Run to cursor"); + gtk_widget_set_name (run_to_cursor1, "run_to_cursor1"); + gtk_widget_show (run_to_cursor1); + gtk_container_add (GTK_CONTAINER (menuitem20_menu), run_to_cursor1); + gtk_widget_add_accelerator (run_to_cursor1, "activate", accel_group, + GDK_F4, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + separatormenuitem4 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separatormenuitem4, "separatormenuitem4"); + gtk_widget_show (separatormenuitem4); + gtk_container_add (GTK_CONTAINER (menuitem20_menu), separatormenuitem4); + gtk_widget_set_sensitive (separatormenuitem4, FALSE); + + raw_opcodes = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Raw Opcodes"); + raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (raw_opcodes)); + gtk_widget_set_name (raw_opcodes, "raw_opcodes"); + gtk_widget_show (raw_opcodes); + gtk_container_add (GTK_CONTAINER (menuitem20_menu), raw_opcodes); + gtk_widget_add_accelerator (raw_opcodes, "activate", accel_group, + GDK_r, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (raw_opcodes), TRUE); + + enc_opcodes = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Encrypted Opcodes"); + raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (enc_opcodes)); + gtk_widget_set_name (enc_opcodes, "enc_opcodes"); + gtk_widget_show (enc_opcodes); + gtk_container_add (GTK_CONTAINER (menuitem20_menu), enc_opcodes); + gtk_widget_add_accelerator (enc_opcodes, "activate", accel_group, + GDK_e, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (enc_opcodes), TRUE); + + comments = gtk_radio_menu_item_new_with_mnemonic (raw_opcodes_group, "Comments"); + raw_opcodes_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (comments)); + gtk_widget_set_name (comments, "comments"); + gtk_widget_show (comments); + gtk_container_add (GTK_CONTAINER (menuitem20_menu), comments); + gtk_widget_add_accelerator (comments, "activate", accel_group, + GDK_c, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (comments), TRUE); + + hbox3 = gtk_hbox_new (FALSE, 0); + gtk_widget_set_name (hbox3, "hbox3"); + gtk_widget_show (hbox3); + gtk_box_pack_start (GTK_BOX (vbox4), hbox3, FALSE, TRUE, 0); + + edit = gtk_entry_new (); + gtk_widget_set_name (edit, "edit"); + gtk_widget_show (edit); + gtk_box_pack_start (GTK_BOX (hbox3), edit, TRUE, TRUE, 0); + gtk_entry_set_invisible_char (GTK_ENTRY (edit), 9679); + + cpu = gtk_combo_box_new_text (); + gtk_widget_set_name (cpu, "cpu"); + gtk_widget_show (cpu); + gtk_box_pack_start (GTK_BOX (hbox3), cpu, TRUE, TRUE, 0); + + disasmview = dview_new ("disasmview", "", "", 0, 0); + gtk_widget_set_name (disasmview, "disasmview"); + gtk_widget_show (disasmview); + gtk_box_pack_start (GTK_BOX (vbox4), disasmview, TRUE, TRUE, 0); + GTK_WIDGET_UNSET_FLAGS (disasmview, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS (disasmview, GTK_CAN_DEFAULT); + + g_signal_connect_swapped ((gpointer) menuitem6, "activate", + G_CALLBACK (on_new_mem_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem7, "activate", + G_CALLBACK (on_new_disasm_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem8, "activate", + G_CALLBACK (on_new_errorlog_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem9, "activate", + G_CALLBACK (on_run_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem10, "activate", + G_CALLBACK (on_run_h_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem11, "activate", + G_CALLBACK (on_run_cpu_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem12, "activate", + G_CALLBACK (on_run_irq_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem13, "activate", + G_CALLBACK (on_run_vbl_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem14, "activate", + G_CALLBACK (on_step_into_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem15, "activate", + G_CALLBACK (on_step_over_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem16, "activate", + G_CALLBACK (on_step_out_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem17, "activate", + G_CALLBACK (on_soft_reset_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem18, "activate", + G_CALLBACK (on_hard_reset_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) menuitem19, "activate", + G_CALLBACK (on_exit_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) set_breakpoint_at_cursor, "activate", + G_CALLBACK (on_set_breakpoint_at_cursor_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) run_to_cursor1, "activate", + G_CALLBACK (on_run_to_cursor_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) raw_opcodes, "activate", + G_CALLBACK (on_raw_opcodes_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) enc_opcodes, "activate", + G_CALLBACK (on_enc_opcodes_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect_swapped ((gpointer) comments, "activate", + G_CALLBACK (on_comments_activate), + GTK_OBJECT (disasmwin)); + g_signal_connect ((gpointer) disasmview, "button_press_event", + G_CALLBACK (on_disasm_button_press_event), + NULL); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (disasmwin, disasmwin, "disasmwin"); + GLADE_HOOKUP_OBJECT (disasmwin, vbox4, "vbox4"); + GLADE_HOOKUP_OBJECT (disasmwin, menubar1, "menubar1"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem5, "menuitem5"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem5_menu, "menuitem5_menu"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem6, "menuitem6"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem7, "menuitem7"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem8, "menuitem8"); + GLADE_HOOKUP_OBJECT (disasmwin, separatormenuitem1, "separatormenuitem1"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem9, "menuitem9"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem10, "menuitem10"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem11, "menuitem11"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem12, "menuitem12"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem13, "menuitem13"); + GLADE_HOOKUP_OBJECT (disasmwin, separatormenuitem2, "separatormenuitem2"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem14, "menuitem14"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem15, "menuitem15"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem16, "menuitem16"); + GLADE_HOOKUP_OBJECT (disasmwin, separatormenuitem3, "separatormenuitem3"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem17, "menuitem17"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem18, "menuitem18"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem19, "menuitem19"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem20, "menuitem20"); + GLADE_HOOKUP_OBJECT (disasmwin, menuitem20_menu, "menuitem20_menu"); + GLADE_HOOKUP_OBJECT (disasmwin, set_breakpoint_at_cursor, "set_breakpoint_at_cursor"); + GLADE_HOOKUP_OBJECT (disasmwin, run_to_cursor1, "run_to_cursor1"); + GLADE_HOOKUP_OBJECT (disasmwin, separatormenuitem4, "separatormenuitem4"); + GLADE_HOOKUP_OBJECT (disasmwin, raw_opcodes, "raw_opcodes"); + GLADE_HOOKUP_OBJECT (disasmwin, enc_opcodes, "enc_opcodes"); + GLADE_HOOKUP_OBJECT (disasmwin, comments, "comments"); + GLADE_HOOKUP_OBJECT (disasmwin, hbox3, "hbox3"); + GLADE_HOOKUP_OBJECT (disasmwin, edit, "edit"); + GLADE_HOOKUP_OBJECT (disasmwin, cpu, "cpu"); + GLADE_HOOKUP_OBJECT (disasmwin, disasmview, "disasmview"); + + gtk_window_add_accel_group (GTK_WINDOW (disasmwin), accel_group); + + return disasmwin; } GtkWidget* create_logwin (void) { - GtkWidget *logwin; - GtkWidget *vbox5; - GtkWidget *menubar2; - GtkWidget *menuitem26; - GtkWidget *menuitem26_menu; - GtkWidget *menuitem27; - GtkWidget *menuitem28; - GtkWidget *menuitem29; - GtkWidget *separatormenuitem5; - GtkWidget *menuitem30; - GtkWidget *menuitem31; - GtkWidget *menuitem32; - GtkWidget *menuitem33; - GtkWidget *menuitem34; - GtkWidget *separatormenuitem6; - GtkWidget *menuitem35; - GtkWidget *menuitem36; - GtkWidget *menuitem37; - GtkWidget *separatormenuitem7; - GtkWidget *menuitem38; - GtkWidget *menuitem39; - GtkWidget *menuitem40; - GtkWidget *logview; - GtkAccelGroup *accel_group; - - accel_group = gtk_accel_group_new (); - - logwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_name (logwin, "logwin"); - gtk_window_set_title (GTK_WINDOW (logwin), "Log Viewer"); - - vbox5 = gtk_vbox_new (FALSE, 0); - gtk_widget_set_name (vbox5, "vbox5"); - gtk_widget_show (vbox5); - gtk_container_add (GTK_CONTAINER (logwin), vbox5); - - menubar2 = gtk_menu_bar_new (); - gtk_widget_set_name (menubar2, "menubar2"); - gtk_widget_show (menubar2); - gtk_box_pack_start (GTK_BOX (vbox5), menubar2, FALSE, FALSE, 0); - - menuitem26 = gtk_menu_item_new_with_mnemonic ("_Debug"); - gtk_widget_set_name (menuitem26, "menuitem26"); - gtk_widget_show (menuitem26); - gtk_container_add (GTK_CONTAINER (menubar2), menuitem26); - - menuitem26_menu = gtk_menu_new (); - gtk_widget_set_name (menuitem26_menu, "menuitem26_menu"); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem26), menuitem26_menu); - - menuitem27 = gtk_menu_item_new_with_mnemonic ("New Memory Window"); - gtk_widget_set_name (menuitem27, "menuitem27"); - gtk_widget_show (menuitem27); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem27); - gtk_widget_add_accelerator (menuitem27, "activate", accel_group, - GDK_m, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - menuitem28 = gtk_menu_item_new_with_mnemonic ("New Disassembly Window"); - gtk_widget_set_name (menuitem28, "menuitem28"); - gtk_widget_show (menuitem28); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem28); - gtk_widget_add_accelerator (menuitem28, "activate", accel_group, - GDK_d, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - menuitem29 = gtk_menu_item_new_with_mnemonic ("New Error Log Window"); - gtk_widget_set_name (menuitem29, "menuitem29"); - gtk_widget_show (menuitem29); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem29); - gtk_widget_add_accelerator (menuitem29, "activate", accel_group, - GDK_l, (GdkModifierType) GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); - - separatormenuitem5 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separatormenuitem5, "separatormenuitem5"); - gtk_widget_show (separatormenuitem5); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), separatormenuitem5); - gtk_widget_set_sensitive (separatormenuitem5, FALSE); - - menuitem30 = gtk_menu_item_new_with_mnemonic ("Run"); - gtk_widget_set_name (menuitem30, "menuitem30"); - gtk_widget_show (menuitem30); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem30); - gtk_widget_add_accelerator (menuitem30, "activate", accel_group, - GDK_F5, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem31 = gtk_menu_item_new_with_mnemonic ("Run and Hide Debugger"); - gtk_widget_set_name (menuitem31, "menuitem31"); - gtk_widget_show (menuitem31); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem31); - gtk_widget_add_accelerator (menuitem31, "activate", accel_group, - GDK_F12, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem32 = gtk_menu_item_new_with_mnemonic ("Run to Next CPU"); - gtk_widget_set_name (menuitem32, "menuitem32"); - gtk_widget_show (menuitem32); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem32); - gtk_widget_add_accelerator (menuitem32, "activate", accel_group, - GDK_F6, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem33 = gtk_menu_item_new_with_mnemonic ("Run until Next Interrupt on This CPU"); - gtk_widget_set_name (menuitem33, "menuitem33"); - gtk_widget_show (menuitem33); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem33); - gtk_widget_add_accelerator (menuitem33, "activate", accel_group, - GDK_F7, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem34 = gtk_menu_item_new_with_mnemonic ("Run until Next VBLANK"); - gtk_widget_set_name (menuitem34, "menuitem34"); - gtk_widget_show (menuitem34); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem34); - gtk_widget_add_accelerator (menuitem34, "activate", accel_group, - GDK_F8, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - separatormenuitem6 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separatormenuitem6, "separatormenuitem6"); - gtk_widget_show (separatormenuitem6); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), separatormenuitem6); - gtk_widget_set_sensitive (separatormenuitem6, FALSE); - - menuitem35 = gtk_menu_item_new_with_mnemonic ("Step Into"); - gtk_widget_set_name (menuitem35, "menuitem35"); - gtk_widget_show (menuitem35); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem35); - gtk_widget_add_accelerator (menuitem35, "activate", accel_group, - GDK_F11, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem36 = gtk_menu_item_new_with_mnemonic ("Step Over"); - gtk_widget_set_name (menuitem36, "menuitem36"); - gtk_widget_show (menuitem36); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem36); - gtk_widget_add_accelerator (menuitem36, "activate", accel_group, - GDK_F10, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem37 = gtk_menu_item_new_with_mnemonic ("Step Out"); - gtk_widget_set_name (menuitem37, "menuitem37"); - gtk_widget_show (menuitem37); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem37); - gtk_widget_add_accelerator (menuitem37, "activate", accel_group, - GDK_F11, (GdkModifierType) GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - - separatormenuitem7 = gtk_separator_menu_item_new (); - gtk_widget_set_name (separatormenuitem7, "separatormenuitem7"); - gtk_widget_show (separatormenuitem7); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), separatormenuitem7); - gtk_widget_set_sensitive (separatormenuitem7, FALSE); - - menuitem38 = gtk_menu_item_new_with_mnemonic ("Soft Reset"); - gtk_widget_set_name (menuitem38, "menuitem38"); - gtk_widget_show (menuitem38); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem38); - gtk_widget_add_accelerator (menuitem38, "activate", accel_group, - GDK_F3, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - - menuitem39 = gtk_menu_item_new_with_mnemonic ("Hard Reset"); - gtk_widget_set_name (menuitem39, "menuitem39"); - gtk_widget_show (menuitem39); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem39); - gtk_widget_add_accelerator (menuitem39, "activate", accel_group, - GDK_F3, (GdkModifierType) GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - - menuitem40 = gtk_menu_item_new_with_mnemonic ("Exit"); - gtk_widget_set_name (menuitem40, "menuitem40"); - gtk_widget_show (menuitem40); - gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem40); - - logview = dview_new ("logview", "", "", 0, 0); - gtk_widget_set_name (logview, "logview"); - gtk_widget_show (logview); - gtk_box_pack_start (GTK_BOX (vbox5), logview, TRUE, TRUE, 0); - GTK_WIDGET_UNSET_FLAGS (logview, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (logview, GTK_CAN_DEFAULT); - - g_signal_connect_swapped ((gpointer) menuitem27, "activate", - G_CALLBACK (on_new_mem_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem28, "activate", - G_CALLBACK (on_new_disasm_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem29, "activate", - G_CALLBACK (on_new_errorlog_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem30, "activate", - G_CALLBACK (on_run_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem31, "activate", - G_CALLBACK (on_run_h_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem32, "activate", - G_CALLBACK (on_run_cpu_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem33, "activate", - G_CALLBACK (on_run_irq_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem34, "activate", - G_CALLBACK (on_run_vbl_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem35, "activate", - G_CALLBACK (on_step_into_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem36, "activate", - G_CALLBACK (on_step_over_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem37, "activate", - G_CALLBACK (on_step_out_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem38, "activate", - G_CALLBACK (on_soft_reset_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem39, "activate", - G_CALLBACK (on_hard_reset_activate), - GTK_OBJECT (logwin)); - g_signal_connect_swapped ((gpointer) menuitem40, "activate", - G_CALLBACK (on_exit_activate), - GTK_OBJECT (logwin)); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (logwin, logwin, "logwin"); - GLADE_HOOKUP_OBJECT (logwin, vbox5, "vbox5"); - GLADE_HOOKUP_OBJECT (logwin, menubar2, "menubar2"); - GLADE_HOOKUP_OBJECT (logwin, menuitem26, "menuitem26"); - GLADE_HOOKUP_OBJECT (logwin, menuitem26_menu, "menuitem26_menu"); - GLADE_HOOKUP_OBJECT (logwin, menuitem27, "menuitem27"); - GLADE_HOOKUP_OBJECT (logwin, menuitem28, "menuitem28"); - GLADE_HOOKUP_OBJECT (logwin, menuitem29, "menuitem29"); - GLADE_HOOKUP_OBJECT (logwin, separatormenuitem5, "separatormenuitem5"); - GLADE_HOOKUP_OBJECT (logwin, menuitem30, "menuitem30"); - GLADE_HOOKUP_OBJECT (logwin, menuitem31, "menuitem31"); - GLADE_HOOKUP_OBJECT (logwin, menuitem32, "menuitem32"); - GLADE_HOOKUP_OBJECT (logwin, menuitem33, "menuitem33"); - GLADE_HOOKUP_OBJECT (logwin, menuitem34, "menuitem34"); - GLADE_HOOKUP_OBJECT (logwin, separatormenuitem6, "separatormenuitem6"); - GLADE_HOOKUP_OBJECT (logwin, menuitem35, "menuitem35"); - GLADE_HOOKUP_OBJECT (logwin, menuitem36, "menuitem36"); - GLADE_HOOKUP_OBJECT (logwin, menuitem37, "menuitem37"); - GLADE_HOOKUP_OBJECT (logwin, separatormenuitem7, "separatormenuitem7"); - GLADE_HOOKUP_OBJECT (logwin, menuitem38, "menuitem38"); - GLADE_HOOKUP_OBJECT (logwin, menuitem39, "menuitem39"); - GLADE_HOOKUP_OBJECT (logwin, menuitem40, "menuitem40"); - GLADE_HOOKUP_OBJECT (logwin, logview, "logview"); - - gtk_window_add_accel_group (GTK_WINDOW (logwin), accel_group); - - return logwin; + GtkWidget *logwin; + GtkWidget *vbox5; + GtkWidget *menubar2; + GtkWidget *menuitem26; + GtkWidget *menuitem26_menu; + GtkWidget *menuitem27; + GtkWidget *menuitem28; + GtkWidget *menuitem29; + GtkWidget *separatormenuitem5; + GtkWidget *menuitem30; + GtkWidget *menuitem31; + GtkWidget *menuitem32; + GtkWidget *menuitem33; + GtkWidget *menuitem34; + GtkWidget *separatormenuitem6; + GtkWidget *menuitem35; + GtkWidget *menuitem36; + GtkWidget *menuitem37; + GtkWidget *separatormenuitem7; + GtkWidget *menuitem38; + GtkWidget *menuitem39; + GtkWidget *menuitem40; + GtkWidget *logview; + GtkAccelGroup *accel_group; + + accel_group = gtk_accel_group_new (); + + logwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_widget_set_name (logwin, "logwin"); + gtk_window_set_title (GTK_WINDOW (logwin), "Log Viewer"); + + vbox5 = gtk_vbox_new (FALSE, 0); + gtk_widget_set_name (vbox5, "vbox5"); + gtk_widget_show (vbox5); + gtk_container_add (GTK_CONTAINER (logwin), vbox5); + + menubar2 = gtk_menu_bar_new (); + gtk_widget_set_name (menubar2, "menubar2"); + gtk_widget_show (menubar2); + gtk_box_pack_start (GTK_BOX (vbox5), menubar2, FALSE, FALSE, 0); + + menuitem26 = gtk_menu_item_new_with_mnemonic ("_Debug"); + gtk_widget_set_name (menuitem26, "menuitem26"); + gtk_widget_show (menuitem26); + gtk_container_add (GTK_CONTAINER (menubar2), menuitem26); + + menuitem26_menu = gtk_menu_new (); + gtk_widget_set_name (menuitem26_menu, "menuitem26_menu"); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem26), menuitem26_menu); + + menuitem27 = gtk_menu_item_new_with_mnemonic ("New Memory Window"); + gtk_widget_set_name (menuitem27, "menuitem27"); + gtk_widget_show (menuitem27); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem27); + gtk_widget_add_accelerator (menuitem27, "activate", accel_group, + GDK_m, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + menuitem28 = gtk_menu_item_new_with_mnemonic ("New Disassembly Window"); + gtk_widget_set_name (menuitem28, "menuitem28"); + gtk_widget_show (menuitem28); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem28); + gtk_widget_add_accelerator (menuitem28, "activate", accel_group, + GDK_d, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + menuitem29 = gtk_menu_item_new_with_mnemonic ("New Error Log Window"); + gtk_widget_set_name (menuitem29, "menuitem29"); + gtk_widget_show (menuitem29); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem29); + gtk_widget_add_accelerator (menuitem29, "activate", accel_group, + GDK_l, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + + separatormenuitem5 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separatormenuitem5, "separatormenuitem5"); + gtk_widget_show (separatormenuitem5); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), separatormenuitem5); + gtk_widget_set_sensitive (separatormenuitem5, FALSE); + + menuitem30 = gtk_menu_item_new_with_mnemonic ("Run"); + gtk_widget_set_name (menuitem30, "menuitem30"); + gtk_widget_show (menuitem30); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem30); + gtk_widget_add_accelerator (menuitem30, "activate", accel_group, + GDK_F5, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem31 = gtk_menu_item_new_with_mnemonic ("Run and Hide Debugger"); + gtk_widget_set_name (menuitem31, "menuitem31"); + gtk_widget_show (menuitem31); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem31); + gtk_widget_add_accelerator (menuitem31, "activate", accel_group, + GDK_F12, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem32 = gtk_menu_item_new_with_mnemonic ("Run to Next CPU"); + gtk_widget_set_name (menuitem32, "menuitem32"); + gtk_widget_show (menuitem32); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem32); + gtk_widget_add_accelerator (menuitem32, "activate", accel_group, + GDK_F6, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem33 = gtk_menu_item_new_with_mnemonic ("Run until Next Interrupt on This CPU"); + gtk_widget_set_name (menuitem33, "menuitem33"); + gtk_widget_show (menuitem33); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem33); + gtk_widget_add_accelerator (menuitem33, "activate", accel_group, + GDK_F7, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem34 = gtk_menu_item_new_with_mnemonic ("Run until Next VBLANK"); + gtk_widget_set_name (menuitem34, "menuitem34"); + gtk_widget_show (menuitem34); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem34); + gtk_widget_add_accelerator (menuitem34, "activate", accel_group, + GDK_F8, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + separatormenuitem6 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separatormenuitem6, "separatormenuitem6"); + gtk_widget_show (separatormenuitem6); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), separatormenuitem6); + gtk_widget_set_sensitive (separatormenuitem6, FALSE); + + menuitem35 = gtk_menu_item_new_with_mnemonic ("Step Into"); + gtk_widget_set_name (menuitem35, "menuitem35"); + gtk_widget_show (menuitem35); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem35); + gtk_widget_add_accelerator (menuitem35, "activate", accel_group, + GDK_F11, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem36 = gtk_menu_item_new_with_mnemonic ("Step Over"); + gtk_widget_set_name (menuitem36, "menuitem36"); + gtk_widget_show (menuitem36); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem36); + gtk_widget_add_accelerator (menuitem36, "activate", accel_group, + GDK_F10, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem37 = gtk_menu_item_new_with_mnemonic ("Step Out"); + gtk_widget_set_name (menuitem37, "menuitem37"); + gtk_widget_show (menuitem37); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem37); + gtk_widget_add_accelerator (menuitem37, "activate", accel_group, + GDK_F11, (GdkModifierType) GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + separatormenuitem7 = gtk_separator_menu_item_new (); + gtk_widget_set_name (separatormenuitem7, "separatormenuitem7"); + gtk_widget_show (separatormenuitem7); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), separatormenuitem7); + gtk_widget_set_sensitive (separatormenuitem7, FALSE); + + menuitem38 = gtk_menu_item_new_with_mnemonic ("Soft Reset"); + gtk_widget_set_name (menuitem38, "menuitem38"); + gtk_widget_show (menuitem38); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem38); + gtk_widget_add_accelerator (menuitem38, "activate", accel_group, + GDK_F3, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); + + menuitem39 = gtk_menu_item_new_with_mnemonic ("Hard Reset"); + gtk_widget_set_name (menuitem39, "menuitem39"); + gtk_widget_show (menuitem39); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem39); + gtk_widget_add_accelerator (menuitem39, "activate", accel_group, + GDK_F3, (GdkModifierType) GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + menuitem40 = gtk_menu_item_new_with_mnemonic ("Exit"); + gtk_widget_set_name (menuitem40, "menuitem40"); + gtk_widget_show (menuitem40); + gtk_container_add (GTK_CONTAINER (menuitem26_menu), menuitem40); + + logview = dview_new ("logview", "", "", 0, 0); + gtk_widget_set_name (logview, "logview"); + gtk_widget_show (logview); + gtk_box_pack_start (GTK_BOX (vbox5), logview, TRUE, TRUE, 0); + GTK_WIDGET_UNSET_FLAGS (logview, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS (logview, GTK_CAN_DEFAULT); + + g_signal_connect_swapped ((gpointer) menuitem27, "activate", + G_CALLBACK (on_new_mem_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem28, "activate", + G_CALLBACK (on_new_disasm_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem29, "activate", + G_CALLBACK (on_new_errorlog_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem30, "activate", + G_CALLBACK (on_run_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem31, "activate", + G_CALLBACK (on_run_h_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem32, "activate", + G_CALLBACK (on_run_cpu_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem33, "activate", + G_CALLBACK (on_run_irq_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem34, "activate", + G_CALLBACK (on_run_vbl_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem35, "activate", + G_CALLBACK (on_step_into_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem36, "activate", + G_CALLBACK (on_step_over_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem37, "activate", + G_CALLBACK (on_step_out_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem38, "activate", + G_CALLBACK (on_soft_reset_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem39, "activate", + G_CALLBACK (on_hard_reset_activate), + GTK_OBJECT (logwin)); + g_signal_connect_swapped ((gpointer) menuitem40, "activate", + G_CALLBACK (on_exit_activate), + GTK_OBJECT (logwin)); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (logwin, logwin, "logwin"); + GLADE_HOOKUP_OBJECT (logwin, vbox5, "vbox5"); + GLADE_HOOKUP_OBJECT (logwin, menubar2, "menubar2"); + GLADE_HOOKUP_OBJECT (logwin, menuitem26, "menuitem26"); + GLADE_HOOKUP_OBJECT (logwin, menuitem26_menu, "menuitem26_menu"); + GLADE_HOOKUP_OBJECT (logwin, menuitem27, "menuitem27"); + GLADE_HOOKUP_OBJECT (logwin, menuitem28, "menuitem28"); + GLADE_HOOKUP_OBJECT (logwin, menuitem29, "menuitem29"); + GLADE_HOOKUP_OBJECT (logwin, separatormenuitem5, "separatormenuitem5"); + GLADE_HOOKUP_OBJECT (logwin, menuitem30, "menuitem30"); + GLADE_HOOKUP_OBJECT (logwin, menuitem31, "menuitem31"); + GLADE_HOOKUP_OBJECT (logwin, menuitem32, "menuitem32"); + GLADE_HOOKUP_OBJECT (logwin, menuitem33, "menuitem33"); + GLADE_HOOKUP_OBJECT (logwin, menuitem34, "menuitem34"); + GLADE_HOOKUP_OBJECT (logwin, separatormenuitem6, "separatormenuitem6"); + GLADE_HOOKUP_OBJECT (logwin, menuitem35, "menuitem35"); + GLADE_HOOKUP_OBJECT (logwin, menuitem36, "menuitem36"); + GLADE_HOOKUP_OBJECT (logwin, menuitem37, "menuitem37"); + GLADE_HOOKUP_OBJECT (logwin, separatormenuitem7, "separatormenuitem7"); + GLADE_HOOKUP_OBJECT (logwin, menuitem38, "menuitem38"); + GLADE_HOOKUP_OBJECT (logwin, menuitem39, "menuitem39"); + GLADE_HOOKUP_OBJECT (logwin, menuitem40, "menuitem40"); + GLADE_HOOKUP_OBJECT (logwin, logview, "logview"); + + gtk_window_add_accel_group (GTK_WINDOW (logwin), accel_group); + + return logwin; } - diff --git a/src/osd/sdl/debug-sup.c b/src/osd/sdl/debug-sup.c index 1c63b65a914..1658c9bc254 100644 --- a/src/osd/sdl/debug-sup.c +++ b/src/osd/sdl/debug-sup.c @@ -18,28 +18,28 @@ GtkWidget* lookup_widget (GtkWidget *widget, - const gchar *widget_name) + const gchar *widget_name) { - GtkWidget *parent, *found_widget; - - for (;;) - { - if (GTK_IS_MENU (widget)) - parent = gtk_menu_get_attach_widget (GTK_MENU (widget)); - else - parent = widget->parent; - if (!parent) - parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey"); - if (parent == NULL) - break; - widget = parent; - } - - found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget), - widget_name); - if (!found_widget) - g_warning ("Widget not found: %s", widget_name); - return found_widget; + GtkWidget *parent, *found_widget; + + for (;;) + { + if (GTK_IS_MENU (widget)) + parent = gtk_menu_get_attach_widget (GTK_MENU (widget)); + else + parent = widget->parent; + if (!parent) + parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey"); + if (parent == NULL) + break; + widget = parent; + } + + found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget), + widget_name); + if (!found_widget) + g_warning ("Widget not found: %s", widget_name); + return found_widget; } static GList *pixmaps_directories = NULL; @@ -48,97 +48,96 @@ static GList *pixmaps_directories = NULL; void add_pixmap_directory (const gchar *directory) { - pixmaps_directories = g_list_prepend (pixmaps_directories, - g_strdup (directory)); + pixmaps_directories = g_list_prepend (pixmaps_directories, + g_strdup (directory)); } /* This is an internally used function to find pixmap files. */ static gchar* find_pixmap_file (const gchar *filename) { - GList *elem; - - /* We step through each of the pixmaps directory to find it. */ - elem = pixmaps_directories; - while (elem) - { - gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data, - G_DIR_SEPARATOR_S, filename); - if (g_file_test (pathname, G_FILE_TEST_EXISTS)) - return pathname; - g_free (pathname); - elem = elem->next; - } - return NULL; + GList *elem; + + /* We step through each of the pixmaps directory to find it. */ + elem = pixmaps_directories; + while (elem) + { + gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data, + G_DIR_SEPARATOR_S, filename); + if (g_file_test (pathname, G_FILE_TEST_EXISTS)) + return pathname; + g_free (pathname); + elem = elem->next; + } + return NULL; } /* This is an internally used function to create pixmaps. */ GtkWidget* create_pixmap (GtkWidget *widget, - const gchar *filename) + const gchar *filename) { - gchar *pathname = NULL; - GtkWidget *pixmap; + gchar *pathname = NULL; + GtkWidget *pixmap; - if (!filename || !filename[0]) - return gtk_image_new (); + if (!filename || !filename[0]) + return gtk_image_new (); - pathname = find_pixmap_file (filename); + pathname = find_pixmap_file (filename); - if (!pathname) - { - g_warning ("Couldn't find pixmap file: %s", filename); - return gtk_image_new (); - } + if (!pathname) + { + g_warning ("Couldn't find pixmap file: %s", filename); + return gtk_image_new (); + } - pixmap = gtk_image_new_from_file (pathname); - g_free (pathname); - return pixmap; + pixmap = gtk_image_new_from_file (pathname); + g_free (pathname); + return pixmap; } /* This is an internally used function to create pixmaps. */ GdkPixbuf* create_pixbuf (const gchar *filename) { - gchar *pathname = NULL; - GdkPixbuf *pixbuf; - GError *error = NULL; - - if (!filename || !filename[0]) - return NULL; - - pathname = find_pixmap_file (filename); - - if (!pathname) - { - g_warning ("Couldn't find pixmap file: %s", filename); - return NULL; - } - - pixbuf = gdk_pixbuf_new_from_file (pathname, &error); - if (!pixbuf) - { - fprintf (stderr, "Failed to load pixbuf file: %s: %s\n", - pathname, error->message); - g_error_free (error); - } - g_free (pathname); - return pixbuf; + gchar *pathname = NULL; + GdkPixbuf *pixbuf; + GError *error = NULL; + + if (!filename || !filename[0]) + return NULL; + + pathname = find_pixmap_file (filename); + + if (!pathname) + { + g_warning ("Couldn't find pixmap file: %s", filename); + return NULL; + } + + pixbuf = gdk_pixbuf_new_from_file (pathname, &error); + if (!pixbuf) + { + fprintf (stderr, "Failed to load pixbuf file: %s: %s\n", + pathname, error->message); + g_error_free (error); + } + g_free (pathname); + return pixbuf; } /* This is used to set ATK action descriptions. */ void glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description) + const gchar *action_name, + const gchar *description) { - gint n_actions, i; - - n_actions = atk_action_get_n_actions (action); - for (i = 0; i < n_actions; i++) - { - if (!strcmp (atk_action_get_name (action, i), action_name)) - atk_action_set_description (action, i, description); - } + gint n_actions, i; + + n_actions = atk_action_get_n_actions (action); + for (i = 0; i < n_actions; i++) + { + if (!strcmp (atk_action_get_name (action, i), action_name)) + atk_action_set_description (action, i, description); + } } - diff --git a/src/osd/sdl/debug-sup.h b/src/osd/sdl/debug-sup.h index 2dea079c2a4..eda41f7cea1 100644 --- a/src/osd/sdl/debug-sup.h +++ b/src/osd/sdl/debug-sup.h @@ -19,7 +19,7 @@ * you want returned. */ GtkWidget* lookup_widget (GtkWidget *widget, - const gchar *widget_name); + const gchar *widget_name); /* Use this function to set the directory containing installed pixmaps. */ @@ -32,13 +32,12 @@ void add_pixmap_directory (const gchar *directory); /* This is used to create the pixmaps used in the interface. */ GtkWidget* create_pixmap (GtkWidget *widget, - const gchar *filename); + const gchar *filename); /* This is used to create the pixbufs used in the interface. */ GdkPixbuf* create_pixbuf (const gchar *filename); /* This is used to set ATK action descriptions. */ void glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description); - + const gchar *action_name, + const gchar *description); diff --git a/src/osd/sdl/debugosx.h b/src/osd/sdl/debugosx.h index 58e0941349b..a59659a35d8 100644 --- a/src/osd/sdl/debugosx.h +++ b/src/osd/sdl/debugosx.h @@ -82,9 +82,9 @@ typedef float CGFloat; @interface MAMEDebugCommandHistory : NSObject { - NSInteger length, position; - NSString *current; - NSMutableArray *history; + NSInteger length, position; + NSString *current; + NSMutableArray *history; } + (NSInteger)defaultLength; @@ -105,14 +105,14 @@ typedef float CGFloat; @interface MAMEDebugView : NSView { - int type; - running_machine *machine; - debug_view *view; + int type; + running_machine *machine; + debug_view *view; - debug_view_xy *totalSize, *topLeft; + debug_view_xy *totalSize, *topLeft; - NSFont *font; - CGFloat fontWidth, fontHeight, fontAscent; + NSFont *font; + CGFloat fontWidth, fontHeight, fontAscent; } + (NSFont *)defaultFont; @@ -161,7 +161,7 @@ typedef float CGFloat; @interface MAMEDisassemblyView : MAMEDebugView <MAMEDebugViewSubviewSupport, MAMEDebugViewExpressionSupport> { - BOOL useConsole; + BOOL useConsole; } - (id)initWithFrame:(NSRect)f machine:(running_machine &)m useConsole:(BOOL)uc; @@ -224,8 +224,8 @@ typedef float CGFloat; @interface MAMEDebugWindowHandler : NSObject <NSWindowDelegate> { - NSWindow *window; - running_machine *machine; + NSWindow *window; + running_machine *machine; } + (void)addCommonActionItems:(NSMenu *)menu; @@ -258,13 +258,13 @@ typedef float CGFloat; @interface MAMEDebugConsole : MAMEDebugWindowHandler <NSTextFieldDelegate, NSSplitViewDelegate> { - MAMEDebugCommandHistory *history; - NSMutableArray *auxiliaryWindows; + MAMEDebugCommandHistory *history; + NSMutableArray *auxiliaryWindows; - MAMERegistersView *regView; - MAMEDisassemblyView *dasmView; - MAMEDebugView *consoleView; - NSTextField *commandField; + MAMERegistersView *regView; + MAMEDisassemblyView *dasmView; + MAMEDebugView *consoleView; + NSTextField *commandField; } - (id)initWithMachine:(running_machine &)m; @@ -294,7 +294,7 @@ typedef float CGFloat; @interface MAMEAuxiliaryDebugWindowHandler : MAMEDebugWindowHandler { - MAMEDebugConsole *console; + MAMEDebugConsole *console; } + (void)cascadeWindow:(NSWindow *)window; @@ -314,8 +314,8 @@ typedef float CGFloat; @interface MAMEExpressionAuxiliaryDebugWindowHandler : MAMEAuxiliaryDebugWindowHandler <NSTextFieldDelegate> { - MAMEDebugCommandHistory *history; - NSTextField *expressionField; + MAMEDebugCommandHistory *history; + NSTextField *expressionField; } - (id)initWithMachine:(running_machine &)m title:(NSString *)t console:(MAMEDebugConsole *)c; @@ -331,7 +331,7 @@ typedef float CGFloat; @interface MAMEMemoryViewer : MAMEExpressionAuxiliaryDebugWindowHandler { - MAMEMemoryView *memoryView; + MAMEMemoryView *memoryView; } - (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c; @@ -343,7 +343,7 @@ typedef float CGFloat; @interface MAMEDisassemblyViewer : MAMEExpressionAuxiliaryDebugWindowHandler { - MAMEDisassemblyView *dasmView; + MAMEDisassemblyView *dasmView; } - (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c; @@ -355,7 +355,7 @@ typedef float CGFloat; @interface MAMEErrorLogViewer : MAMEAuxiliaryDebugWindowHandler { - MAMEErrorLogView *logView; + MAMEErrorLogView *logView; } - (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c; diff --git a/src/osd/sdl/debugqt.c b/src/osd/sdl/debugqt.c index 72a210ffef0..7998b810c85 100644 --- a/src/osd/sdl/debugqt.c +++ b/src/osd/sdl/debugqt.c @@ -38,8 +38,8 @@ MainWindow* mainQtWindow = NULL; void sdl_osd_interface::init_debugger() { - // QT is a magical thing - new QApplication(qtArgc, qtArgv); + // QT is a magical thing + new QApplication(qtArgc, qtArgv); } @@ -49,36 +49,36 @@ void sdl_osd_interface::init_debugger() void sdl_osd_interface::wait_for_debugger(device_t &device, bool firststop) { - if (oneShot) - { - mainQtWindow = new MainWindow(&device, &machine()); - mainQtWindow->show(); - oneShot = false; - } - - // Make sure the main window displays the proper cpu - mainQtWindow->setProcessor(&device); - - // Run our own QT event loop - while (debug_cpu_is_stopped(machine())) - { - qApp->processEvents(QEventLoop::AllEvents, 1); - - // Refresh everyone if requested - if (mainQtWindow->wantsRefresh()) - { - QWidgetList allWidgets = qApp->allWidgets(); - for (int i = 0; i < allWidgets.length(); i++) - allWidgets[i]->update(); - mainQtWindow->clearRefreshFlag(); - } - - // Exit if the machine has been instructed to do so - if (machine().exit_pending()) - { - break; - } - } + if (oneShot) + { + mainQtWindow = new MainWindow(&device, &machine()); + mainQtWindow->show(); + oneShot = false; + } + + // Make sure the main window displays the proper cpu + mainQtWindow->setProcessor(&device); + + // Run our own QT event loop + while (debug_cpu_is_stopped(machine())) + { + qApp->processEvents(QEventLoop::AllEvents, 1); + + // Refresh everyone if requested + if (mainQtWindow->wantsRefresh()) + { + QWidgetList allWidgets = qApp->allWidgets(); + for (int i = 0; i < allWidgets.length(); i++) + allWidgets[i]->update(); + mainQtWindow->clearRefreshFlag(); + } + + // Exit if the machine has been instructed to do so + if (machine().exit_pending()) + { + break; + } + } } @@ -88,7 +88,7 @@ void sdl_osd_interface::wait_for_debugger(device_t &device, bool firststop) void debugwin_update_during_game(running_machine &machine) { - qApp->processEvents(QEventLoop::AllEvents, 1); + qApp->processEvents(QEventLoop::AllEvents, 1); } diff --git a/src/osd/sdl/debugqtdasmwindow.c b/src/osd/sdl/debugqtdasmwindow.c index 54cc79684a8..f9b126da78d 100644 --- a/src/osd/sdl/debugqtdasmwindow.c +++ b/src/osd/sdl/debugqtdasmwindow.c @@ -5,196 +5,196 @@ #include "debug/dvdisasm.h" -DasmWindow::DasmWindow(running_machine* machine, QWidget* parent) : - WindowQt(machine, parent) +DasmWindow::DasmWindow(running_machine* machine, QWidget* parent) : + WindowQt(machine, parent) { - QPoint parentPos = parent->pos(); - setGeometry(parentPos.x()+100, parentPos.y()+100, 800, 400); - setWindowTitle("Debug: Disassembly View"); - - // - // The main frame and its input and log widgets - // - QFrame* mainWindowFrame = new QFrame(this); - - // The top frame & groupbox that contains the input widgets - QFrame* topSubFrame = new QFrame(mainWindowFrame); - - // The input edit - m_inputEdit = new QLineEdit(topSubFrame); - connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(expressionSubmitted())); - - // The cpu combo box - m_cpuComboBox = new QComboBox(topSubFrame); - m_cpuComboBox->setMinimumWidth(300); - connect(m_cpuComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(cpuChanged(int))); - - // The main disasm window - m_dasmView = new DebuggerView(DVT_DISASSEMBLY, - m_machine, - this); - - // Force a recompute of the disassembly region - downcast<debug_view_disasm*>(m_dasmView->view())->set_expression("curpc"); - - // Populate the combo box & set the proper cpu - populateComboBox(); - //const debug_view_source *source = mem->views[0]->view->source_list().match_device(curcpu); - //gtk_combo_box_set_active(zone_w, mem->views[0]->view->source_list().index(*source)); - //mem->views[0]->view->set_source(*source); - - - // Layout - QHBoxLayout* subLayout = new QHBoxLayout(topSubFrame); - subLayout->addWidget(m_inputEdit); - subLayout->addWidget(m_cpuComboBox); - subLayout->setSpacing(3); - subLayout->setContentsMargins(2,2,2,2); - - QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame); - vLayout->setSpacing(3); - vLayout->setContentsMargins(2,2,2,2); - vLayout->addWidget(topSubFrame); - vLayout->addWidget(m_dasmView); - - setCentralWidget(mainWindowFrame); - - // - // Menu bars - // - // Create two commands - QAction* breakpointSetAct = new QAction("Toggle Breakpoint At Cursor", this); - QAction* runToCursorAct = new QAction("Run To Cursor", this); - breakpointSetAct->setShortcut(Qt::Key_F9); - runToCursorAct->setShortcut(Qt::Key_F4); - connect(breakpointSetAct, SIGNAL(triggered(bool)), this, SLOT(toggleBreakpointAtCursor(bool))); - connect(runToCursorAct, SIGNAL(triggered(bool)), this, SLOT(runToCursor(bool))); - - // Right bar options - QActionGroup* rightBarGroup = new QActionGroup(this); - QAction* rightActRaw = new QAction("Raw Opcodes", this); - QAction* rightActEncrypted = new QAction("Encrypted Opcodes", this); - QAction* rightActComments = new QAction("Comments", this); - rightActRaw->setCheckable(true); - rightActEncrypted->setCheckable(true); - rightActComments->setCheckable(true); - rightActRaw->setActionGroup(rightBarGroup); - rightActEncrypted->setActionGroup(rightBarGroup); - rightActComments->setActionGroup(rightBarGroup); - rightActRaw->setShortcut(QKeySequence("Ctrl+R")); - rightActEncrypted->setShortcut(QKeySequence("Ctrl+E")); - rightActComments->setShortcut(QKeySequence("Ctrl+C")); - rightActRaw->setChecked(true); - connect(rightBarGroup, SIGNAL(triggered(QAction*)), this, SLOT(rightBarChanged(QAction*))); - - // Assemble the options menu - QMenu* optionsMenu = menuBar()->addMenu("&Options"); - optionsMenu->addAction(breakpointSetAct); - optionsMenu->addAction(runToCursorAct); - optionsMenu->addSeparator(); - optionsMenu->addActions(rightBarGroup->actions()); + QPoint parentPos = parent->pos(); + setGeometry(parentPos.x()+100, parentPos.y()+100, 800, 400); + setWindowTitle("Debug: Disassembly View"); + + // + // The main frame and its input and log widgets + // + QFrame* mainWindowFrame = new QFrame(this); + + // The top frame & groupbox that contains the input widgets + QFrame* topSubFrame = new QFrame(mainWindowFrame); + + // The input edit + m_inputEdit = new QLineEdit(topSubFrame); + connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(expressionSubmitted())); + + // The cpu combo box + m_cpuComboBox = new QComboBox(topSubFrame); + m_cpuComboBox->setMinimumWidth(300); + connect(m_cpuComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(cpuChanged(int))); + + // The main disasm window + m_dasmView = new DebuggerView(DVT_DISASSEMBLY, + m_machine, + this); + + // Force a recompute of the disassembly region + downcast<debug_view_disasm*>(m_dasmView->view())->set_expression("curpc"); + + // Populate the combo box & set the proper cpu + populateComboBox(); + //const debug_view_source *source = mem->views[0]->view->source_list().match_device(curcpu); + //gtk_combo_box_set_active(zone_w, mem->views[0]->view->source_list().index(*source)); + //mem->views[0]->view->set_source(*source); + + + // Layout + QHBoxLayout* subLayout = new QHBoxLayout(topSubFrame); + subLayout->addWidget(m_inputEdit); + subLayout->addWidget(m_cpuComboBox); + subLayout->setSpacing(3); + subLayout->setContentsMargins(2,2,2,2); + + QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame); + vLayout->setSpacing(3); + vLayout->setContentsMargins(2,2,2,2); + vLayout->addWidget(topSubFrame); + vLayout->addWidget(m_dasmView); + + setCentralWidget(mainWindowFrame); + + // + // Menu bars + // + // Create two commands + QAction* breakpointSetAct = new QAction("Toggle Breakpoint At Cursor", this); + QAction* runToCursorAct = new QAction("Run To Cursor", this); + breakpointSetAct->setShortcut(Qt::Key_F9); + runToCursorAct->setShortcut(Qt::Key_F4); + connect(breakpointSetAct, SIGNAL(triggered(bool)), this, SLOT(toggleBreakpointAtCursor(bool))); + connect(runToCursorAct, SIGNAL(triggered(bool)), this, SLOT(runToCursor(bool))); + + // Right bar options + QActionGroup* rightBarGroup = new QActionGroup(this); + QAction* rightActRaw = new QAction("Raw Opcodes", this); + QAction* rightActEncrypted = new QAction("Encrypted Opcodes", this); + QAction* rightActComments = new QAction("Comments", this); + rightActRaw->setCheckable(true); + rightActEncrypted->setCheckable(true); + rightActComments->setCheckable(true); + rightActRaw->setActionGroup(rightBarGroup); + rightActEncrypted->setActionGroup(rightBarGroup); + rightActComments->setActionGroup(rightBarGroup); + rightActRaw->setShortcut(QKeySequence("Ctrl+R")); + rightActEncrypted->setShortcut(QKeySequence("Ctrl+E")); + rightActComments->setShortcut(QKeySequence("Ctrl+C")); + rightActRaw->setChecked(true); + connect(rightBarGroup, SIGNAL(triggered(QAction*)), this, SLOT(rightBarChanged(QAction*))); + + // Assemble the options menu + QMenu* optionsMenu = menuBar()->addMenu("&Options"); + optionsMenu->addAction(breakpointSetAct); + optionsMenu->addAction(runToCursorAct); + optionsMenu->addSeparator(); + optionsMenu->addActions(rightBarGroup->actions()); } void DasmWindow::cpuChanged(int index) { - m_dasmView->view()->set_source(*m_dasmView->view()->source_list().by_index(index)); - m_dasmView->viewport()->update(); + m_dasmView->view()->set_source(*m_dasmView->view()->source_list().by_index(index)); + m_dasmView->viewport()->update(); } void DasmWindow::expressionSubmitted() { - const QString expression = m_inputEdit->text(); - downcast<debug_view_disasm*>(m_dasmView->view())->set_expression(expression.toLocal8Bit().data()); - m_dasmView->viewport()->update(); + const QString expression = m_inputEdit->text(); + downcast<debug_view_disasm*>(m_dasmView->view())->set_expression(expression.toLocal8Bit().data()); + m_dasmView->viewport()->update(); } void DasmWindow::toggleBreakpointAtCursor(bool changedTo) { - if (m_dasmView->view()->cursor_visible()) - { - if (debug_cpu_get_visible_cpu(*m_machine) == m_dasmView->view()->source()->device()) - { - offs_t address = downcast<debug_view_disasm *>(m_dasmView->view())->selected_address(); - device_debug *cpuinfo = m_dasmView->view()->source()->device()->debug(); - - // Find an existing breakpoint at this address - INT32 bpindex = -1; - for (device_debug::breakpoint* bp = cpuinfo->breakpoint_first(); - bp != NULL; - bp = bp->next()) - { - if (address == bp->address()) - { - bpindex = bp->index(); - break; - } - } - - // If none exists, add a new one - astring command; - if (bpindex == -1) - { - command.printf("bpset 0x%X", address); - } - else - { - command.printf("bpclear 0x%X", bpindex); - } - debug_console_execute_command(*m_machine, command, 1); - } - } - - refreshAll(); + if (m_dasmView->view()->cursor_visible()) + { + if (debug_cpu_get_visible_cpu(*m_machine) == m_dasmView->view()->source()->device()) + { + offs_t address = downcast<debug_view_disasm *>(m_dasmView->view())->selected_address(); + device_debug *cpuinfo = m_dasmView->view()->source()->device()->debug(); + + // Find an existing breakpoint at this address + INT32 bpindex = -1; + for (device_debug::breakpoint* bp = cpuinfo->breakpoint_first(); + bp != NULL; + bp = bp->next()) + { + if (address == bp->address()) + { + bpindex = bp->index(); + break; + } + } + + // If none exists, add a new one + astring command; + if (bpindex == -1) + { + command.printf("bpset 0x%X", address); + } + else + { + command.printf("bpclear 0x%X", bpindex); + } + debug_console_execute_command(*m_machine, command, 1); + } + } + + refreshAll(); } void DasmWindow::runToCursor(bool changedTo) { - if (m_dasmView->view()->cursor_visible()) - { - if (debug_cpu_get_visible_cpu(*m_machine) == m_dasmView->view()->source()->device()) - { - offs_t address = downcast<debug_view_disasm*>(m_dasmView->view())->selected_address(); - astring command; - command.printf("go 0x%X", address); - debug_console_execute_command(*m_machine, command, 1); - } - } + if (m_dasmView->view()->cursor_visible()) + { + if (debug_cpu_get_visible_cpu(*m_machine) == m_dasmView->view()->source()->device()) + { + offs_t address = downcast<debug_view_disasm*>(m_dasmView->view())->selected_address(); + astring command; + command.printf("go 0x%X", address); + debug_console_execute_command(*m_machine, command, 1); + } + } } void DasmWindow::rightBarChanged(QAction* changedTo) { - debug_view_disasm* dasmView = downcast<debug_view_disasm*>(m_dasmView->view()); - if (changedTo->text() == "Raw Opcodes") - { - dasmView->set_right_column(DASM_RIGHTCOL_RAW); - } - else if (changedTo->text() == "Encrypted Opcodes") - { - dasmView->set_right_column(DASM_RIGHTCOL_ENCRYPTED); - } - else if (changedTo->text() == "Comments") - { - dasmView->set_right_column(DASM_RIGHTCOL_COMMENTS); - } - m_dasmView->viewport()->update(); + debug_view_disasm* dasmView = downcast<debug_view_disasm*>(m_dasmView->view()); + if (changedTo->text() == "Raw Opcodes") + { + dasmView->set_right_column(DASM_RIGHTCOL_RAW); + } + else if (changedTo->text() == "Encrypted Opcodes") + { + dasmView->set_right_column(DASM_RIGHTCOL_ENCRYPTED); + } + else if (changedTo->text() == "Comments") + { + dasmView->set_right_column(DASM_RIGHTCOL_COMMENTS); + } + m_dasmView->viewport()->update(); } void DasmWindow::populateComboBox() { - if (m_dasmView == NULL) - return; - - m_cpuComboBox->clear(); - for (const debug_view_source* source = m_dasmView->view()->source_list().head(); - source != NULL; - source = source->next()) - { - m_cpuComboBox->addItem(source->name()); - } + if (m_dasmView == NULL) + return; + + m_cpuComboBox->clear(); + for (const debug_view_source* source = m_dasmView->view()->source_list().head(); + source != NULL; + source = source->next()) + { + m_cpuComboBox->addItem(source->name()); + } } diff --git a/src/osd/sdl/debugqtdasmwindow.h b/src/osd/sdl/debugqtdasmwindow.h index fec80c44098..32cb186fcdd 100644 --- a/src/osd/sdl/debugqtdasmwindow.h +++ b/src/osd/sdl/debugqtdasmwindow.h @@ -12,31 +12,31 @@ //============================================================ class DasmWindow : public WindowQt { - Q_OBJECT - + Q_OBJECT + public: - DasmWindow(running_machine* machine, QWidget* parent=NULL); - virtual ~DasmWindow() {} + DasmWindow(running_machine* machine, QWidget* parent=NULL); + virtual ~DasmWindow() {} private slots: - void cpuChanged(int index); - void expressionSubmitted(); + void cpuChanged(int index); + void expressionSubmitted(); - void toggleBreakpointAtCursor(bool changedTo); - void runToCursor(bool changedTo); - void rightBarChanged(QAction* changedTo); + void toggleBreakpointAtCursor(bool changedTo); + void runToCursor(bool changedTo); + void rightBarChanged(QAction* changedTo); private: - void populateComboBox(); + void populateComboBox(); + - private: - // Widgets - QLineEdit* m_inputEdit; - QComboBox* m_cpuComboBox; - DebuggerView* m_dasmView; + // Widgets + QLineEdit* m_inputEdit; + QComboBox* m_cpuComboBox; + DebuggerView* m_dasmView; }; diff --git a/src/osd/sdl/debugqtlogwindow.c b/src/osd/sdl/debugqtlogwindow.c index 20cb0f81bd2..16a335a3aa2 100644 --- a/src/osd/sdl/debugqtlogwindow.c +++ b/src/osd/sdl/debugqtlogwindow.c @@ -5,28 +5,28 @@ #include "debug/dvdisasm.h" -LogWindow::LogWindow(running_machine* machine, QWidget* parent) : - WindowQt(machine, parent) +LogWindow::LogWindow(running_machine* machine, QWidget* parent) : + WindowQt(machine, parent) { - QPoint parentPos = parent->pos(); - setGeometry(parentPos.x()+100, parentPos.y()+100, 800, 400); - setWindowTitle("Debug: Machine Log"); + QPoint parentPos = parent->pos(); + setGeometry(parentPos.x()+100, parentPos.y()+100, 800, 400); + setWindowTitle("Debug: Machine Log"); - // - // The main frame and its input and log widgets - // - QFrame* mainWindowFrame = new QFrame(this); + // + // The main frame and its input and log widgets + // + QFrame* mainWindowFrame = new QFrame(this); - // The main log view - m_logView = new DebuggerView(DVT_LOG, - m_machine, - this); + // The main log view + m_logView = new DebuggerView(DVT_LOG, + m_machine, + this); - // Layout - QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame); - vLayout->setSpacing(3); - vLayout->setContentsMargins(2,2,2,2); - vLayout->addWidget(m_logView); + // Layout + QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame); + vLayout->setSpacing(3); + vLayout->setContentsMargins(2,2,2,2); + vLayout->addWidget(m_logView); - setCentralWidget(mainWindowFrame); + setCentralWidget(mainWindowFrame); } diff --git a/src/osd/sdl/debugqtlogwindow.h b/src/osd/sdl/debugqtlogwindow.h index 474aab79050..7b38a977989 100644 --- a/src/osd/sdl/debugqtlogwindow.h +++ b/src/osd/sdl/debugqtlogwindow.h @@ -12,16 +12,16 @@ //============================================================ class LogWindow : public WindowQt { - Q_OBJECT - + Q_OBJECT + public: - LogWindow(running_machine* machine, QWidget* parent=NULL); - virtual ~LogWindow() {} + LogWindow(running_machine* machine, QWidget* parent=NULL); + virtual ~LogWindow() {} private: - // Widgets - DebuggerView* m_logView; + // Widgets + DebuggerView* m_logView; }; diff --git a/src/osd/sdl/debugqtmainwindow.c b/src/osd/sdl/debugqtmainwindow.c index 0ec0e16b5f6..d92bed9c88c 100644 --- a/src/osd/sdl/debugqtmainwindow.c +++ b/src/osd/sdl/debugqtmainwindow.c @@ -4,299 +4,299 @@ #include "debug/dvdisasm.h" -MainWindow::MainWindow(device_t* processor, - running_machine* machine, - QWidget* parent) : - WindowQt(machine, parent), - m_historyIndex(0), - m_inputHistory() +MainWindow::MainWindow(device_t* processor, + running_machine* machine, + QWidget* parent) : + WindowQt(machine, parent), + m_historyIndex(0), + m_inputHistory() { - setGeometry(300, 300, 1000, 600); - - // - // The main frame and its input and log widgets - // - QFrame* mainWindowFrame = new QFrame(this); - - // The input line - m_inputEdit = new QLineEdit(mainWindowFrame); - connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(executeCommand())); - m_inputEdit->installEventFilter(this); - - - // The log view - m_consoleView = new DebuggerView(DVT_CONSOLE, - m_machine, - mainWindowFrame); - m_consoleView->setFocusPolicy(Qt::NoFocus); - m_consoleView->setPreferBottom(true); - - QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame); - vLayout->addWidget(m_consoleView); - vLayout->addWidget(m_inputEdit); - vLayout->setSpacing(3); - vLayout->setContentsMargins(4,0,4,2); - - setCentralWidget(mainWindowFrame); - - // - // Menu bars - // - // Create two commands - QAction* breakpointSetAct = new QAction("Toggle Breakpoint At Cursor", this); - QAction* runToCursorAct = new QAction("Run To Cursor", this); - breakpointSetAct->setShortcut(Qt::Key_F9); - runToCursorAct->setShortcut(Qt::Key_F4); - connect(breakpointSetAct, SIGNAL(triggered(bool)), this, SLOT(toggleBreakpointAtCursor(bool))); - connect(runToCursorAct, SIGNAL(triggered(bool)), this, SLOT(runToCursor(bool))); - - // Right bar options - QActionGroup* rightBarGroup = new QActionGroup(this); - QAction* rightActRaw = new QAction("Raw Opcodes", this); - QAction* rightActEncrypted = new QAction("Encrypted Opcodes", this); - QAction* rightActComments = new QAction("Comments", this); - rightActRaw->setCheckable(true); - rightActEncrypted->setCheckable(true); - rightActComments->setCheckable(true); - rightActRaw->setActionGroup(rightBarGroup); - rightActEncrypted->setActionGroup(rightBarGroup); - rightActComments->setActionGroup(rightBarGroup); - rightActRaw->setShortcut(QKeySequence("Ctrl+R")); - rightActEncrypted->setShortcut(QKeySequence("Ctrl+E")); - rightActComments->setShortcut(QKeySequence("Ctrl+C")); - rightActRaw->setChecked(true); - connect(rightBarGroup, SIGNAL(triggered(QAction*)), this, SLOT(rightBarChanged(QAction*))); - - // Assemble the options menu - QMenu* optionsMenu = menuBar()->addMenu("&Options"); - optionsMenu->addAction(breakpointSetAct); - optionsMenu->addAction(runToCursorAct); - optionsMenu->addSeparator(); - optionsMenu->addActions(rightBarGroup->actions()); - - - // - // Dock windows - // - QMenu* dockMenu = menuBar()->addMenu("Doc&ks"); - - setCorner(Qt::TopRightCorner, Qt::TopDockWidgetArea); - setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); - - // The processor dock - QDockWidget* cpuDock = new QDockWidget("processor", this); - cpuDock->setAllowedAreas(Qt::LeftDockWidgetArea); - m_procFrame = new ProcessorDockWidget(m_machine, cpuDock); - cpuDock->setWidget(dynamic_cast<QWidget*>(m_procFrame)); - - addDockWidget(Qt::LeftDockWidgetArea, cpuDock); - dockMenu->addAction(cpuDock->toggleViewAction()); - - // The disassembly dock - QDockWidget* dasmDock = new QDockWidget("dasm", this); - dasmDock->setAllowedAreas(Qt::TopDockWidgetArea); - m_dasmFrame = new DasmDockWidget(m_machine, dasmDock); - dasmDock->setWidget(m_dasmFrame); - - addDockWidget(Qt::TopDockWidgetArea, dasmDock); - dockMenu->addAction(dasmDock->toggleViewAction()); - - // Window title - astring title; - title.printf("Debug: %s - %s '%s'", m_machine->system().name, processor->name(), processor->tag()); - setWindowTitle(title.cstr()); + setGeometry(300, 300, 1000, 600); + + // + // The main frame and its input and log widgets + // + QFrame* mainWindowFrame = new QFrame(this); + + // The input line + m_inputEdit = new QLineEdit(mainWindowFrame); + connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(executeCommand())); + m_inputEdit->installEventFilter(this); + + + // The log view + m_consoleView = new DebuggerView(DVT_CONSOLE, + m_machine, + mainWindowFrame); + m_consoleView->setFocusPolicy(Qt::NoFocus); + m_consoleView->setPreferBottom(true); + + QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame); + vLayout->addWidget(m_consoleView); + vLayout->addWidget(m_inputEdit); + vLayout->setSpacing(3); + vLayout->setContentsMargins(4,0,4,2); + + setCentralWidget(mainWindowFrame); + + // + // Menu bars + // + // Create two commands + QAction* breakpointSetAct = new QAction("Toggle Breakpoint At Cursor", this); + QAction* runToCursorAct = new QAction("Run To Cursor", this); + breakpointSetAct->setShortcut(Qt::Key_F9); + runToCursorAct->setShortcut(Qt::Key_F4); + connect(breakpointSetAct, SIGNAL(triggered(bool)), this, SLOT(toggleBreakpointAtCursor(bool))); + connect(runToCursorAct, SIGNAL(triggered(bool)), this, SLOT(runToCursor(bool))); + + // Right bar options + QActionGroup* rightBarGroup = new QActionGroup(this); + QAction* rightActRaw = new QAction("Raw Opcodes", this); + QAction* rightActEncrypted = new QAction("Encrypted Opcodes", this); + QAction* rightActComments = new QAction("Comments", this); + rightActRaw->setCheckable(true); + rightActEncrypted->setCheckable(true); + rightActComments->setCheckable(true); + rightActRaw->setActionGroup(rightBarGroup); + rightActEncrypted->setActionGroup(rightBarGroup); + rightActComments->setActionGroup(rightBarGroup); + rightActRaw->setShortcut(QKeySequence("Ctrl+R")); + rightActEncrypted->setShortcut(QKeySequence("Ctrl+E")); + rightActComments->setShortcut(QKeySequence("Ctrl+C")); + rightActRaw->setChecked(true); + connect(rightBarGroup, SIGNAL(triggered(QAction*)), this, SLOT(rightBarChanged(QAction*))); + + // Assemble the options menu + QMenu* optionsMenu = menuBar()->addMenu("&Options"); + optionsMenu->addAction(breakpointSetAct); + optionsMenu->addAction(runToCursorAct); + optionsMenu->addSeparator(); + optionsMenu->addActions(rightBarGroup->actions()); + + + // + // Dock windows + // + QMenu* dockMenu = menuBar()->addMenu("Doc&ks"); + + setCorner(Qt::TopRightCorner, Qt::TopDockWidgetArea); + setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); + + // The processor dock + QDockWidget* cpuDock = new QDockWidget("processor", this); + cpuDock->setAllowedAreas(Qt::LeftDockWidgetArea); + m_procFrame = new ProcessorDockWidget(m_machine, cpuDock); + cpuDock->setWidget(dynamic_cast<QWidget*>(m_procFrame)); + + addDockWidget(Qt::LeftDockWidgetArea, cpuDock); + dockMenu->addAction(cpuDock->toggleViewAction()); + + // The disassembly dock + QDockWidget* dasmDock = new QDockWidget("dasm", this); + dasmDock->setAllowedAreas(Qt::TopDockWidgetArea); + m_dasmFrame = new DasmDockWidget(m_machine, dasmDock); + dasmDock->setWidget(m_dasmFrame); + + addDockWidget(Qt::TopDockWidgetArea, dasmDock); + dockMenu->addAction(dasmDock->toggleViewAction()); + + // Window title + astring title; + title.printf("Debug: %s - %s '%s'", m_machine->system().name, processor->name(), processor->tag()); + setWindowTitle(title.cstr()); } void MainWindow::setProcessor(device_t* processor) { - // Cpu swap - m_procFrame->view()->view()->set_source(*m_procFrame->view()->view()->source_list().match_device(processor)); - m_dasmFrame->view()->view()->set_source(*m_dasmFrame->view()->view()->source_list().match_device(processor)); - - // Scrollbar refresh - seems I should be able to do in the DebuggerView - m_dasmFrame->view()->verticalScrollBar()->setValue(m_dasmFrame->view()->view()->visible_position().y); - m_dasmFrame->view()->verticalScrollBar()->setValue(m_dasmFrame->view()->view()->visible_position().y); - - // Window title - astring title; - title.printf("Debug: %s - %s '%s'", m_machine->system().name, processor->name(), processor->tag()); - setWindowTitle(title.cstr()); + // Cpu swap + m_procFrame->view()->view()->set_source(*m_procFrame->view()->view()->source_list().match_device(processor)); + m_dasmFrame->view()->view()->set_source(*m_dasmFrame->view()->view()->source_list().match_device(processor)); + + // Scrollbar refresh - seems I should be able to do in the DebuggerView + m_dasmFrame->view()->verticalScrollBar()->setValue(m_dasmFrame->view()->view()->visible_position().y); + m_dasmFrame->view()->verticalScrollBar()->setValue(m_dasmFrame->view()->view()->visible_position().y); + + // Window title + astring title; + title.printf("Debug: %s - %s '%s'", m_machine->system().name, processor->name(), processor->tag()); + setWindowTitle(title.cstr()); } // Used to intercept the user clicking 'X' in the upper corner void MainWindow::closeEvent(QCloseEvent* event) { - debugActQuit(); + debugActQuit(); } // Used to intercept the user hitting the up arrow in the input widget bool MainWindow::eventFilter(QObject* obj, QEvent* event) { - // Only filter keypresses - QKeyEvent* keyEvent = NULL; - if (event->type() == QEvent::KeyPress) - { - keyEvent = static_cast<QKeyEvent*>(event); - } - else - { - return QObject::eventFilter(obj, event); - } - - // Catch up & down keys - if (keyEvent->key() == Qt::Key_Up || keyEvent->key() == Qt::Key_Down) - { - if (keyEvent->key() == Qt::Key_Up) - { - if (m_historyIndex > 0) - m_historyIndex--; - } - else if (keyEvent->key() == Qt::Key_Down) - { - if (m_historyIndex < m_inputHistory.size()) - m_historyIndex++; - } - - // Populate the input edit or clear it if you're at the end - if (m_historyIndex == m_inputHistory.size()) - { - m_inputEdit->setText(""); - } - else - { - m_inputEdit->setText(m_inputHistory[m_historyIndex]); - } - } - else if (keyEvent->key() == Qt::Key_Enter) - { - executeCommand(false); - } - else - { - return QObject::eventFilter(obj, event); - } - - return true; + // Only filter keypresses + QKeyEvent* keyEvent = NULL; + if (event->type() == QEvent::KeyPress) + { + keyEvent = static_cast<QKeyEvent*>(event); + } + else + { + return QObject::eventFilter(obj, event); + } + + // Catch up & down keys + if (keyEvent->key() == Qt::Key_Up || keyEvent->key() == Qt::Key_Down) + { + if (keyEvent->key() == Qt::Key_Up) + { + if (m_historyIndex > 0) + m_historyIndex--; + } + else if (keyEvent->key() == Qt::Key_Down) + { + if (m_historyIndex < m_inputHistory.size()) + m_historyIndex++; + } + + // Populate the input edit or clear it if you're at the end + if (m_historyIndex == m_inputHistory.size()) + { + m_inputEdit->setText(""); + } + else + { + m_inputEdit->setText(m_inputHistory[m_historyIndex]); + } + } + else if (keyEvent->key() == Qt::Key_Enter) + { + executeCommand(false); + } + else + { + return QObject::eventFilter(obj, event); + } + + return true; } void MainWindow::toggleBreakpointAtCursor(bool changedTo) { - debug_view_disasm* dasmView = downcast<debug_view_disasm*>(m_dasmFrame->view()->view()); - if (dasmView->cursor_visible()) - { - if (debug_cpu_get_visible_cpu(*m_machine) == dasmView->source()->device()) - { - offs_t address = downcast<debug_view_disasm *>(dasmView)->selected_address(); - device_debug *cpuinfo = dasmView->source()->device()->debug(); - - // Find an existing breakpoint at this address - INT32 bpindex = -1; - for (device_debug::breakpoint* bp = cpuinfo->breakpoint_first(); - bp != NULL; - bp = bp->next()) - { - if (address == bp->address()) - { - bpindex = bp->index(); - break; - } - } - - // If none exists, add a new one - astring command; - if (bpindex == -1) - { - command.printf("bpset 0x%X", address); - } - else - { - command.printf("bpclear 0x%X", bpindex); - } - debug_console_execute_command(*m_machine, command, 1); - } - } - - refreshAll(); + debug_view_disasm* dasmView = downcast<debug_view_disasm*>(m_dasmFrame->view()->view()); + if (dasmView->cursor_visible()) + { + if (debug_cpu_get_visible_cpu(*m_machine) == dasmView->source()->device()) + { + offs_t address = downcast<debug_view_disasm *>(dasmView)->selected_address(); + device_debug *cpuinfo = dasmView->source()->device()->debug(); + + // Find an existing breakpoint at this address + INT32 bpindex = -1; + for (device_debug::breakpoint* bp = cpuinfo->breakpoint_first(); + bp != NULL; + bp = bp->next()) + { + if (address == bp->address()) + { + bpindex = bp->index(); + break; + } + } + + // If none exists, add a new one + astring command; + if (bpindex == -1) + { + command.printf("bpset 0x%X", address); + } + else + { + command.printf("bpclear 0x%X", bpindex); + } + debug_console_execute_command(*m_machine, command, 1); + } + } + + refreshAll(); } void MainWindow::runToCursor(bool changedTo) { - debug_view_disasm* dasmView = downcast<debug_view_disasm*>(m_dasmFrame->view()->view()); - if (dasmView->cursor_visible()) - { - if (debug_cpu_get_visible_cpu(*m_machine) == dasmView->source()->device()) - { - offs_t address = downcast<debug_view_disasm*>(dasmView)->selected_address(); - astring command; - command.printf("go 0x%X", address); - debug_console_execute_command(*m_machine, command, 1); - } - } + debug_view_disasm* dasmView = downcast<debug_view_disasm*>(m_dasmFrame->view()->view()); + if (dasmView->cursor_visible()) + { + if (debug_cpu_get_visible_cpu(*m_machine) == dasmView->source()->device()) + { + offs_t address = downcast<debug_view_disasm*>(dasmView)->selected_address(); + astring command; + command.printf("go 0x%X", address); + debug_console_execute_command(*m_machine, command, 1); + } + } } void MainWindow::rightBarChanged(QAction* changedTo) { - debug_view_disasm* dasmView = downcast<debug_view_disasm*>(m_dasmFrame->view()->view()); - if (changedTo->text() == "Raw Opcodes") - { - dasmView->set_right_column(DASM_RIGHTCOL_RAW); - } - else if (changedTo->text() == "Encrypted Opcodes") - { - dasmView->set_right_column(DASM_RIGHTCOL_ENCRYPTED); - } - else if (changedTo->text() == "Comments") - { - dasmView->set_right_column(DASM_RIGHTCOL_COMMENTS); - } - m_dasmFrame->view()->viewport()->update(); + debug_view_disasm* dasmView = downcast<debug_view_disasm*>(m_dasmFrame->view()->view()); + if (changedTo->text() == "Raw Opcodes") + { + dasmView->set_right_column(DASM_RIGHTCOL_RAW); + } + else if (changedTo->text() == "Encrypted Opcodes") + { + dasmView->set_right_column(DASM_RIGHTCOL_ENCRYPTED); + } + else if (changedTo->text() == "Comments") + { + dasmView->set_right_column(DASM_RIGHTCOL_COMMENTS); + } + m_dasmFrame->view()->viewport()->update(); } void MainWindow::executeCommand(bool withClear) { - debug_console_execute_command(*m_machine, - m_inputEdit->text().toLocal8Bit().data(), - true); - - // Add history & set the index to be the top of the stack - addToHistory(m_inputEdit->text()); - - // Clear out the text and reset the history pointer only if asked - if (withClear) - { - m_inputEdit->clear(); - m_historyIndex = m_inputHistory.size(); - } - - // Refresh - m_consoleView->viewport()->update(); - m_procFrame->view()->update(); - m_dasmFrame->view()->update(); + debug_console_execute_command(*m_machine, + m_inputEdit->text().toLocal8Bit().data(), + true); + + // Add history & set the index to be the top of the stack + addToHistory(m_inputEdit->text()); + + // Clear out the text and reset the history pointer only if asked + if (withClear) + { + m_inputEdit->clear(); + m_historyIndex = m_inputHistory.size(); + } + + // Refresh + m_consoleView->viewport()->update(); + m_procFrame->view()->update(); + m_dasmFrame->view()->update(); } void MainWindow::addToHistory(const QString& command) { - if (command == "") - return; - - // Always push back when there is no previous history - if (m_inputHistory.size() == 0) - { - m_inputHistory.push_back(m_inputEdit->text()); - return; - } - - // If there is previous history, make sure it's not what you just executed - if (m_inputHistory.back() != m_inputEdit->text()) - { - m_inputHistory.push_back(m_inputEdit->text()); - } + if (command == "") + return; + + // Always push back when there is no previous history + if (m_inputHistory.size() == 0) + { + m_inputHistory.push_back(m_inputEdit->text()); + return; + } + + // If there is previous history, make sure it's not what you just executed + if (m_inputHistory.back() != m_inputEdit->text()) + { + m_inputHistory.push_back(m_inputEdit->text()); + } } diff --git a/src/osd/sdl/debugqtmainwindow.h b/src/osd/sdl/debugqtmainwindow.h index 683b8c6a4b1..452d8b56bcf 100644 --- a/src/osd/sdl/debugqtmainwindow.h +++ b/src/osd/sdl/debugqtmainwindow.h @@ -18,44 +18,44 @@ class ProcessorDockWidget; //============================================================ class MainWindow : public WindowQt { - Q_OBJECT - + Q_OBJECT + public: - MainWindow(device_t* processor, - running_machine* machine, - QWidget* parent=NULL); - virtual ~MainWindow() {} + MainWindow(device_t* processor, + running_machine* machine, + QWidget* parent=NULL); + virtual ~MainWindow() {} + + void setProcessor(device_t* processor); - void setProcessor(device_t* processor); - protected: - // Used to intercept the user clicking 'X' in the upper corner - void closeEvent(QCloseEvent* event); + // Used to intercept the user clicking 'X' in the upper corner + void closeEvent(QCloseEvent* event); - // Used to intercept the user hitting the up arrow in the input widget - bool eventFilter(QObject* obj, QEvent* event); + // Used to intercept the user hitting the up arrow in the input widget + bool eventFilter(QObject* obj, QEvent* event); private slots: - void toggleBreakpointAtCursor(bool changedTo); - void runToCursor(bool changedTo); - void rightBarChanged(QAction* changedTo); + void toggleBreakpointAtCursor(bool changedTo); + void runToCursor(bool changedTo); + void rightBarChanged(QAction* changedTo); - void executeCommand(bool withClear=true); + void executeCommand(bool withClear=true); private: - // Widgets and docks - QLineEdit* m_inputEdit; - DebuggerView* m_consoleView; - ProcessorDockWidget* m_procFrame; - DasmDockWidget* m_dasmFrame; - - // Terminal history - int m_historyIndex; - std::vector<QString> m_inputHistory; - void addToHistory(const QString& command); + // Widgets and docks + QLineEdit* m_inputEdit; + DebuggerView* m_consoleView; + ProcessorDockWidget* m_procFrame; + DasmDockWidget* m_dasmFrame; + + // Terminal history + int m_historyIndex; + std::vector<QString> m_inputHistory; + void addToHistory(const QString& command); }; @@ -64,48 +64,48 @@ private: //============================================================ class DasmDockWidget : public QWidget { - Q_OBJECT + Q_OBJECT public: - DasmDockWidget(running_machine* machine, QWidget* parent=NULL) : - QWidget(parent), - m_machine(machine) - { - m_dasmView = new DebuggerView(DVT_DISASSEMBLY, - m_machine, - this); + DasmDockWidget(running_machine* machine, QWidget* parent=NULL) : + QWidget(parent), + m_machine(machine) + { + m_dasmView = new DebuggerView(DVT_DISASSEMBLY, + m_machine, + this); + + // Force a recompute of the disassembly region + downcast<debug_view_disasm*>(m_dasmView->view())->set_expression("curpc"); + + QVBoxLayout* dvLayout = new QVBoxLayout(this); + dvLayout->addWidget(m_dasmView); + dvLayout->setContentsMargins(4,0,4,0); + } + - // Force a recompute of the disassembly region - downcast<debug_view_disasm*>(m_dasmView->view())->set_expression("curpc"); + virtual ~DasmDockWidget() {} - QVBoxLayout* dvLayout = new QVBoxLayout(this); - dvLayout->addWidget(m_dasmView); - dvLayout->setContentsMargins(4,0,4,0); - } - - - virtual ~DasmDockWidget() {} - - DebuggerView* view() { return m_dasmView; } + DebuggerView* view() { return m_dasmView; } - - QSize minimumSizeHint() const - { - return QSize(150,150); - } + QSize minimumSizeHint() const + { + return QSize(150,150); + } - QSize sizeHint() const - { - return QSize(150,200); - } + + QSize sizeHint() const + { + return QSize(150,200); + } private: - DebuggerView* m_dasmView; + DebuggerView* m_dasmView; - running_machine* m_machine; + running_machine* m_machine; }; @@ -114,48 +114,48 @@ private: //============================================================ class ProcessorDockWidget : public QWidget { - Q_OBJECT + Q_OBJECT public: - ProcessorDockWidget(running_machine* machine, - QWidget* parent=NULL) : - QWidget(parent), - m_processorView(NULL), - m_machine(machine) - { - m_processorView = new DebuggerView(DVT_STATE, - m_machine, - this); - m_processorView->setFocusPolicy(Qt::NoFocus); - - QVBoxLayout* cvLayout = new QVBoxLayout(this); - cvLayout->addWidget(m_processorView); - cvLayout->setContentsMargins(4,0,4,2); - } - - - virtual ~ProcessorDockWidget() {} - - - DebuggerView* view() { return m_processorView; } - - - QSize minimumSizeHint() const - { - return QSize(150,300); - } - - - QSize sizeHint() const - { - return QSize(200,300); - } - - + ProcessorDockWidget(running_machine* machine, + QWidget* parent=NULL) : + QWidget(parent), + m_processorView(NULL), + m_machine(machine) + { + m_processorView = new DebuggerView(DVT_STATE, + m_machine, + this); + m_processorView->setFocusPolicy(Qt::NoFocus); + + QVBoxLayout* cvLayout = new QVBoxLayout(this); + cvLayout->addWidget(m_processorView); + cvLayout->setContentsMargins(4,0,4,2); + } + + + virtual ~ProcessorDockWidget() {} + + + DebuggerView* view() { return m_processorView; } + + + QSize minimumSizeHint() const + { + return QSize(150,300); + } + + + QSize sizeHint() const + { + return QSize(200,300); + } + + private: - DebuggerView* m_processorView; + DebuggerView* m_processorView; - running_machine* m_machine; + running_machine* m_machine; }; diff --git a/src/osd/sdl/debugqtmemorywindow.c b/src/osd/sdl/debugqtmemorywindow.c index 718a0a5b3e7..94670051ddf 100644 --- a/src/osd/sdl/debugqtmemorywindow.c +++ b/src/osd/sdl/debugqtmemorywindow.c @@ -6,212 +6,212 @@ #include "debug/debugcpu.h" -MemoryWindow::MemoryWindow(running_machine* machine, QWidget* parent) : - WindowQt(machine, parent) +MemoryWindow::MemoryWindow(running_machine* machine, QWidget* parent) : + WindowQt(machine, parent) { - QPoint parentPos = parent->pos(); - setGeometry(parentPos.x()+100, parentPos.y()+100, 800, 400); - setWindowTitle("Debug: Memory View"); - - // - // The main frame and its input and log widgets - // - QFrame* mainWindowFrame = new QFrame(this); - - // The top frame & groupbox that contains the input widgets - QFrame* topSubFrame = new QFrame(mainWindowFrame); - - // The input edit - m_inputEdit = new QLineEdit(topSubFrame); - connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(expressionSubmitted())); - - // The memory space combo box - m_memoryComboBox = new QComboBox(topSubFrame); - m_memoryComboBox->setMinimumWidth(300); - connect(m_memoryComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(memoryRegionChanged(int))); - - // The main memory window - m_memTable = new DebuggerView(DVT_MEMORY, - m_machine, - this); - - // Populate the combo box - populateComboBox(); - - - // Layout - QHBoxLayout* subLayout = new QHBoxLayout(topSubFrame); - subLayout->addWidget(m_inputEdit); - subLayout->addWidget(m_memoryComboBox); - subLayout->setSpacing(3); - subLayout->setContentsMargins(2,2,2,2); - - QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame); - vLayout->setSpacing(3); - vLayout->setContentsMargins(2,2,2,2); - vLayout->addWidget(topSubFrame); - vLayout->addWidget(m_memTable); - - setCentralWidget(mainWindowFrame); - - // - // Menu bars - // - // Create a byte-chunk group - QActionGroup* chunkGroup = new QActionGroup(this); - QAction* chunkActOne = new QAction("1-byte chunks", this); - QAction* chunkActTwo = new QAction("2-byte chunks", this); - QAction* chunkActFour = new QAction("4-byte chunks", this); - chunkActOne->setCheckable(true); - chunkActTwo->setCheckable(true); - chunkActFour->setCheckable(true); - chunkActOne->setActionGroup(chunkGroup); - chunkActTwo->setActionGroup(chunkGroup); - chunkActFour->setActionGroup(chunkGroup); - chunkActOne->setShortcut(QKeySequence("Ctrl+1")); - chunkActTwo->setShortcut(QKeySequence("Ctrl+2")); - chunkActFour->setShortcut(QKeySequence("Ctrl+4")); - chunkActOne->setChecked(true); - connect(chunkGroup, SIGNAL(triggered(QAction*)), this, SLOT(chunkChanged(QAction*))); - - // Create a address display group - QActionGroup* addressGroup = new QActionGroup(this); - QAction* addressActLogical = new QAction("Logical Addresses", this); - QAction* addressActPhysical = new QAction("Physical Addresses", this); - addressActLogical->setCheckable(true); - addressActPhysical->setCheckable(true); - addressActLogical->setActionGroup(addressGroup); - addressActPhysical->setActionGroup(addressGroup); - addressActLogical->setShortcut(QKeySequence("Ctrl+G")); - addressActPhysical->setShortcut(QKeySequence("Ctrl+Y")); - addressActLogical->setChecked(true); - connect(addressGroup, SIGNAL(triggered(QAction*)), this, SLOT(addressChanged(QAction*))); - - // Create a reverse view radio - QAction* reverseAct = new QAction("Reverse View", this); - reverseAct->setCheckable(true); - reverseAct->setShortcut(QKeySequence("Ctrl+R")); - connect(reverseAct, SIGNAL(toggled(bool)), this, SLOT(reverseChanged(bool))); - - // Create increase and decrease bytes-per-line actions - QAction* increaseBplAct = new QAction("Increase Bytes Per Line", this); - QAction* decreaseBplAct = new QAction("Decrease Bytes Per Line", this); - increaseBplAct->setShortcut(QKeySequence("Ctrl+P")); - decreaseBplAct->setShortcut(QKeySequence("Ctrl+O")); - connect(increaseBplAct, SIGNAL(triggered(bool)), this, SLOT(increaseBytesPerLine(bool))); - connect(decreaseBplAct, SIGNAL(triggered(bool)), this, SLOT(decreaseBytesPerLine(bool))); - - // Assemble the options menu - QMenu* optionsMenu = menuBar()->addMenu("&Options"); - optionsMenu->addActions(chunkGroup->actions()); - optionsMenu->addSeparator(); - optionsMenu->addActions(addressGroup->actions()); - optionsMenu->addSeparator(); - optionsMenu->addAction(reverseAct); - optionsMenu->addSeparator(); - optionsMenu->addAction(increaseBplAct); - optionsMenu->addAction(decreaseBplAct); + QPoint parentPos = parent->pos(); + setGeometry(parentPos.x()+100, parentPos.y()+100, 800, 400); + setWindowTitle("Debug: Memory View"); + + // + // The main frame and its input and log widgets + // + QFrame* mainWindowFrame = new QFrame(this); + + // The top frame & groupbox that contains the input widgets + QFrame* topSubFrame = new QFrame(mainWindowFrame); + + // The input edit + m_inputEdit = new QLineEdit(topSubFrame); + connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(expressionSubmitted())); + + // The memory space combo box + m_memoryComboBox = new QComboBox(topSubFrame); + m_memoryComboBox->setMinimumWidth(300); + connect(m_memoryComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(memoryRegionChanged(int))); + + // The main memory window + m_memTable = new DebuggerView(DVT_MEMORY, + m_machine, + this); + + // Populate the combo box + populateComboBox(); + + + // Layout + QHBoxLayout* subLayout = new QHBoxLayout(topSubFrame); + subLayout->addWidget(m_inputEdit); + subLayout->addWidget(m_memoryComboBox); + subLayout->setSpacing(3); + subLayout->setContentsMargins(2,2,2,2); + + QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame); + vLayout->setSpacing(3); + vLayout->setContentsMargins(2,2,2,2); + vLayout->addWidget(topSubFrame); + vLayout->addWidget(m_memTable); + + setCentralWidget(mainWindowFrame); + + // + // Menu bars + // + // Create a byte-chunk group + QActionGroup* chunkGroup = new QActionGroup(this); + QAction* chunkActOne = new QAction("1-byte chunks", this); + QAction* chunkActTwo = new QAction("2-byte chunks", this); + QAction* chunkActFour = new QAction("4-byte chunks", this); + chunkActOne->setCheckable(true); + chunkActTwo->setCheckable(true); + chunkActFour->setCheckable(true); + chunkActOne->setActionGroup(chunkGroup); + chunkActTwo->setActionGroup(chunkGroup); + chunkActFour->setActionGroup(chunkGroup); + chunkActOne->setShortcut(QKeySequence("Ctrl+1")); + chunkActTwo->setShortcut(QKeySequence("Ctrl+2")); + chunkActFour->setShortcut(QKeySequence("Ctrl+4")); + chunkActOne->setChecked(true); + connect(chunkGroup, SIGNAL(triggered(QAction*)), this, SLOT(chunkChanged(QAction*))); + + // Create a address display group + QActionGroup* addressGroup = new QActionGroup(this); + QAction* addressActLogical = new QAction("Logical Addresses", this); + QAction* addressActPhysical = new QAction("Physical Addresses", this); + addressActLogical->setCheckable(true); + addressActPhysical->setCheckable(true); + addressActLogical->setActionGroup(addressGroup); + addressActPhysical->setActionGroup(addressGroup); + addressActLogical->setShortcut(QKeySequence("Ctrl+G")); + addressActPhysical->setShortcut(QKeySequence("Ctrl+Y")); + addressActLogical->setChecked(true); + connect(addressGroup, SIGNAL(triggered(QAction*)), this, SLOT(addressChanged(QAction*))); + + // Create a reverse view radio + QAction* reverseAct = new QAction("Reverse View", this); + reverseAct->setCheckable(true); + reverseAct->setShortcut(QKeySequence("Ctrl+R")); + connect(reverseAct, SIGNAL(toggled(bool)), this, SLOT(reverseChanged(bool))); + + // Create increase and decrease bytes-per-line actions + QAction* increaseBplAct = new QAction("Increase Bytes Per Line", this); + QAction* decreaseBplAct = new QAction("Decrease Bytes Per Line", this); + increaseBplAct->setShortcut(QKeySequence("Ctrl+P")); + decreaseBplAct->setShortcut(QKeySequence("Ctrl+O")); + connect(increaseBplAct, SIGNAL(triggered(bool)), this, SLOT(increaseBytesPerLine(bool))); + connect(decreaseBplAct, SIGNAL(triggered(bool)), this, SLOT(decreaseBytesPerLine(bool))); + + // Assemble the options menu + QMenu* optionsMenu = menuBar()->addMenu("&Options"); + optionsMenu->addActions(chunkGroup->actions()); + optionsMenu->addSeparator(); + optionsMenu->addActions(addressGroup->actions()); + optionsMenu->addSeparator(); + optionsMenu->addAction(reverseAct); + optionsMenu->addSeparator(); + optionsMenu->addAction(increaseBplAct); + optionsMenu->addAction(decreaseBplAct); } void MemoryWindow::memoryRegionChanged(int index) { - m_memTable->view()->set_source(*m_memTable->view()->source_list().by_index(index)); - m_memTable->viewport()->update(); + m_memTable->view()->set_source(*m_memTable->view()->source_list().by_index(index)); + m_memTable->viewport()->update(); } void MemoryWindow::expressionSubmitted() { - const QString expression = m_inputEdit->text(); - downcast<debug_view_memory*>(m_memTable->view())->set_expression(expression.toLocal8Bit().data()); + const QString expression = m_inputEdit->text(); + downcast<debug_view_memory*>(m_memTable->view())->set_expression(expression.toLocal8Bit().data()); - // Make the cursor pop - m_memTable->view()->set_cursor_visible(true); + // Make the cursor pop + m_memTable->view()->set_cursor_visible(true); - // Check where the cursor is and adjust the scroll accordingly - debug_view_xy cursorPosition = m_memTable->view()->cursor_position(); - // TODO: check if the region is already visible? - m_memTable->verticalScrollBar()->setValue(cursorPosition.y); + // Check where the cursor is and adjust the scroll accordingly + debug_view_xy cursorPosition = m_memTable->view()->cursor_position(); + // TODO: check if the region is already visible? + m_memTable->verticalScrollBar()->setValue(cursorPosition.y); - m_memTable->update(); - m_memTable->viewport()->update(); + m_memTable->update(); + m_memTable->viewport()->update(); } void MemoryWindow::chunkChanged(QAction* changedTo) { - debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); - if (changedTo->text() == "1-byte chunks") - { - memView->set_bytes_per_chunk(1); - } - else if (changedTo->text() == "2-byte chunks") - { - memView->set_bytes_per_chunk(2); - } - else if (changedTo->text() == "4-byte chunks") - { - memView->set_bytes_per_chunk(4); - } - m_memTable->viewport()->update(); + debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); + if (changedTo->text() == "1-byte chunks") + { + memView->set_bytes_per_chunk(1); + } + else if (changedTo->text() == "2-byte chunks") + { + memView->set_bytes_per_chunk(2); + } + else if (changedTo->text() == "4-byte chunks") + { + memView->set_bytes_per_chunk(4); + } + m_memTable->viewport()->update(); } void MemoryWindow::addressChanged(QAction* changedTo) { - debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); - if (changedTo->text() == "Logical Addresses") - { - memView->set_physical(false); - } - else if (changedTo->text() == "Physical Addresses") - { - memView->set_physical(true); - } - m_memTable->viewport()->update(); + debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); + if (changedTo->text() == "Logical Addresses") + { + memView->set_physical(false); + } + else if (changedTo->text() == "Physical Addresses") + { + memView->set_physical(true); + } + m_memTable->viewport()->update(); } void MemoryWindow::reverseChanged(bool changedTo) { - debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); - memView->set_reverse(changedTo); - m_memTable->viewport()->update(); + debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); + memView->set_reverse(changedTo); + m_memTable->viewport()->update(); } void MemoryWindow::increaseBytesPerLine(bool changedTo) { - debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); - memView->set_chunks_per_row(memView->chunks_per_row() + 1); - m_memTable->viewport()->update(); + debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); + memView->set_chunks_per_row(memView->chunks_per_row() + 1); + m_memTable->viewport()->update(); } void MemoryWindow::decreaseBytesPerLine(bool checked) { - debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); - memView->set_chunks_per_row(memView->chunks_per_row() - 1); - m_memTable->viewport()->update(); + debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); + memView->set_chunks_per_row(memView->chunks_per_row() - 1); + m_memTable->viewport()->update(); } void MemoryWindow::populateComboBox() { - if (m_memTable == NULL) - return; - - m_memoryComboBox->clear(); - for (const debug_view_source* source = m_memTable->view()->source_list().head(); - source != NULL; - source = source->next()) - { - m_memoryComboBox->addItem(source->name()); - } - - // TODO: Set to the proper memory view - //const debug_view_source *source = mem->views[0]->view->source_list().match_device(curcpu); - //gtk_combo_box_set_active(zone_w, mem->views[0]->view->source_list().index(*source)); - //mem->views[0]->view->set_source(*source); + if (m_memTable == NULL) + return; + + m_memoryComboBox->clear(); + for (const debug_view_source* source = m_memTable->view()->source_list().head(); + source != NULL; + source = source->next()) + { + m_memoryComboBox->addItem(source->name()); + } + + // TODO: Set to the proper memory view + //const debug_view_source *source = mem->views[0]->view->source_list().match_device(curcpu); + //gtk_combo_box_set_active(zone_w, mem->views[0]->view->source_list().index(*source)); + //mem->views[0]->view->set_source(*source); } diff --git a/src/osd/sdl/debugqtmemorywindow.h b/src/osd/sdl/debugqtmemorywindow.h index d08ca0ff394..9057c0c06b6 100644 --- a/src/osd/sdl/debugqtmemorywindow.h +++ b/src/osd/sdl/debugqtmemorywindow.h @@ -12,32 +12,32 @@ //============================================================ class MemoryWindow : public WindowQt { - Q_OBJECT - + Q_OBJECT + public: - MemoryWindow(running_machine* machine, QWidget* parent=NULL); - virtual ~MemoryWindow() {} + MemoryWindow(running_machine* machine, QWidget* parent=NULL); + virtual ~MemoryWindow() {} private slots: - void memoryRegionChanged(int index); - void expressionSubmitted(); - void chunkChanged(QAction* changedTo); - void addressChanged(QAction* changedTo); - void reverseChanged(bool changedTo); - void increaseBytesPerLine(bool changedTo); - void decreaseBytesPerLine(bool checked=false); + void memoryRegionChanged(int index); + void expressionSubmitted(); + void chunkChanged(QAction* changedTo); + void addressChanged(QAction* changedTo); + void reverseChanged(bool changedTo); + void increaseBytesPerLine(bool changedTo); + void decreaseBytesPerLine(bool checked=false); private: - void populateComboBox(); + void populateComboBox(); private: - // Widgets - QLineEdit* m_inputEdit; - QComboBox* m_memoryComboBox; - DebuggerView* m_memTable; + // Widgets + QLineEdit* m_inputEdit; + QComboBox* m_memoryComboBox; + DebuggerView* m_memTable; }; diff --git a/src/osd/sdl/debugqtview.c b/src/osd/sdl/debugqtview.c index d366b5774ea..9e0a072085f 100644 --- a/src/osd/sdl/debugqtview.c +++ b/src/osd/sdl/debugqtview.c @@ -3,199 +3,197 @@ #include "debugqtview.h" -DebuggerView::DebuggerView(const debug_view_type& type, - running_machine* machine, - QWidget* parent) : - QAbstractScrollArea(parent), - m_preferBottom(false), - m_view(NULL), - m_machine(machine) +DebuggerView::DebuggerView(const debug_view_type& type, + running_machine* machine, + QWidget* parent) : + QAbstractScrollArea(parent), + m_preferBottom(false), + m_view(NULL), + m_machine(machine) { - QFont viewFontRequest("Courier"); - viewFontRequest.setFixedPitch(true); - viewFontRequest.setPointSize(12); - setFont(viewFontRequest); - - m_view = m_machine->debug_view().alloc_view(type, - DebuggerView::debuggerViewUpdate, - this); + QFont viewFontRequest("Courier"); + viewFontRequest.setFixedPitch(true); + viewFontRequest.setPointSize(12); + setFont(viewFontRequest); + + m_view = m_machine->debug_view().alloc_view(type, + DebuggerView::debuggerViewUpdate, + this); } void DebuggerView::paintEvent(QPaintEvent* event) { - // Tell the MAME debug view how much real estate is available - QFontMetrics actualFont = fontMetrics(); - const int fontWidth = MAX(1, actualFont.maxWidth()); - const int fontHeight = MAX(1, actualFont.height()); - m_view->set_visible_size(debug_view_xy(width()/fontWidth, height()/fontHeight)); - - - // Handle the scroll bars - const int verticalScrollCharDiff = m_view->total_size().y - m_view->visible_size().y; - const int scrollSize = verticalScrollCharDiff < 0 ? 0 : verticalScrollCharDiff; - bool atEnd = false; - if (verticalScrollBar()->value() == verticalScrollBar()->maximum()) - { - atEnd = true; - } - verticalScrollBar()->setRange(0, scrollSize); - if (m_preferBottom && atEnd) - { - verticalScrollBar()->setValue(scrollSize); - } - m_view->set_visible_position(debug_view_xy(0, verticalScrollBar()->value())); - - - // Draw the viewport widget - QPainter painter(viewport()); - painter.fillRect(0, 0, width(), height(), QBrush(Qt::white)); - painter.setBackgroundMode(Qt::OpaqueMode); - painter.setBackground(QColor(255,255,255)); - - // Background control - QBrush bgBrush; - bgBrush.setStyle(Qt::SolidPattern); - painter.setPen(QPen(QColor(0,0,0))); - - size_t viewDataOffset = 0; - const debug_view_xy& visibleCharDims = m_view->visible_size(); - for (int y = 0; y < visibleCharDims.y; y++) - { - for (int x = 0; x < visibleCharDims.x; x++) - { - const unsigned char textAttr = m_view->viewdata()[viewDataOffset].attrib; - - if (x == 0 || textAttr != m_view->viewdata()[viewDataOffset-1].attrib) - { - // Text color handling - QColor fgColor(0,0,0); - QColor bgColor(255,255,255); - - if(textAttr & DCA_ANCILLARY) - { - bgColor.setRgb(0xe0, 0xe0, 0xe0); - } - if(textAttr & DCA_SELECTED) - { - bgColor.setRgb(0xff, 0x80, 0x80); - } - if(textAttr & DCA_CURRENT) - { - bgColor.setRgb(0xff, 0xff, 0x00); - } - if(textAttr & DCA_CHANGED) - { - fgColor.setRgb(0xff, 0x00, 0x00); - } - if(textAttr & DCA_INVALID) - { - fgColor.setRgb(0x00, 0x00, 0xff); - } - if(textAttr & DCA_DISABLED) - { - fgColor.setRgb((fgColor.red() + bgColor.red()) >> 1, - (fgColor.green() + bgColor.green()) >> 1, - (fgColor.blue() + bgColor.blue()) >> 1); - } - if(textAttr & DCA_COMMENT) - { - fgColor.setRgb(0x00, 0x80, 0x00); - } - - bgBrush.setColor(bgColor); - painter.setBackground(bgBrush); - painter.setPen(QPen(fgColor)); - } - - // There is a touchy interplay between font height, drawing difference, visible position, etc - // To test, set the bgcolor to something crazy and see where stuff gets drawn - painter.drawText(x*fontWidth, - y*fontHeight + fontHeight, - QString(m_view->viewdata()[viewDataOffset].byte)); - viewDataOffset++; - } - } + // Tell the MAME debug view how much real estate is available + QFontMetrics actualFont = fontMetrics(); + const int fontWidth = MAX(1, actualFont.maxWidth()); + const int fontHeight = MAX(1, actualFont.height()); + m_view->set_visible_size(debug_view_xy(width()/fontWidth, height()/fontHeight)); + + + // Handle the scroll bars + const int verticalScrollCharDiff = m_view->total_size().y - m_view->visible_size().y; + const int scrollSize = verticalScrollCharDiff < 0 ? 0 : verticalScrollCharDiff; + bool atEnd = false; + if (verticalScrollBar()->value() == verticalScrollBar()->maximum()) + { + atEnd = true; + } + verticalScrollBar()->setRange(0, scrollSize); + if (m_preferBottom && atEnd) + { + verticalScrollBar()->setValue(scrollSize); + } + m_view->set_visible_position(debug_view_xy(0, verticalScrollBar()->value())); + + + // Draw the viewport widget + QPainter painter(viewport()); + painter.fillRect(0, 0, width(), height(), QBrush(Qt::white)); + painter.setBackgroundMode(Qt::OpaqueMode); + painter.setBackground(QColor(255,255,255)); + + // Background control + QBrush bgBrush; + bgBrush.setStyle(Qt::SolidPattern); + painter.setPen(QPen(QColor(0,0,0))); + + size_t viewDataOffset = 0; + const debug_view_xy& visibleCharDims = m_view->visible_size(); + for (int y = 0; y < visibleCharDims.y; y++) + { + for (int x = 0; x < visibleCharDims.x; x++) + { + const unsigned char textAttr = m_view->viewdata()[viewDataOffset].attrib; + + if (x == 0 || textAttr != m_view->viewdata()[viewDataOffset-1].attrib) + { + // Text color handling + QColor fgColor(0,0,0); + QColor bgColor(255,255,255); + + if(textAttr & DCA_ANCILLARY) + { + bgColor.setRgb(0xe0, 0xe0, 0xe0); + } + if(textAttr & DCA_SELECTED) + { + bgColor.setRgb(0xff, 0x80, 0x80); + } + if(textAttr & DCA_CURRENT) + { + bgColor.setRgb(0xff, 0xff, 0x00); + } + if(textAttr & DCA_CHANGED) + { + fgColor.setRgb(0xff, 0x00, 0x00); + } + if(textAttr & DCA_INVALID) + { + fgColor.setRgb(0x00, 0x00, 0xff); + } + if(textAttr & DCA_DISABLED) + { + fgColor.setRgb((fgColor.red() + bgColor.red()) >> 1, + (fgColor.green() + bgColor.green()) >> 1, + (fgColor.blue() + bgColor.blue()) >> 1); + } + if(textAttr & DCA_COMMENT) + { + fgColor.setRgb(0x00, 0x80, 0x00); + } + + bgBrush.setColor(bgColor); + painter.setBackground(bgBrush); + painter.setPen(QPen(fgColor)); + } + + // There is a touchy interplay between font height, drawing difference, visible position, etc + // To test, set the bgcolor to something crazy and see where stuff gets drawn + painter.drawText(x*fontWidth, + y*fontHeight + fontHeight, + QString(m_view->viewdata()[viewDataOffset].byte)); + viewDataOffset++; + } + } } void DebuggerView::keyPressEvent(QKeyEvent* event) { - if (m_view == NULL) - return QWidget::keyPressEvent(event); - - Qt::KeyboardModifiers keyMods = QApplication::keyboardModifiers(); - bool ctrlDown = keyMods.testFlag(Qt::ControlModifier); - - int keyPress = -1; - switch (event->key()) - { - case Qt::Key_Up: - keyPress = DCH_UP; - break; - case Qt::Key_Down: - keyPress = DCH_DOWN; - break; - case Qt::Key_Left: - keyPress = DCH_LEFT; - if (ctrlDown) keyPress = DCH_CTRLLEFT; - break; - case Qt::Key_Right: - keyPress = DCH_RIGHT; - if (ctrlDown) keyPress = DCH_CTRLRIGHT; - break; - case Qt::Key_PageUp: - keyPress = DCH_PUP; - break; - case Qt::Key_PageDown: - keyPress = DCH_PDOWN; - break; - case Qt::Key_Home: - keyPress = DCH_HOME; - if (ctrlDown) keyPress = DCH_CTRLHOME; - break; - case Qt::Key_End: - keyPress = DCH_END; - if (ctrlDown) keyPress = DCH_CTRLEND; - break; - case Qt::Key_0: keyPress = '0'; break; - case Qt::Key_1: keyPress = '1'; break; - case Qt::Key_2: keyPress = '2'; break; - case Qt::Key_3: keyPress = '3'; break; - case Qt::Key_4: keyPress = '4'; break; - case Qt::Key_5: keyPress = '5'; break; - case Qt::Key_6: keyPress = '6'; break; - case Qt::Key_7: keyPress = '7'; break; - case Qt::Key_8: keyPress = '8'; break; - case Qt::Key_9: keyPress = '9'; break; - case Qt::Key_A: keyPress = 'a'; break; - case Qt::Key_B: keyPress = 'b'; break; - case Qt::Key_C: keyPress = 'c'; break; - case Qt::Key_D: keyPress = 'd'; break; - case Qt::Key_E: keyPress = 'e'; break; - case Qt::Key_F: keyPress = 'f'; break; - default: - return QWidget::keyPressEvent(event); - } - - m_view->set_cursor_visible(true); - m_view->process_char(keyPress); - - // Catch the view up with the cursor - verticalScrollBar()->setValue(m_view->visible_position().y); - - viewport()->update(); - update(); + if (m_view == NULL) + return QWidget::keyPressEvent(event); + + Qt::KeyboardModifiers keyMods = QApplication::keyboardModifiers(); + bool ctrlDown = keyMods.testFlag(Qt::ControlModifier); + + int keyPress = -1; + switch (event->key()) + { + case Qt::Key_Up: + keyPress = DCH_UP; + break; + case Qt::Key_Down: + keyPress = DCH_DOWN; + break; + case Qt::Key_Left: + keyPress = DCH_LEFT; + if (ctrlDown) keyPress = DCH_CTRLLEFT; + break; + case Qt::Key_Right: + keyPress = DCH_RIGHT; + if (ctrlDown) keyPress = DCH_CTRLRIGHT; + break; + case Qt::Key_PageUp: + keyPress = DCH_PUP; + break; + case Qt::Key_PageDown: + keyPress = DCH_PDOWN; + break; + case Qt::Key_Home: + keyPress = DCH_HOME; + if (ctrlDown) keyPress = DCH_CTRLHOME; + break; + case Qt::Key_End: + keyPress = DCH_END; + if (ctrlDown) keyPress = DCH_CTRLEND; + break; + case Qt::Key_0: keyPress = '0'; break; + case Qt::Key_1: keyPress = '1'; break; + case Qt::Key_2: keyPress = '2'; break; + case Qt::Key_3: keyPress = '3'; break; + case Qt::Key_4: keyPress = '4'; break; + case Qt::Key_5: keyPress = '5'; break; + case Qt::Key_6: keyPress = '6'; break; + case Qt::Key_7: keyPress = '7'; break; + case Qt::Key_8: keyPress = '8'; break; + case Qt::Key_9: keyPress = '9'; break; + case Qt::Key_A: keyPress = 'a'; break; + case Qt::Key_B: keyPress = 'b'; break; + case Qt::Key_C: keyPress = 'c'; break; + case Qt::Key_D: keyPress = 'd'; break; + case Qt::Key_E: keyPress = 'e'; break; + case Qt::Key_F: keyPress = 'f'; break; + default: + return QWidget::keyPressEvent(event); + } + + m_view->set_cursor_visible(true); + m_view->process_char(keyPress); + + // Catch the view up with the cursor + verticalScrollBar()->setValue(m_view->visible_position().y); + + viewport()->update(); + update(); } void DebuggerView::debuggerViewUpdate(debug_view& debugView, void* osdPrivate) { - // Get a handle to the DebuggerView being updated & redraw - DebuggerView* dView = (DebuggerView*)osdPrivate; - dView->verticalScrollBar()->setValue(dView->view()->visible_position().y); - dView->viewport()->update(); - dView->update(); + // Get a handle to the DebuggerView being updated & redraw + DebuggerView* dView = (DebuggerView*)osdPrivate; + dView->verticalScrollBar()->setValue(dView->view()->visible_position().y); + dView->viewport()->update(); + dView->update(); } - - diff --git a/src/osd/sdl/debugqtview.h b/src/osd/sdl/debugqtview.h index 4bf963114eb..5deab206dc7 100644 --- a/src/osd/sdl/debugqtview.h +++ b/src/osd/sdl/debugqtview.h @@ -9,30 +9,30 @@ class DebuggerView : public QAbstractScrollArea { public: - DebuggerView(const debug_view_type& type, - running_machine* machine, - QWidget* parent=NULL); - virtual ~DebuggerView() {} + DebuggerView(const debug_view_type& type, + running_machine* machine, + QWidget* parent=NULL); + virtual ~DebuggerView() {} - void paintEvent(QPaintEvent* event); + void paintEvent(QPaintEvent* event); - // Callback to allow MAME to refresh the view - static void debuggerViewUpdate(debug_view& debugView, void* osdPrivate); + // Callback to allow MAME to refresh the view + static void debuggerViewUpdate(debug_view& debugView, void* osdPrivate); - // Setters and accessors - void setPreferBottom(bool pb) { m_preferBottom = pb; } - debug_view* view() { return m_view; } + // Setters and accessors + void setPreferBottom(bool pb) { m_preferBottom = pb; } + debug_view* view() { return m_view; } protected: - void keyPressEvent(QKeyEvent* event); + void keyPressEvent(QKeyEvent* event); private: - bool m_preferBottom; + bool m_preferBottom; - debug_view* m_view; - running_machine* m_machine; + debug_view* m_view; + running_machine* m_machine; }; diff --git a/src/osd/sdl/debugqtwindow.c b/src/osd/sdl/debugqtwindow.c index 091c6f842b9..956035a4975 100644 --- a/src/osd/sdl/debugqtwindow.c +++ b/src/osd/sdl/debugqtwindow.c @@ -11,184 +11,184 @@ bool WindowQt::s_refreshAll = false; -WindowQt::WindowQt(running_machine* machine, QWidget* parent) : - QMainWindow(parent), - m_machine(machine) -{ - // The Debug menu bar - QAction* debugActOpenMemory = new QAction("New &Memory Window", this); - debugActOpenMemory->setShortcut(QKeySequence("Ctrl+M")); - connect(debugActOpenMemory, SIGNAL(triggered()), this, SLOT(debugActOpenMemory())); - - QAction* debugActOpenDasm = new QAction("New &Dasm Window", this); - debugActOpenDasm->setShortcut(QKeySequence("Ctrl+D")); - connect(debugActOpenDasm, SIGNAL(triggered()), this, SLOT(debugActOpenDasm())); - - QAction* debugActOpenLog = new QAction("New &Log Window", this); - debugActOpenLog->setShortcut(QKeySequence("Ctrl+L")); - connect(debugActOpenLog, SIGNAL(triggered()), this, SLOT(debugActOpenLog())); - - QAction* dbgActRun = new QAction("Run", this); - dbgActRun->setShortcut(Qt::Key_F5); - connect(dbgActRun, SIGNAL(triggered()), this, SLOT(debugActRun())); - - QAction* dbgActRunAndHide = new QAction("Run And Hide Debugger", this); - dbgActRunAndHide->setShortcut(Qt::Key_F12); - connect(dbgActRunAndHide, SIGNAL(triggered()), this, SLOT(debugActRunAndHide())); - - QAction* dbgActRunToNextCpu = new QAction("Run to Next CPU", this); - dbgActRunToNextCpu->setShortcut(Qt::Key_F6); - connect(dbgActRunToNextCpu, SIGNAL(triggered()), this, SLOT(debugActRunToNextCpu())); - - QAction* dbgActRunNextInt = new QAction("Run to Next Interrupt on This CPU", this); - dbgActRunNextInt->setShortcut(Qt::Key_F7); - connect(dbgActRunNextInt, SIGNAL(triggered()), this, SLOT(debugActRunNextInt())); - - QAction* dbgActRunNextVBlank = new QAction("Run to Next VBlank", this); - dbgActRunNextVBlank->setShortcut(Qt::Key_F8); - connect(dbgActRunNextVBlank, SIGNAL(triggered()), this, SLOT(debugActRunNextVBlank())); - - QAction* dbgActStepInto = new QAction("Step Into", this); - dbgActStepInto->setShortcut(Qt::Key_F11); - connect(dbgActStepInto, SIGNAL(triggered()), this, SLOT(debugActStepInto())); - - QAction* dbgActStepOver = new QAction("Step Over", this); - dbgActStepOver->setShortcut(Qt::Key_F10); - connect(dbgActStepOver, SIGNAL(triggered()), this, SLOT(debugActStepOver())); - - QAction* dbgActStepOut = new QAction("Step Out", this); - dbgActStepOut->setShortcut(QKeySequence("Shift+F11")); - connect(dbgActStepOut, SIGNAL(triggered()), this, SLOT(debugActStepOut())); - - QAction* dbgActSoftReset = new QAction("Soft Reset", this); - dbgActSoftReset->setShortcut(Qt::Key_F3); - connect(dbgActSoftReset, SIGNAL(triggered()), this, SLOT(debugActSoftReset())); - - QAction* dbgActHardReset = new QAction("Hard Reset", this); - dbgActHardReset->setShortcut(QKeySequence("Shift+F3")); - connect(dbgActHardReset, SIGNAL(triggered()), this, SLOT(debugActHardReset())); - - QAction* dbgActClose = new QAction("Close &Window", this); - dbgActClose->setShortcut(QKeySequence::Close); - connect(dbgActClose, SIGNAL(triggered()), this, SLOT(debugActClose())); - - QAction* dbgActQuit = new QAction("&Quit", this); - dbgActQuit->setShortcut(QKeySequence::Quit); - connect(dbgActQuit, SIGNAL(triggered()), this, SLOT(debugActQuit())); - - // Construct the menu - QMenu* debugMenu = menuBar()->addMenu("&Debug"); - debugMenu->addAction(debugActOpenMemory); - debugMenu->addAction(debugActOpenDasm); - debugMenu->addAction(debugActOpenLog); - debugMenu->addSeparator(); - debugMenu->addAction(dbgActRun); - debugMenu->addAction(dbgActRunToNextCpu); - debugMenu->addAction(dbgActRunNextInt); - debugMenu->addAction(dbgActRunNextVBlank); - debugMenu->addSeparator(); - debugMenu->addAction(dbgActStepInto); - debugMenu->addAction(dbgActStepOver); - debugMenu->addAction(dbgActStepOut); - debugMenu->addSeparator(); - debugMenu->addAction(dbgActSoftReset); - debugMenu->addAction(dbgActHardReset); - debugMenu->addSeparator(); - debugMenu->addAction(dbgActClose); - debugMenu->addAction(dbgActQuit); +WindowQt::WindowQt(running_machine* machine, QWidget* parent) : + QMainWindow(parent), + m_machine(machine) +{ + // The Debug menu bar + QAction* debugActOpenMemory = new QAction("New &Memory Window", this); + debugActOpenMemory->setShortcut(QKeySequence("Ctrl+M")); + connect(debugActOpenMemory, SIGNAL(triggered()), this, SLOT(debugActOpenMemory())); + + QAction* debugActOpenDasm = new QAction("New &Dasm Window", this); + debugActOpenDasm->setShortcut(QKeySequence("Ctrl+D")); + connect(debugActOpenDasm, SIGNAL(triggered()), this, SLOT(debugActOpenDasm())); + + QAction* debugActOpenLog = new QAction("New &Log Window", this); + debugActOpenLog->setShortcut(QKeySequence("Ctrl+L")); + connect(debugActOpenLog, SIGNAL(triggered()), this, SLOT(debugActOpenLog())); + + QAction* dbgActRun = new QAction("Run", this); + dbgActRun->setShortcut(Qt::Key_F5); + connect(dbgActRun, SIGNAL(triggered()), this, SLOT(debugActRun())); + + QAction* dbgActRunAndHide = new QAction("Run And Hide Debugger", this); + dbgActRunAndHide->setShortcut(Qt::Key_F12); + connect(dbgActRunAndHide, SIGNAL(triggered()), this, SLOT(debugActRunAndHide())); + + QAction* dbgActRunToNextCpu = new QAction("Run to Next CPU", this); + dbgActRunToNextCpu->setShortcut(Qt::Key_F6); + connect(dbgActRunToNextCpu, SIGNAL(triggered()), this, SLOT(debugActRunToNextCpu())); + + QAction* dbgActRunNextInt = new QAction("Run to Next Interrupt on This CPU", this); + dbgActRunNextInt->setShortcut(Qt::Key_F7); + connect(dbgActRunNextInt, SIGNAL(triggered()), this, SLOT(debugActRunNextInt())); + + QAction* dbgActRunNextVBlank = new QAction("Run to Next VBlank", this); + dbgActRunNextVBlank->setShortcut(Qt::Key_F8); + connect(dbgActRunNextVBlank, SIGNAL(triggered()), this, SLOT(debugActRunNextVBlank())); + + QAction* dbgActStepInto = new QAction("Step Into", this); + dbgActStepInto->setShortcut(Qt::Key_F11); + connect(dbgActStepInto, SIGNAL(triggered()), this, SLOT(debugActStepInto())); + + QAction* dbgActStepOver = new QAction("Step Over", this); + dbgActStepOver->setShortcut(Qt::Key_F10); + connect(dbgActStepOver, SIGNAL(triggered()), this, SLOT(debugActStepOver())); + + QAction* dbgActStepOut = new QAction("Step Out", this); + dbgActStepOut->setShortcut(QKeySequence("Shift+F11")); + connect(dbgActStepOut, SIGNAL(triggered()), this, SLOT(debugActStepOut())); + + QAction* dbgActSoftReset = new QAction("Soft Reset", this); + dbgActSoftReset->setShortcut(Qt::Key_F3); + connect(dbgActSoftReset, SIGNAL(triggered()), this, SLOT(debugActSoftReset())); + + QAction* dbgActHardReset = new QAction("Hard Reset", this); + dbgActHardReset->setShortcut(QKeySequence("Shift+F3")); + connect(dbgActHardReset, SIGNAL(triggered()), this, SLOT(debugActHardReset())); + + QAction* dbgActClose = new QAction("Close &Window", this); + dbgActClose->setShortcut(QKeySequence::Close); + connect(dbgActClose, SIGNAL(triggered()), this, SLOT(debugActClose())); + + QAction* dbgActQuit = new QAction("&Quit", this); + dbgActQuit->setShortcut(QKeySequence::Quit); + connect(dbgActQuit, SIGNAL(triggered()), this, SLOT(debugActQuit())); + + // Construct the menu + QMenu* debugMenu = menuBar()->addMenu("&Debug"); + debugMenu->addAction(debugActOpenMemory); + debugMenu->addAction(debugActOpenDasm); + debugMenu->addAction(debugActOpenLog); + debugMenu->addSeparator(); + debugMenu->addAction(dbgActRun); + debugMenu->addAction(dbgActRunToNextCpu); + debugMenu->addAction(dbgActRunNextInt); + debugMenu->addAction(dbgActRunNextVBlank); + debugMenu->addSeparator(); + debugMenu->addAction(dbgActStepInto); + debugMenu->addAction(dbgActStepOver); + debugMenu->addAction(dbgActStepOut); + debugMenu->addSeparator(); + debugMenu->addAction(dbgActSoftReset); + debugMenu->addAction(dbgActHardReset); + debugMenu->addSeparator(); + debugMenu->addAction(dbgActClose); + debugMenu->addAction(dbgActQuit); } void WindowQt::debugActOpenMemory() { - MemoryWindow* foo = new MemoryWindow(m_machine, this); - // A valiant effort, but it just doesn't wanna' hide behind the main window & not make a new toolbar icon - // foo->setWindowFlags(Qt::Dialog); - // foo->setWindowFlags(foo->windowFlags() & ~Qt::WindowStaysOnTopHint); - foo->show(); + MemoryWindow* foo = new MemoryWindow(m_machine, this); + // A valiant effort, but it just doesn't wanna' hide behind the main window & not make a new toolbar icon + // foo->setWindowFlags(Qt::Dialog); + // foo->setWindowFlags(foo->windowFlags() & ~Qt::WindowStaysOnTopHint); + foo->show(); } void WindowQt::debugActOpenDasm() { - DasmWindow* foo = new DasmWindow(m_machine, this); - // A valiant effort, but it just doesn't wanna' hide behind the main window & not make a new toolbar icon - // foo->setWindowFlags(Qt::Dialog); - // foo->setWindowFlags(foo->windowFlags() & ~Qt::WindowStaysOnTopHint); - foo->show(); + DasmWindow* foo = new DasmWindow(m_machine, this); + // A valiant effort, but it just doesn't wanna' hide behind the main window & not make a new toolbar icon + // foo->setWindowFlags(Qt::Dialog); + // foo->setWindowFlags(foo->windowFlags() & ~Qt::WindowStaysOnTopHint); + foo->show(); } void WindowQt::debugActOpenLog() { - LogWindow* foo = new LogWindow(m_machine, this); - // A valiant effort, but it just doesn't wanna' hide behind the main window & not make a new toolbar icon - // foo->setWindowFlags(Qt::Dialog); - // foo->setWindowFlags(foo->windowFlags() & ~Qt::WindowStaysOnTopHint); - foo->show(); + LogWindow* foo = new LogWindow(m_machine, this); + // A valiant effort, but it just doesn't wanna' hide behind the main window & not make a new toolbar icon + // foo->setWindowFlags(Qt::Dialog); + // foo->setWindowFlags(foo->windowFlags() & ~Qt::WindowStaysOnTopHint); + foo->show(); } void WindowQt::debugActRun() { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); + debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); } void WindowQt::debugActRunAndHide() { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); - // TODO: figure out hide + debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); + // TODO: figure out hide } void WindowQt::debugActRunToNextCpu() { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_next_device(); + debug_cpu_get_visible_cpu(*m_machine)->debug()->go_next_device(); } void WindowQt::debugActRunNextInt() { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_interrupt(); + debug_cpu_get_visible_cpu(*m_machine)->debug()->go_interrupt(); } void WindowQt::debugActRunNextVBlank() { - debug_cpu_get_visible_cpu(*m_machine)->debug()->go_vblank(); + debug_cpu_get_visible_cpu(*m_machine)->debug()->go_vblank(); } void WindowQt::debugActStepInto() { - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step(); + debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step(); } void WindowQt::debugActStepOver() { - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_over(); + debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_over(); } void WindowQt::debugActStepOut() { - debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_out(); + debug_cpu_get_visible_cpu(*m_machine)->debug()->single_step_out(); } void WindowQt::debugActSoftReset() { - m_machine->schedule_soft_reset(); + m_machine->schedule_soft_reset(); } void WindowQt::debugActHardReset() { - // TODO: Figure out segfault - m_machine->schedule_hard_reset(); - debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); + // TODO: Figure out segfault + m_machine->schedule_hard_reset(); + debug_cpu_get_visible_cpu(*m_machine)->debug()->go(); } void WindowQt::debugActClose() { - close(); + close(); } void WindowQt::debugActQuit() { - m_machine->schedule_exit(); - qApp->closeAllWindows(); + m_machine->schedule_exit(); + qApp->closeAllWindows(); } diff --git a/src/osd/sdl/debugqtwindow.h b/src/osd/sdl/debugqtwindow.h index bc687a41899..ba6c0919236 100644 --- a/src/osd/sdl/debugqtwindow.h +++ b/src/osd/sdl/debugqtwindow.h @@ -11,40 +11,40 @@ //============================================================ class WindowQt : public QMainWindow { - Q_OBJECT - + Q_OBJECT + public: - WindowQt(running_machine* machine, QWidget* parent=NULL); - virtual ~WindowQt() {} + WindowQt(running_machine* machine, QWidget* parent=NULL); + virtual ~WindowQt() {} - // The interface to an all-window refresh - void refreshAll() { s_refreshAll = true; } - bool wantsRefresh() { return s_refreshAll; } - void clearRefreshFlag() { s_refreshAll = false; } + // The interface to an all-window refresh + void refreshAll() { s_refreshAll = true; } + bool wantsRefresh() { return s_refreshAll; } + void clearRefreshFlag() { s_refreshAll = false; } protected slots: - void debugActOpenMemory(); - void debugActOpenDasm(); - void debugActOpenLog(); - void debugActRun(); - void debugActRunAndHide(); - void debugActRunToNextCpu(); - void debugActRunNextInt(); - void debugActRunNextVBlank(); - void debugActStepInto(); - void debugActStepOver(); - void debugActStepOut(); - void debugActSoftReset(); - void debugActHardReset(); - void debugActClose(); - void debugActQuit(); + void debugActOpenMemory(); + void debugActOpenDasm(); + void debugActOpenLog(); + void debugActRun(); + void debugActRunAndHide(); + void debugActRunToNextCpu(); + void debugActRunNextInt(); + void debugActRunNextVBlank(); + void debugActStepInto(); + void debugActStepOver(); + void debugActStepOut(); + void debugActSoftReset(); + void debugActHardReset(); + void debugActClose(); + void debugActQuit(); protected: - running_machine* m_machine; + running_machine* m_machine; - static bool s_refreshAll; + static bool s_refreshAll; }; diff --git a/src/osd/sdl/debugwin.c b/src/osd/sdl/debugwin.c index ef3193f9cba..e12743731c5 100644 --- a/src/osd/sdl/debugwin.c +++ b/src/osd/sdl/debugwin.c @@ -36,14 +36,14 @@ #define LOG(x) printf x #endif -#define MAX_VIEWS (4) +#define MAX_VIEWS (4) enum { - WIN_TYPE_MAIN = 0x01, - WIN_TYPE_MEMORY = 0x02, - WIN_TYPE_DISASM = 0x04, - WIN_TYPE_LOG = 0x08, - WIN_TYPE_ALL = 0x0f + WIN_TYPE_MAIN = 0x01, + WIN_TYPE_MEMORY = 0x02, + WIN_TYPE_DISASM = 0x04, + WIN_TYPE_LOG = 0x08, + WIN_TYPE_ALL = 0x0f }; //============================================================ @@ -68,39 +68,39 @@ struct edit { }; struct win_i { - int type; - win_i * next; - GtkWidget * win; - edit ed; - running_machine * machine; // machine - DView * views[MAX_VIEWS]; - device_t * cpu; // current CPU + int type; + win_i * next; + GtkWidget * win; + edit ed; + running_machine * machine; // machine + DView * views[MAX_VIEWS]; + device_t * cpu; // current CPU }; struct windowState { - windowState() : type(0), - sizeX(-1), sizeY(-1), - positionX(-1), positionY(-1) { } - ~windowState() { } + windowState() : type(0), + sizeX(-1), sizeY(-1), + positionX(-1), positionY(-1) { } + ~windowState() { } - void loadFromXmlDataNode(xml_data_node* wnode) - { - if (!wnode) return; + void loadFromXmlDataNode(xml_data_node* wnode) + { + if (!wnode) return; - type = xml_get_attribute_int(wnode, "type", type); + type = xml_get_attribute_int(wnode, "type", type); - sizeX = xml_get_attribute_int(wnode, "size_x", sizeX); - sizeY = xml_get_attribute_int(wnode, "size_y", sizeY); - positionX = xml_get_attribute_int(wnode, "position_x", positionX); - positionY = xml_get_attribute_int(wnode, "position_y", positionY); - } + sizeX = xml_get_attribute_int(wnode, "size_x", sizeX); + sizeY = xml_get_attribute_int(wnode, "size_y", sizeY); + positionX = xml_get_attribute_int(wnode, "position_x", positionX); + positionY = xml_get_attribute_int(wnode, "position_y", positionY); + } - int type; - int sizeX; - int sizeY; - int positionX; - int positionY; + int type; + int sizeX; + int sizeY; + int positionX; + int positionY; }; windowState windowStateArray[64]; int windowStateCount = 0; @@ -577,7 +577,7 @@ void sdl_osd_interface::wait_for_debugger(device_t &device, bool firststop) for (int i = 0; i < windowStateCount; i++) { if (!windowStateArray[i].type || windowStateArray[i].type == WIN_TYPE_MAIN) - continue; + continue; switch (windowStateArray[i].type) { @@ -655,7 +655,7 @@ static void debugmain_init(running_machine &machine) dmain = add_win_i(machine, WIN_TYPE_MAIN); dmain->win = create_debugmain(); - dmain->views[0] = DVIEW(lookup_widget(dmain->win, "console")); + dmain->views[0] = DVIEW(lookup_widget(dmain->win, "console")); dmain->views[1] = DVIEW(lookup_widget(dmain->win, "disasm")); dmain->views[2] = DVIEW(lookup_widget(dmain->win, "registers")); @@ -765,7 +765,7 @@ static void memorywin_new(running_machine &machine) win_i *mem; int item; //, cursel; device_t *curcpu = debug_cpu_get_visible_cpu(machine); - GtkComboBox * zone_w; + GtkComboBox * zone_w; mem = add_win_i(machine, WIN_TYPE_MEMORY); mem->win = create_memorywin(); @@ -860,7 +860,7 @@ static void disasmwin_new(running_machine &machine) win_i *dis; int item; //, cursel; device_t *curcpu = debug_cpu_get_visible_cpu(machine); - GtkComboBox *cpu_w; + GtkComboBox *cpu_w; astring title; dis = add_win_i(machine, WIN_TYPE_DISASM); @@ -1169,8 +1169,8 @@ on_set_breakpoint_at_cursor_activate(GtkWidget *win) gboolean on_disasm_button_press_event(GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) + GdkEventButton *event, + gpointer user_data) { DView *info = (DView *) widget; LOG(("gef %f %f %p %p\n", event->x, event->y, info, widget)); @@ -1191,16 +1191,16 @@ on_disasm_button_press_event(GtkWidget *widget, gboolean on_memoryview_button_press_event(GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) + GdkEventButton *event, + gpointer user_data) { return on_disasm_button_press_event(widget, event, user_data); } gboolean on_memoryview_key_press_event(GtkWidget *widget, - GdkEventKey *event, - gpointer user_data) + GdkEventKey *event, + gpointer user_data) { DView *info = (DView *) widget; //printf("%s\n", event->string); @@ -1281,7 +1281,7 @@ on_memoryview_key_press_event(GtkWidget *widget, #include "osdepend.h" #include "osdsdl.h" - // win32 stubs for linking + // win32 stubs for linking void sdl_osd_interface::init_debugger() { } diff --git a/src/osd/sdl/debugwin.h b/src/osd/sdl/debugwin.h index 689f5eed98e..9c02fa4a939 100644 --- a/src/osd/sdl/debugwin.h +++ b/src/osd/sdl/debugwin.h @@ -20,4 +20,3 @@ void debugwin_update_during_game(running_machine &machine); #endif - diff --git a/src/osd/sdl/draw13.c b/src/osd/sdl/draw13.c index 365a91ec856..4fc2d00a548 100644 --- a/src/osd/sdl/draw13.c +++ b/src/osd/sdl/draw13.c @@ -46,8 +46,8 @@ enum // MACROS //============================================================ -#define IS_OPAQUE(a) (a >= 1.0f) -#define IS_TRANSPARENT(a) (a < 0.0001f) +#define IS_OPAQUE(a) (a >= 1.0f) +#define IS_TRANSPARENT(a) (a < 0.0001f) #define MAX4(a, b, c, d) MAX(a, MAX(b, MAX(c, d))) #define MIN4(a, b, c, d) MIN(a, MIN(b, MIN(c, d))) @@ -60,9 +60,9 @@ enum struct quad_setup_data { - INT32 dudx, dvdx, dudy, dvdy; - INT32 startu, startv; - INT32 rotwidth, rotheight; + INT32 dudx, dvdx, dudy, dvdy; + INT32 startu, startv; + INT32 rotwidth, rotheight; }; struct texture_info; @@ -70,73 +70,73 @@ struct texture_info; typedef void (*texture_copy_func)(texture_info *texture, const render_texinfo *texsource); struct copy_info { - int src_fmt; - Uint32 dst_fmt; - int dst_bpp; - int rotate; - texture_copy_func func; - Uint32 bm_mask; - const char *srcname; - const char *dstname; + int src_fmt; + Uint32 dst_fmt; + int dst_bpp; + int rotate; + texture_copy_func func; + Uint32 bm_mask; + const char *srcname; + const char *dstname; /* Statistics */ - UINT64 pixel_count; - INT64 time; - int samples; - int perf; + UINT64 pixel_count; + INT64 time; + int samples; + int perf; /* list */ - copy_info *next; + copy_info *next; }; /* texture_info holds information about a texture */ struct texture_info { - texture_info * next; // next texture in the list + texture_info * next; // next texture in the list - HashT hash; // hash value for the texture (must be >= pointer size) - UINT32 flags; // rendering flags - render_texinfo texinfo; // copy of the texture info + HashT hash; // hash value for the texture (must be >= pointer size) + UINT32 flags; // rendering flags + render_texinfo texinfo; // copy of the texture info - int rawwidth, rawheight;// raw width/height of the texture + int rawwidth, rawheight;// raw width/height of the texture - int format; // texture format - void *pixels; // pixels for the texture - int pitch; - int pixels_own; // do we own / allocated it ? + int format; // texture format + void *pixels; // pixels for the texture + int pitch; + int pixels_own; // do we own / allocated it ? - SDL_Texture *texture_id; + SDL_Texture *texture_id; - copy_info *copyinfo; - Uint32 sdl_access; - SDL_BlendMode sdl_blendmode; - quad_setup_data setup; - int is_rotated; + copy_info *copyinfo; + Uint32 sdl_access; + SDL_BlendMode sdl_blendmode; + quad_setup_data setup; + int is_rotated; - osd_ticks_t last_access; + osd_ticks_t last_access; }; /* sdl_info is the information about SDL for the current screen */ struct sdl_info { - INT32 blittimer; - UINT32 extra_flags; + INT32 blittimer; + UINT32 extra_flags; - SDL_Renderer *sdl_renderer; - texture_info * texlist; // list of active textures - INT32 texture_max_width; // texture maximum width - INT32 texture_max_height; // texture maximum height + SDL_Renderer *sdl_renderer; + texture_info * texlist; // list of active textures + INT32 texture_max_width; // texture maximum width + INT32 texture_max_height; // texture maximum height - float last_hofs; - float last_vofs; + float last_hofs; + float last_vofs; // resize information - UINT8 resize_pending; - UINT32 resize_width; - UINT32 resize_height; + UINT8 resize_pending; + UINT32 resize_width; + UINT32 resize_height; // Stats - INT64 last_blit_time; - INT64 last_blit_pixels; + INT64 last_blit_time; + INT64 last_blit_pixels; }; //============================================================ @@ -189,78 +189,78 @@ static texture_info * texture_update(sdl_window_info *window, const render_primi static copy_info blit_info_default[] = { /* no rotation */ - ENTRY(ARGB32, ARGB8888, 4, 0, NULL), - ENTRY_LR(ARGB32, RGB888, 4, 0, argb32_rgb32), + ENTRY(ARGB32, ARGB8888, 4, 0, NULL), + ENTRY_LR(ARGB32, RGB888, 4, 0, argb32_rgb32), /* Entry for primarily for directfb */ - ENTRY_BM(ARGB32, RGB888, 4, 0, argb32_rgb32, SDL_BLENDMODE_ADD), - ENTRY_BM(ARGB32, RGB888, 4, 0, argb32_rgb32, SDL_BLENDMODE_MOD), - ENTRY_BM(ARGB32, RGB888, 4, 0, argb32_rgb32, SDL_BLENDMODE_NONE), + ENTRY_BM(ARGB32, RGB888, 4, 0, argb32_rgb32, SDL_BLENDMODE_ADD), + ENTRY_BM(ARGB32, RGB888, 4, 0, argb32_rgb32, SDL_BLENDMODE_MOD), + ENTRY_BM(ARGB32, RGB888, 4, 0, argb32_rgb32, SDL_BLENDMODE_NONE), - ENTRY(RGB32, ARGB8888, 4, 0, rgb32_argb32), - ENTRY(RGB32, RGB888, 4, 0, NULL), + ENTRY(RGB32, ARGB8888, 4, 0, rgb32_argb32), + ENTRY(RGB32, RGB888, 4, 0, NULL), - ENTRY(RGB32_PALETTED, ARGB8888, 4, 0, rgb32pal_argb32), - ENTRY(RGB32_PALETTED, RGB888, 4, 0, rgb32pal_argb32), + ENTRY(RGB32_PALETTED, ARGB8888, 4, 0, rgb32pal_argb32), + ENTRY(RGB32_PALETTED, RGB888, 4, 0, rgb32pal_argb32), - ENTRY(YUY16, UYVY, 2, 0, NULL /* yuv16_uyvy*/), - ENTRY(YUY16, YUY2, 2, 0, yuv16_yuy2), - ENTRY(YUY16, YVYU, 2, 0, yuv16_yvyu), - ENTRY(YUY16, ARGB8888, 4, 0, yuv16_argb32), - ENTRY(YUY16, RGB888, 4, 0, yuv16pal_argb32), + ENTRY(YUY16, UYVY, 2, 0, NULL /* yuv16_uyvy*/), + ENTRY(YUY16, YUY2, 2, 0, yuv16_yuy2), + ENTRY(YUY16, YVYU, 2, 0, yuv16_yvyu), + ENTRY(YUY16, ARGB8888, 4, 0, yuv16_argb32), + ENTRY(YUY16, RGB888, 4, 0, yuv16pal_argb32), - ENTRY(YUY16_PALETTED, UYVY, 2, 0, yuv16pal_uyvy), - ENTRY(YUY16_PALETTED, YUY2, 2, 0, yuv16pal_yuy2), - ENTRY(YUY16_PALETTED, YVYU, 2, 0, yuv16pal_yvyu), - ENTRY(YUY16_PALETTED, ARGB8888, 4, 0, yuv16pal_argb32), - ENTRY(YUY16_PALETTED, RGB888, 4, 0, yuv16pal_argb32), + ENTRY(YUY16_PALETTED, UYVY, 2, 0, yuv16pal_uyvy), + ENTRY(YUY16_PALETTED, YUY2, 2, 0, yuv16pal_yuy2), + ENTRY(YUY16_PALETTED, YVYU, 2, 0, yuv16pal_yvyu), + ENTRY(YUY16_PALETTED, ARGB8888, 4, 0, yuv16pal_argb32), + ENTRY(YUY16_PALETTED, RGB888, 4, 0, yuv16pal_argb32), - ENTRY(PALETTE16, ARGB8888, 4, 0, pal16_argb32), - ENTRY(PALETTE16, RGB888, 4, 0, pal16_argb32), + ENTRY(PALETTE16, ARGB8888, 4, 0, pal16_argb32), + ENTRY(PALETTE16, RGB888, 4, 0, pal16_argb32), - ENTRY(RGB15, RGB555, 2, 0, NULL /* rgb15_argb1555 */), - ENTRY(RGB15, ARGB1555, 2, 0, rgb15_argb1555), - ENTRY(RGB15, ARGB8888, 4, 0, rgb15_argb32), - ENTRY(RGB15, RGB888, 4, 0, rgb15_argb32), + ENTRY(RGB15, RGB555, 2, 0, NULL /* rgb15_argb1555 */), + ENTRY(RGB15, ARGB1555, 2, 0, rgb15_argb1555), + ENTRY(RGB15, ARGB8888, 4, 0, rgb15_argb32), + ENTRY(RGB15, RGB888, 4, 0, rgb15_argb32), - ENTRY(RGB15_PALETTED, ARGB8888, 4, 0, rgb15pal_argb32), - ENTRY(RGB15_PALETTED, RGB888, 4, 0, rgb15pal_argb32), + ENTRY(RGB15_PALETTED, ARGB8888, 4, 0, rgb15pal_argb32), + ENTRY(RGB15_PALETTED, RGB888, 4, 0, rgb15pal_argb32), - ENTRY(PALETTE16A, ARGB8888, 4, 0, pal16a_argb32), - ENTRY(PALETTE16A, RGB888, 4, 0, pal16a_rgb32), + ENTRY(PALETTE16A, ARGB8888, 4, 0, pal16a_argb32), + ENTRY(PALETTE16A, RGB888, 4, 0, pal16a_rgb32), /* rotation */ - ENTRY(ARGB32, ARGB8888, 4, 1, rot_argb32_argb32), - ENTRY_LR(ARGB32, RGB888, 4, 1, rot_argb32_rgb32), + ENTRY(ARGB32, ARGB8888, 4, 1, rot_argb32_argb32), + ENTRY_LR(ARGB32, RGB888, 4, 1, rot_argb32_rgb32), /* Entry for primarily for directfb */ - ENTRY_BM(ARGB32, RGB888, 4, 1, rot_argb32_rgb32, SDL_BLENDMODE_ADD), - ENTRY_BM(ARGB32, RGB888, 4, 1, rot_argb32_rgb32, SDL_BLENDMODE_MOD), - ENTRY_BM(ARGB32, RGB888, 4, 1, rot_argb32_rgb32, SDL_BLENDMODE_NONE), + ENTRY_BM(ARGB32, RGB888, 4, 1, rot_argb32_rgb32, SDL_BLENDMODE_ADD), + ENTRY_BM(ARGB32, RGB888, 4, 1, rot_argb32_rgb32, SDL_BLENDMODE_MOD), + ENTRY_BM(ARGB32, RGB888, 4, 1, rot_argb32_rgb32, SDL_BLENDMODE_NONE), - ENTRY(RGB32, ARGB8888, 4, 1, rot_rgb32_argb32), - ENTRY(RGB32, RGB888, 4, 1, rot_argb32_argb32), + ENTRY(RGB32, ARGB8888, 4, 1, rot_rgb32_argb32), + ENTRY(RGB32, RGB888, 4, 1, rot_argb32_argb32), - ENTRY(RGB32_PALETTED, ARGB8888, 4, 1, rot_rgb32pal_argb32), - ENTRY(RGB32_PALETTED, RGB888, 4, 1, rot_rgb32pal_argb32), + ENTRY(RGB32_PALETTED, ARGB8888, 4, 1, rot_rgb32pal_argb32), + ENTRY(RGB32_PALETTED, RGB888, 4, 1, rot_rgb32pal_argb32), - ENTRY(YUY16, ARGB8888, 4, 1, rot_yuv16_argb32), - ENTRY(YUY16, RGB888, 4, 1, rot_yuv16_argb32), + ENTRY(YUY16, ARGB8888, 4, 1, rot_yuv16_argb32), + ENTRY(YUY16, RGB888, 4, 1, rot_yuv16_argb32), - ENTRY(YUY16_PALETTED, ARGB8888, 4, 1, rot_yuv16pal_argb32), - ENTRY(YUY16_PALETTED, RGB888, 4, 1, rot_yuv16pal_argb32), + ENTRY(YUY16_PALETTED, ARGB8888, 4, 1, rot_yuv16pal_argb32), + ENTRY(YUY16_PALETTED, RGB888, 4, 1, rot_yuv16pal_argb32), - ENTRY(PALETTE16, ARGB8888, 4, 1, rot_pal16_argb32), - ENTRY(PALETTE16, RGB888, 4, 1, rot_pal16_argb32), + ENTRY(PALETTE16, ARGB8888, 4, 1, rot_pal16_argb32), + ENTRY(PALETTE16, RGB888, 4, 1, rot_pal16_argb32), - ENTRY(RGB15, RGB555, 2, 1, rot_rgb15_argb1555), - ENTRY(RGB15, ARGB1555, 2, 1, rot_rgb15_argb1555), - ENTRY(RGB15, ARGB8888, 4, 1, rot_rgb15_argb32), - ENTRY(RGB15, RGB888, 4, 1, rot_rgb15_argb32), + ENTRY(RGB15, RGB555, 2, 1, rot_rgb15_argb1555), + ENTRY(RGB15, ARGB1555, 2, 1, rot_rgb15_argb1555), + ENTRY(RGB15, ARGB8888, 4, 1, rot_rgb15_argb32), + ENTRY(RGB15, RGB888, 4, 1, rot_rgb15_argb32), - ENTRY(RGB15_PALETTED, ARGB8888, 4, 1, rot_rgb15pal_argb32), - ENTRY(RGB15_PALETTED, RGB888, 4, 1, rot_rgb15pal_argb32), + ENTRY(RGB15_PALETTED, ARGB8888, 4, 1, rot_rgb15pal_argb32), + ENTRY(RGB15_PALETTED, RGB888, 4, 1, rot_rgb15pal_argb32), - ENTRY(PALETTE16A, ARGB8888, 4, 1, rot_pal16a_argb32), - ENTRY(PALETTE16A, RGB888, 4, 1, rot_pal16a_rgb32), + ENTRY(PALETTE16A, ARGB8888, 4, 1, rot_pal16a_argb32), + ENTRY(PALETTE16A, RGB888, 4, 1, rot_pal16a_rgb32), { -1 }, }; @@ -268,18 +268,18 @@ static copy_info blit_info_default[] = static copy_info blit_info_16bpp[] = { /* no rotation */ - ENTRY(PALETTE16, RGB555, 2, 0, pal16_argb1555), - ENTRY(PALETTE16, ARGB1555, 2, 0, pal16_argb1555), + ENTRY(PALETTE16, RGB555, 2, 0, pal16_argb1555), + ENTRY(PALETTE16, ARGB1555, 2, 0, pal16_argb1555), - ENTRY(RGB15_PALETTED, RGB555, 2, 0, rgb15pal_argb1555), - ENTRY(RGB15_PALETTED, ARGB1555, 2, 0, rgb15pal_argb1555), + ENTRY(RGB15_PALETTED, RGB555, 2, 0, rgb15pal_argb1555), + ENTRY(RGB15_PALETTED, ARGB1555, 2, 0, rgb15pal_argb1555), /* rotation */ - ENTRY(PALETTE16, RGB555, 2, 1, rot_pal16_argb1555), - ENTRY(PALETTE16, ARGB1555, 2, 1, rot_pal16_argb1555), + ENTRY(PALETTE16, RGB555, 2, 1, rot_pal16_argb1555), + ENTRY(PALETTE16, ARGB1555, 2, 1, rot_pal16_argb1555), - ENTRY(RGB15_PALETTED, RGB555, 2, 1, rot_rgb15pal_argb1555), - ENTRY(RGB15_PALETTED, ARGB1555, 2, 1, rot_rgb15pal_argb1555), + ENTRY(RGB15_PALETTED, RGB555, 2, 1, rot_rgb15pal_argb1555), + ENTRY(RGB15_PALETTED, ARGB1555, 2, 1, rot_rgb15pal_argb1555), { -1 }, }; @@ -288,8 +288,8 @@ static copy_info *blit_info[SDL_TEXFORMAT_LAST+1]; static struct { - Uint32 format; - int status; + Uint32 format; + int status; } fmt_support[30] = { { 0, 0 } }; @@ -326,7 +326,7 @@ INLINE SDL_BlendMode map_blendmode(int blendmode) return SDL_BLENDMODE_NONE; } -INLINE void set_coloralphamode(SDL_Texture *texture_id, const render_color *color) +INLINE void set_coloralphamode(SDL_Texture *texture_id, const render_color *color) { UINT32 sr = (UINT32)(255.0f * color->r); UINT32 sg = (UINT32)(255.0f * color->g); @@ -360,7 +360,7 @@ INLINE void set_coloralphamode(SDL_Texture *texture_id, const render_color *colo INLINE void render_quad(sdl_info *sdl, texture_info *texture, render_primitive *prim, int x, int y) { - SDL_Texture *texture_id; + SDL_Texture *texture_id; SDL_Rect target_rect; target_rect.x = x; @@ -412,10 +412,10 @@ INLINE void render_quad(sdl_info *sdl, texture_info *texture, render_primitive * #if 0 static int RendererSupportsFormat(Uint32 format, Uint32 access, const char *sformat) { - struct SDL_RendererInfo render_info; + struct SDL_RendererInfo render_info; int i; - SDL_GetRendererInfo(&render_info); + SDL_GetRendererInfo(&render_info); for (i=0; i < render_info.num_texture_formats; i++) { @@ -470,7 +470,7 @@ static void add_list(copy_info **head, copy_info *element, Uint32 bm) static void expand_copy_info(copy_info *list) { - copy_info *bi; + copy_info *bi; for (bi = list; bi->src_fmt != -1; bi++) { @@ -605,10 +605,10 @@ static int draw13_window_create(sdl_window_info *window, int width, int height) mame_printf_warning("Ignoring depth %d\n", window->depth); } } - SDL_SetWindowDisplayMode(window->sdl_window, &mode); // Try to set mode + SDL_SetWindowDisplayMode(window->sdl_window, &mode); // Try to set mode } else - SDL_SetWindowDisplayMode(window->sdl_window, NULL); // Use desktop + SDL_SetWindowDisplayMode(window->sdl_window, NULL); // Use desktop // create renderer @@ -622,7 +622,7 @@ static int draw13_window_create(sdl_window_info *window, int width, int height) fatalerror("Error on creating renderer: %s\n", SDL_GetError()); } - //SDL_SelectRenderer(window->sdl_window); + //SDL_SelectRenderer(window->sdl_window); SDL_ShowWindow(window->sdl_window); //SDL_SetWindowFullscreen(window->window_id, window->fullscreen); @@ -713,7 +713,7 @@ static int draw13_window_draw(sdl_window_info *window, UINT32 dc, int update) return 0; } - if (sdl->resize_pending) + if (sdl->resize_pending) { SDL_SetWindowSize(window->sdl_window, sdl->resize_width, sdl->resize_height); SDL_GetWindowSize(window->sdl_window, &window->width, &window->height); @@ -721,7 +721,7 @@ static int draw13_window_draw(sdl_window_info *window, UINT32 dc, int update) SDL_RenderSetViewport(sdl->sdl_renderer, NULL); } - //SDL_SelectRenderer(window->sdl_window); + //SDL_SelectRenderer(window->sdl_window); if (sdl->blittimer > 0) { @@ -916,7 +916,7 @@ static texture_info *texture_create(sdl_window_info *window, const render_texinf texture->format = SDL_TEXFORMAT_ARGB32; break; case TEXFORMAT_RGB32: - texture->format = texsource->palette ? SDL_TEXFORMAT_RGB32_PALETTED : SDL_TEXFORMAT_RGB32; + texture->format = texsource->palette ? SDL_TEXFORMAT_RGB32_PALETTED : SDL_TEXFORMAT_RGB32; break; case TEXFORMAT_PALETTE16: texture->format = SDL_TEXFORMAT_PALETTE16; @@ -960,8 +960,8 @@ static texture_info *texture_create(sdl_window_info *window, const render_texinf if ( (texture->copyinfo->func != NULL) && (texture->sdl_access == SDL_TEXTUREACCESS_STATIC)) { texture->pixels = osd_malloc_array(texture->setup.rotwidth * texture->setup.rotheight * texture->copyinfo->dst_bpp); - texture->pixels_own=TRUE; - } + texture->pixels_own=TRUE; + } /* add us to the texture list */ texture->next = sdl->texlist; sdl->texlist = texture; @@ -981,10 +981,10 @@ static void texture_set_data(sdl_info *sdl, texture_info *texture, const render_ if (texture->sdl_access == SDL_TEXTUREACCESS_STATIC) { if ( texture->copyinfo->func ) - { + { texture->pitch = texture->setup.rotwidth * texture->copyinfo->dst_bpp; texture->copyinfo->func(texture, texsource); - } + } else { texture->pixels = texsource->base; @@ -1130,11 +1130,11 @@ static texture_info * texture_update(sdl_window_info *window, const render_primi // if we didn't find one, create a new texture if (texture == NULL && prim->texture.base != NULL) - { - texture = texture_create(window, &prim->texture, &setup, prim->flags); - } + { + texture = texture_create(window, &prim->texture, &setup, prim->flags); + } - if (texture != NULL) + if (texture != NULL) { if (prim->texture.base != NULL && texture->texinfo.seqid != prim->texture.seqid) { @@ -1144,7 +1144,7 @@ static texture_info * texture_update(sdl_window_info *window, const render_primi } } - return texture; + return texture; } static void draw13_destroy_texture(sdl_info *sdl, texture_info *texture) @@ -1163,7 +1163,7 @@ static void draw13_destroy_texture(sdl_info *sdl, texture_info *texture) if (p->next == texture) break; if (p == NULL) - sdl->texlist = NULL; + sdl->texlist = NULL; else p->next = texture->next; osd_free(texture); diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c index 734c2b0b8ff..997e7438b2a 100644 --- a/src/osd/sdl/drawogl.c +++ b/src/osd/sdl/drawogl.c @@ -101,27 +101,27 @@ typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuin #endif #ifndef GL_FRAMEBUFFER_EXT -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 +#define GL_FRAMEBUFFER_EXT 0x8D40 +#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 +#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 +#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 +#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8 +#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 +#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA +#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB +#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC +#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD +#define GL_RENDERBUFFER_EXT 0x8D41 +#define GL_DEPTH_COMPONENT16 0x81A5 +#define GL_DEPTH_COMPONENT24 0x81A6 +#define GL_DEPTH_COMPONENT32 0x81A7 #endif //#define OLD_CODE 1 #ifndef OLD_CODE -#define HASH_SIZE ((1<<10)+1) -#define OVERFLOW_SIZE (1<<10) +#define HASH_SIZE ((1<<10)+1) +#define OVERFLOW_SIZE (1<<10) #endif // OSD headers @@ -132,8 +132,8 @@ typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuin // DEBUGGING //============================================================ -#define DEBUG_MODE_SCORES 0 -#define USE_WIN32_STYLE_LINES 0 // use the same method baseline does - yields somewhat nicer vectors but a little buggy +#define DEBUG_MODE_SCORES 0 +#define USE_WIN32_STYLE_LINES 0 // use the same method baseline does - yields somewhat nicer vectors but a little buggy //============================================================ // CONSTANTS @@ -170,108 +170,108 @@ typedef void (*texture_copy_func)(texture_info *texture, const render_texinfo *t struct texture_info { #ifdef OLD_CODE - texture_info * next; // next texture in the list + texture_info * next; // next texture in the list #endif - HashT hash; // hash value for the texture (must be >= pointer size) - UINT32 flags; // rendering flags - render_texinfo texinfo; // copy of the texture info - int rawwidth, rawheight; // raw width/height of the texture - int rawwidth_create; // raw width/height, pow2 compatible, if needed - int rawheight_create; // (create and initial set the texture, not for copy!) - int type; // what type of texture are we? - int format; // texture format - int borderpix; // do we have a 1 pixel border? - int xprescale; // what is our X prescale factor? - int yprescale; // what is our Y prescale factor? - int nocopy; // must the texture date be copied? - - UINT32 texture; // OpenGL texture "name"/ID - - const GLint * texProperties; // texture properties - texture_copy_func texCopyFn; // texture copy function, !=NULL if !nocopy - GLenum texTarget; // OpenGL texture target - int texpow2; // Is this texture pow2 - - UINT32 mpass_dest_idx; // Multipass dest idx [0..1] - UINT32 mpass_textureunit[2]; // texture unit names for GLSL - - UINT32 mpass_texture_mamebm[2];// Multipass OpenGL texture "name"/ID for the shader - UINT32 mpass_fbo_mamebm[2]; // framebuffer object for this texture, multipass - UINT32 mpass_texture_scrn[2]; // Multipass OpenGL texture "name"/ID for the shader - UINT32 mpass_fbo_scrn[2]; // framebuffer object for this texture, multipass - - UINT32 lut_texture; // LUT OpenGL texture "name"/ID for the shader - int lut_table_width; // LUT table width - int lut_table_height; // LUT table height - - UINT32 pbo; // pixel buffer object for this texture (DYNAMIC only!) - UINT32 *data; // pixels for the texture - int data_own; // do we own / allocated it ? - GLfloat texCoord[8]; - GLuint texCoordBufferName; + HashT hash; // hash value for the texture (must be >= pointer size) + UINT32 flags; // rendering flags + render_texinfo texinfo; // copy of the texture info + int rawwidth, rawheight; // raw width/height of the texture + int rawwidth_create; // raw width/height, pow2 compatible, if needed + int rawheight_create; // (create and initial set the texture, not for copy!) + int type; // what type of texture are we? + int format; // texture format + int borderpix; // do we have a 1 pixel border? + int xprescale; // what is our X prescale factor? + int yprescale; // what is our Y prescale factor? + int nocopy; // must the texture date be copied? + + UINT32 texture; // OpenGL texture "name"/ID + + const GLint * texProperties; // texture properties + texture_copy_func texCopyFn; // texture copy function, !=NULL if !nocopy + GLenum texTarget; // OpenGL texture target + int texpow2; // Is this texture pow2 + + UINT32 mpass_dest_idx; // Multipass dest idx [0..1] + UINT32 mpass_textureunit[2]; // texture unit names for GLSL + + UINT32 mpass_texture_mamebm[2];// Multipass OpenGL texture "name"/ID for the shader + UINT32 mpass_fbo_mamebm[2]; // framebuffer object for this texture, multipass + UINT32 mpass_texture_scrn[2]; // Multipass OpenGL texture "name"/ID for the shader + UINT32 mpass_fbo_scrn[2]; // framebuffer object for this texture, multipass + + UINT32 lut_texture; // LUT OpenGL texture "name"/ID for the shader + int lut_table_width; // LUT table width + int lut_table_height; // LUT table height + + UINT32 pbo; // pixel buffer object for this texture (DYNAMIC only!) + UINT32 *data; // pixels for the texture + int data_own; // do we own / allocated it ? + GLfloat texCoord[8]; + GLuint texCoordBufferName; }; /* sdl_info is the information about SDL for the current screen */ struct sdl_info { - INT32 blittimer; - UINT32 extra_flags; + INT32 blittimer; + UINT32 extra_flags; #if (SDLMAME_SDL2) - SDL_GLContext gl_context_id; + SDL_GLContext gl_context_id; #else // SDL surface - SDL_Surface *sdlsurf; + SDL_Surface *sdlsurf; #endif - int initialized; // is everything well initialized, i.e. all GL stuff etc. + int initialized; // is everything well initialized, i.e. all GL stuff etc. // 3D info (GL mode only) #ifdef OLD_CODE - texture_info * texlist; // list of active textures + texture_info * texlist; // list of active textures #else - texture_info * texhash[HASH_SIZE + OVERFLOW_SIZE]; + texture_info * texhash[HASH_SIZE + OVERFLOW_SIZE]; #endif - int last_blendmode; // previous blendmode - INT32 texture_max_width; // texture maximum width - INT32 texture_max_height; // texture maximum height - int texpoweroftwo; // must textures be power-of-2 sized? - int usevbo; // runtime check if VBO is available - int usepbo; // runtime check if PBO is available - int usefbo; // runtime check if FBO is available - int useglsl; // runtime check if GLSL is available - - glsl_shader_info *glsl; // glsl_shader_info - - GLhandleARB glsl_program[2*GLSL_SHADER_MAX]; // GLSL programs, or 0 - int glsl_program_num; // number of GLSL programs - int glsl_program_mb2sc; // GLSL program idx, which transforms - // the mame-bitmap. screen-bitmap (size/rotation/..) + int last_blendmode; // previous blendmode + INT32 texture_max_width; // texture maximum width + INT32 texture_max_height; // texture maximum height + int texpoweroftwo; // must textures be power-of-2 sized? + int usevbo; // runtime check if VBO is available + int usepbo; // runtime check if PBO is available + int usefbo; // runtime check if FBO is available + int useglsl; // runtime check if GLSL is available + + glsl_shader_info *glsl; // glsl_shader_info + + GLhandleARB glsl_program[2*GLSL_SHADER_MAX]; // GLSL programs, or 0 + int glsl_program_num; // number of GLSL programs + int glsl_program_mb2sc; // GLSL program idx, which transforms + // the mame-bitmap. screen-bitmap (size/rotation/..) // All progs <= glsl_program_mb2sc using the mame bitmap // as input, otherwise the screen bitmap. // All progs >= glsl_program_mb2sc using the screen bitmap // as output, otherwise the mame bitmap. - int glsl_vid_attributes;// glsl brightness, contrast and gamma for RGB bitmaps - int usetexturerect; // use ARB_texture_rectangle for non-power-of-2, general use + int glsl_vid_attributes;// glsl brightness, contrast and gamma for RGB bitmaps + int usetexturerect; // use ARB_texture_rectangle for non-power-of-2, general use - int init_context; // initialize context before next draw + int init_context; // initialize context before next draw - int totalColors; // total colors from machine/sdl_window_config/sdl_window_info + int totalColors; // total colors from machine/sdl_window_config/sdl_window_info - float last_hofs; - float last_vofs; + float last_hofs; + float last_vofs; // Static vars from draogl_window_dra - INT32 surf_w; - INT32 surf_h; - GLfloat texVerticex[8]; + INT32 surf_w; + INT32 surf_h; + GLfloat texVerticex[8]; }; /* line_aa_step is used for drawing antialiased lines */ struct line_aa_step { - float xoffs, yoffs; // X/Y deltas - float weight; // weight contribution + float xoffs, yoffs; // X/Y deltas + float weight; // weight contribution }; static const line_aa_step line_aa_1step[] = @@ -357,29 +357,29 @@ static void load_gl_lib(running_machine &machine); // OGL 1.3 #ifdef GL_ARB_multitexture -static PFNGLACTIVETEXTUREARBPROC pfn_glActiveTexture = NULL; +static PFNGLACTIVETEXTUREARBPROC pfn_glActiveTexture = NULL; #else -static PFNGLACTIVETEXTUREPROC pfn_glActiveTexture = NULL; +static PFNGLACTIVETEXTUREPROC pfn_glActiveTexture = NULL; #endif // VBO -static PFNGLGENBUFFERSPROC pfn_glGenBuffers = NULL; -static PFNGLDELETEBUFFERSPROC pfn_glDeleteBuffers = NULL; -static PFNGLBINDBUFFERPROC pfn_glBindBuffer = NULL; -static PFNGLBUFFERDATAPROC pfn_glBufferData = NULL; -static PFNGLBUFFERSUBDATAPROC pfn_glBufferSubData = NULL; +static PFNGLGENBUFFERSPROC pfn_glGenBuffers = NULL; +static PFNGLDELETEBUFFERSPROC pfn_glDeleteBuffers = NULL; +static PFNGLBINDBUFFERPROC pfn_glBindBuffer = NULL; +static PFNGLBUFFERDATAPROC pfn_glBufferData = NULL; +static PFNGLBUFFERSUBDATAPROC pfn_glBufferSubData = NULL; // PBO -static PFNGLMAPBUFFERPROC pfn_glMapBuffer = NULL; -static PFNGLUNMAPBUFFERPROC pfn_glUnmapBuffer = NULL; +static PFNGLMAPBUFFERPROC pfn_glMapBuffer = NULL; +static PFNGLUNMAPBUFFERPROC pfn_glUnmapBuffer = NULL; // FBO -static PFNGLISFRAMEBUFFEREXTPROC pfn_glIsFramebuffer = NULL; -static PFNGLBINDFRAMEBUFFEREXTPROC pfn_glBindFramebuffer = NULL; -static PFNGLDELETEFRAMEBUFFERSEXTPROC pfn_glDeleteFramebuffers = NULL; -static PFNGLGENFRAMEBUFFERSEXTPROC pfn_glGenFramebuffers = NULL; -static PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC pfn_glCheckFramebufferStatus = NULL; -static PFNGLFRAMEBUFFERTEXTURE2DEXTPROC pfn_glFramebufferTexture2D = NULL; +static PFNGLISFRAMEBUFFEREXTPROC pfn_glIsFramebuffer = NULL; +static PFNGLBINDFRAMEBUFFEREXTPROC pfn_glBindFramebuffer = NULL; +static PFNGLDELETEFRAMEBUFFERSEXTPROC pfn_glDeleteFramebuffers = NULL; +static PFNGLGENFRAMEBUFFERSEXTPROC pfn_glGenFramebuffers = NULL; +static PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC pfn_glCheckFramebufferStatus = NULL; +static PFNGLFRAMEBUFFERTEXTURE2DEXTPROC pfn_glFramebufferTexture2D = NULL; static int glsl_shader_feature = GLSL_SHADER_FEAT_PLAIN; @@ -476,8 +476,8 @@ static void loadgl_functions(void) int err_count = 0; /* the following is tricky ... #func will be expanded to glBegin - * while func will be expanded to disp_p->glBegin - */ + * while func will be expanded to disp_p->glBegin + */ #define OSD_GL(ret,func,params) \ if (!( func = (ret (APIENTRY *)params) SDL_GL_GetProcAddress( #func ) )) \ @@ -505,9 +505,9 @@ static void load_gl_lib(running_machine &machine) if (!dll_loaded) { /* - * directfb and and x11 use this env var - * SDL_VIDEO_GL_DRIVER - */ + * directfb and and x11 use this env var + * SDL_VIDEO_GL_DRIVER + */ const char *stemp; stemp = downcast<sdl_options &>(machine.options()).gl_lib(); @@ -518,10 +518,10 @@ static void load_gl_lib(running_machine &machine) { fatalerror("Unable to load opengl library: %s\n", stemp ? stemp : "<default>"); } - mame_printf_verbose("Loaded opengl shared library: %s\n", stemp ? stemp : "<default>"); - /* FIXME: must be freed as well */ - gl_dispatch = (osd_gl_dispatch *) osd_malloc(sizeof(osd_gl_dispatch)); - dll_loaded=1; + mame_printf_verbose("Loaded opengl shared library: %s\n", stemp ? stemp : "<default>"); + /* FIXME: must be freed as well */ + gl_dispatch = (osd_gl_dispatch *) osd_malloc(sizeof(osd_gl_dispatch)); + dll_loaded=1; } #endif } @@ -570,10 +570,10 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height) mode.h = height; if (window->refresh) mode.refresh_rate = window->refresh; - SDL_SetWindowDisplayMode(window->sdl_window, &mode); // Try to set mode + SDL_SetWindowDisplayMode(window->sdl_window, &mode); // Try to set mode } else - SDL_SetWindowDisplayMode(window->sdl_window, NULL); // Use desktop + SDL_SetWindowDisplayMode(window->sdl_window, NULL); // Use desktop SDL_ShowWindow(window->sdl_window); //SDL_SetWindowFullscreen(window->sdl_window, window->fullscreen); @@ -602,7 +602,7 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height) // create the SDL surface (which creates the window in windowed mode) sdl->sdlsurf = SDL_SetVideoMode(width, height, - 0, SDL_SWSURFACE | SDL_ANYFORMAT | sdl->extra_flags); + 0, SDL_SWSURFACE | SDL_ANYFORMAT | sdl->extra_flags); if (!sdl->sdlsurf) return 1; @@ -633,8 +633,8 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height) sdl->texture_max_height = 64; /* load any GL function addresses - * this must be done here because we need a context - */ + * this must be done here because we need a context + */ loadgl_functions(); extstr = (char *)glGetString(GL_EXTENSIONS); @@ -654,14 +654,14 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height) sdl->useglsl = 0; if ( video_config.allowtexturerect && - ( strstr(extstr, "GL_ARB_texture_rectangle") || strstr(extstr, "GL_EXT_texture_rectangle") ) - ) + ( strstr(extstr, "GL_ARB_texture_rectangle") || strstr(extstr, "GL_EXT_texture_rectangle") ) + ) { has_and_allow_texturerect = 1; - if (!shown_video_info) - { - mame_printf_verbose("OpenGL: texture rectangle supported\n"); - } + if (!shown_video_info) + { + mame_printf_verbose("OpenGL: texture rectangle supported\n"); + } } // does this card support non-power-of-two sized textures? (they're faster, so use them if possible) @@ -671,7 +671,7 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height) { mame_printf_verbose("OpenGL: non-power-of-2 textures supported (new method)\n"); } - sdl->texpoweroftwo = 0; + sdl->texpoweroftwo = 0; } else { @@ -695,7 +695,7 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height) if (strstr(extstr, "GL_ARB_vertex_buffer_object")) { - sdl->usevbo = video_config.vbo; + sdl->usevbo = video_config.vbo; if (!shown_video_info) { if(sdl->usevbo) @@ -734,7 +734,7 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height) if (strstr(extstr, "GL_EXT_framebuffer_object")) { - sdl->usefbo = 1; + sdl->usefbo = 1; if (!shown_video_info) { if(sdl->usefbo) @@ -745,10 +745,10 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height) } if (strstr(extstr, "GL_ARB_shader_objects") && - strstr(extstr, "GL_ARB_shading_language_100") && - strstr(extstr, "GL_ARB_vertex_shader") && - strstr(extstr, "GL_ARB_fragment_shader") - ) + strstr(extstr, "GL_ARB_shading_language_100") && + strstr(extstr, "GL_ARB_vertex_shader") && + strstr(extstr, "GL_ARB_fragment_shader") + ) { sdl->useglsl = video_config.glsl; if (!shown_video_info) @@ -907,9 +907,9 @@ static void loadGLExtensions(sdl_window_info *window) } if ( sdl->usevbo && - ( !pfn_glGenBuffers || !pfn_glDeleteBuffers || - !pfn_glBindBuffer || !pfn_glBufferData || !pfn_glBufferSubData - ) ) + ( !pfn_glGenBuffers || !pfn_glDeleteBuffers || + !pfn_glBindBuffer || !pfn_glBufferData || !pfn_glBufferSubData + ) ) { sdl->usepbo=FALSE; if (_once) @@ -967,8 +967,8 @@ static void loadGLExtensions(sdl_window_info *window) if ( sdl->usefbo && ( !pfn_glIsFramebuffer || !pfn_glBindFramebuffer || !pfn_glDeleteFramebuffers || - !pfn_glGenFramebuffers || !pfn_glCheckFramebufferStatus || !pfn_glFramebufferTexture2D - )) + !pfn_glGenFramebuffers || !pfn_glCheckFramebufferStatus || !pfn_glFramebufferTexture2D + )) { sdl->usefbo=FALSE; if (_once) @@ -1118,7 +1118,7 @@ static void loadGLExtensions(sdl_window_info *window) for(i=0; sdl->usefbo && sdl->glsl_program_num>0 && i<video_config.glsl_shader_scrn_num; i++) { if ( glsl_shader_add_scrn(sdl->glsl, video_config.glsl_shader_scrn[i], - sdl->glsl_program_num-1-sdl->glsl_program_mb2sc) ) + sdl->glsl_program_num-1-sdl->glsl_program_mb2sc) ) { mame_printf_error("OpenGL: GLSL loading screen bitmap shader %d failed (%s)\n", i, video_config.glsl_shader_scrn[i]); @@ -1133,7 +1133,7 @@ static void loadGLExtensions(sdl_window_info *window) } if ( 0==sdl->glsl_program_num && - 0 <= video_config.glsl_filter && video_config.glsl_filter < GLSL_SHADER_FEAT_INT_NUMBER ) + 0 <= video_config.glsl_filter && video_config.glsl_filter < GLSL_SHADER_FEAT_INT_NUMBER ) { sdl->glsl_program_mb2sc = sdl->glsl_program_num; // the last mame_bitmap (mb) shader does it. sdl->glsl_program_num++; @@ -1330,28 +1330,28 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update) switch (prim->type) { /** - * Try to stay in one Begin/End block as long as possible, - * since entering and leaving one is most expensive.. - */ + * Try to stay in one Begin/End block as long as possible, + * since entering and leaving one is most expensive.. + */ case render_primitive::LINE: #if !USE_WIN32_STYLE_LINES // check if it's really a point if (((prim->bounds.x1 - prim->bounds.x0) == 0) && ((prim->bounds.y1 - prim->bounds.y0) == 0)) { - curPrimitive=GL_POINTS; + curPrimitive=GL_POINTS; } else { - curPrimitive=GL_LINES; + curPrimitive=GL_LINES; } if(pendingPrimitive!=GL_NO_PRIMITIVE && pendingPrimitive!=curPrimitive) { - glEnd(); - pendingPrimitive=GL_NO_PRIMITIVE; + glEnd(); + pendingPrimitive=GL_NO_PRIMITIVE; } - if ( pendingPrimitive==GL_NO_PRIMITIVE ) + if ( pendingPrimitive==GL_NO_PRIMITIVE ) { - set_blendmode(sdl, PRIMFLAG_GET_BLENDMODE(prim->flags)); + set_blendmode(sdl, PRIMFLAG_GET_BLENDMODE(prim->flags)); } glColor4f(prim->color.r, prim->color.g, prim->color.b, prim->color.a); @@ -1382,8 +1382,8 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update) // we're not gonna play fancy here. close anything pending and let's go. if (pendingPrimitive!=GL_NO_PRIMITIVE && pendingPrimitive!=curPrimitive) { - glEnd(); - pendingPrimitive=GL_NO_PRIMITIVE; + glEnd(); + pendingPrimitive=GL_NO_PRIMITIVE; } set_blendmode(sdl, PRIMFLAG_GET_BLENDMODE(prim->flags)); @@ -1465,8 +1465,8 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update) if(pendingPrimitive!=GL_NO_PRIMITIVE) { - glEnd(); - pendingPrimitive=GL_NO_PRIMITIVE; + glEnd(); + pendingPrimitive=GL_NO_PRIMITIVE; } glColor4f(prim->color.r, prim->color.g, prim->color.b, prim->color.a); @@ -1555,16 +1555,16 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update) //============================================================ static const char * texfmt_to_string[9] = { - "ARGB32", - "RGB32", - "RGB32_PALETTED", - "YUV16", - "YUV16_PALETTED", - "PALETTE16", - "RGB15", - "RGB15_PALETTE", - "PALETTE16A" - }; + "ARGB32", + "RGB32", + "RGB32_PALETTED", + "YUV16", + "YUV16_PALETTED", + "PALETTE16", + "RGB15", + "RGB15_PALETTE", + "PALETTE16A" + }; // // Note: if you change the following array order, change the matching defines in texsrc.h @@ -1749,74 +1749,74 @@ static void texture_compute_type_subroutine(sdl_info *sdl, const render_texinfo texture->nocopy = FALSE; if ( texture->type == TEXTURE_TYPE_NONE && - !PRIMFLAG_GET_SCREENTEX(flags)) + !PRIMFLAG_GET_SCREENTEX(flags)) { texture->type = TEXTURE_TYPE_PLAIN; - texture->texTarget = (sdl->usetexturerect)?GL_TEXTURE_RECTANGLE_ARB:GL_TEXTURE_2D; - texture->texpow2 = (sdl->usetexturerect)?0:sdl->texpoweroftwo; + texture->texTarget = (sdl->usetexturerect)?GL_TEXTURE_RECTANGLE_ARB:GL_TEXTURE_2D; + texture->texpow2 = (sdl->usetexturerect)?0:sdl->texpoweroftwo; } // currently glsl supports idx and rgb palette lookups, // no special quality scaling, so we could drop the prescale criteria below .. if ( texture->type == TEXTURE_TYPE_NONE && - sdl->useglsl && - ( - texture->format==SDL_TEXFORMAT_PALETTE16 || // glsl idx16 lut - texture->format==SDL_TEXFORMAT_RGB32_PALETTED || // glsl rgb32 lut/direct - texture->format==SDL_TEXFORMAT_RGB32 || - texture->format==SDL_TEXFORMAT_RGB15_PALETTED || // glsl rgb15 lut/direct - texture->format==SDL_TEXFORMAT_RGB15 - ) && - texture->xprescale == 1 && texture->yprescale == 1 && - texsource->rowpixels <= sdl->texture_max_width - ) + sdl->useglsl && + ( + texture->format==SDL_TEXFORMAT_PALETTE16 || // glsl idx16 lut + texture->format==SDL_TEXFORMAT_RGB32_PALETTED || // glsl rgb32 lut/direct + texture->format==SDL_TEXFORMAT_RGB32 || + texture->format==SDL_TEXFORMAT_RGB15_PALETTED || // glsl rgb15 lut/direct + texture->format==SDL_TEXFORMAT_RGB15 + ) && + texture->xprescale == 1 && texture->yprescale == 1 && + texsource->rowpixels <= sdl->texture_max_width + ) { texture->type = TEXTURE_TYPE_SHADER; texture->nocopy = TRUE; - texture->texTarget = GL_TEXTURE_2D; - texture->texpow2 = sdl->texpoweroftwo; + texture->texTarget = GL_TEXTURE_2D; + texture->texpow2 = sdl->texpoweroftwo; } // determine if we can skip the copy step // if this was not already decided by the shader condition above if ( !texture->nocopy && - texture_copy_properties[texture->format][SDL_TEXFORMAT_SRC_EQUALS_DEST] && - !texture_copy_properties[texture->format][SDL_TEXFORMAT_SRC_HAS_PALETTE] && - texture->xprescale == 1 && texture->yprescale == 1 && - !texture->borderpix && - texsource->rowpixels <= sdl->texture_max_width ) + texture_copy_properties[texture->format][SDL_TEXFORMAT_SRC_EQUALS_DEST] && + !texture_copy_properties[texture->format][SDL_TEXFORMAT_SRC_HAS_PALETTE] && + texture->xprescale == 1 && texture->yprescale == 1 && + !texture->borderpix && + texsource->rowpixels <= sdl->texture_max_width ) { texture->nocopy = TRUE; - } + } if( texture->type == TEXTURE_TYPE_NONE && - sdl->usepbo && !texture->nocopy ) + sdl->usepbo && !texture->nocopy ) { texture->type = TEXTURE_TYPE_DYNAMIC; - texture->texTarget = (sdl->usetexturerect)?GL_TEXTURE_RECTANGLE_ARB:GL_TEXTURE_2D; - texture->texpow2 = (sdl->usetexturerect)?0:sdl->texpoweroftwo; + texture->texTarget = (sdl->usetexturerect)?GL_TEXTURE_RECTANGLE_ARB:GL_TEXTURE_2D; + texture->texpow2 = (sdl->usetexturerect)?0:sdl->texpoweroftwo; } if( texture->type == TEXTURE_TYPE_NONE ) { texture->type = TEXTURE_TYPE_SURFACE; - texture->texTarget = (sdl->usetexturerect)?GL_TEXTURE_RECTANGLE_ARB:GL_TEXTURE_2D; - texture->texpow2 = (sdl->usetexturerect)?0:sdl->texpoweroftwo; - } - - if ( texture->type!=TEXTURE_TYPE_SHADER && video_config.prefer16bpp_tex ) - { - texture->texProperties = texture_gl_properties_srcNative_intNative[texture->format]; - texture->texCopyFn = texcopy_dstNative_f[texture->format]; - } else if ( texture->nocopy ) - { - texture->texProperties = texture_gl_properties_srcNative_int32bpp[texture->format]; - texture->texCopyFn = NULL; - } else { - texture->texProperties = texture_gl_properties_srcCopy_int32bpp[texture->format]; - texture->texCopyFn = texcopy_dst32bpp_f[texture->format]; - } + texture->texTarget = (sdl->usetexturerect)?GL_TEXTURE_RECTANGLE_ARB:GL_TEXTURE_2D; + texture->texpow2 = (sdl->usetexturerect)?0:sdl->texpoweroftwo; + } + + if ( texture->type!=TEXTURE_TYPE_SHADER && video_config.prefer16bpp_tex ) + { + texture->texProperties = texture_gl_properties_srcNative_intNative[texture->format]; + texture->texCopyFn = texcopy_dstNative_f[texture->format]; + } else if ( texture->nocopy ) + { + texture->texProperties = texture_gl_properties_srcNative_int32bpp[texture->format]; + texture->texCopyFn = NULL; + } else { + texture->texProperties = texture_gl_properties_srcCopy_int32bpp[texture->format]; + texture->texCopyFn = texcopy_dst32bpp_f[texture->format]; + } } INLINE int get_valid_pow2_value(int v, int needPow2) @@ -1825,28 +1825,28 @@ INLINE int get_valid_pow2_value(int v, int needPow2) } static void texture_compute_size_subroutine(sdl_window_info *window, texture_info *texture, UINT32 flags, - UINT32 width, UINT32 height, - int* p_width, int* p_height, int* p_width_create, int* p_height_create) + UINT32 width, UINT32 height, + int* p_width, int* p_height, int* p_width_create, int* p_height_create) { sdl_info *sdl = (sdl_info *) window->dxdata; - int width_create; - int height_create; + int width_create; + int height_create; if ( texture->texpow2 ) - { - width_create = gl_round_to_pow2 (width); - height_create = gl_round_to_pow2 (height); - } else if ( texture->type==TEXTURE_TYPE_SHADER ) - { - /** - * at least use a multiple of 8 for shader .. just in case - */ - width_create = ( width & ~0x07 ) + ( (width & 0x07)? 8 : 0 ) ; - height_create = ( height & ~0x07 ) + ( (height & 0x07)? 8 : 0 ) ; - } else { - width_create = width ; - height_create = height ; - } + { + width_create = gl_round_to_pow2 (width); + height_create = gl_round_to_pow2 (height); + } else if ( texture->type==TEXTURE_TYPE_SHADER ) + { + /** + * at least use a multiple of 8 for shader .. just in case + */ + width_create = ( width & ~0x07 ) + ( (width & 0x07)? 8 : 0 ) ; + height_create = ( height & ~0x07 ) + ( (height & 0x07)? 8 : 0 ) ; + } else { + width_create = width ; + height_create = height ; + } // don't prescale above max texture size while (texture->xprescale > 1 && width_create * texture->xprescale > sdl->texture_max_width) @@ -1870,10 +1870,10 @@ static void texture_compute_size_subroutine(sdl_window_info *window, texture_inf width_create += 2; height_create += 2; } - *p_width=width; - *p_height=height; - *p_width_create=width_create; - *p_height_create=height_create; + *p_width=width; + *p_height=height; + *p_width_create=width_create; + *p_height_create=height_create; } static void texture_compute_size_type(sdl_window_info *window, const render_texinfo *texsource, texture_info *texture, UINT32 flags) @@ -1886,25 +1886,25 @@ static void texture_compute_size_type(sdl_window_info *window, const render_texi texture->borderpix = 0; //!(texture->flags & PRIMFLAG_TEXWRAP_MASK); if (PRIMFLAG_GET_SCREENTEX(flags)) { - texture->borderpix = 0; // don't border the screen right now, there's a bug + texture->borderpix = 0; // don't border the screen right now, there's a bug } texture_compute_type_subroutine(sdl, texsource, texture, flags); texture_compute_size_subroutine(window, texture, flags, texsource->width, texsource->height, - &finalwidth, &finalheight, &finalwidth_create, &finalheight_create); + &finalwidth, &finalheight, &finalwidth_create, &finalheight_create); // if we added pixels for the border, and that just barely pushed us over, take it back if (texture->borderpix && ((finalwidth > sdl->texture_max_width && finalwidth - 2 <= sdl->texture_max_width) || - (finalheight > sdl->texture_max_height && finalheight - 2 <= sdl->texture_max_height))) + (finalheight > sdl->texture_max_height && finalheight - 2 <= sdl->texture_max_height))) { texture->borderpix = FALSE; texture_compute_type_subroutine(sdl, texsource, texture, flags); texture_compute_size_subroutine(window, texture, flags, texsource->width, texsource->height, - &finalwidth, &finalheight, &finalwidth_create, &finalheight_create); + &finalwidth, &finalheight, &finalwidth_create, &finalheight_create); } // if we're above the max width/height, do what? @@ -1917,17 +1917,17 @@ static void texture_compute_size_type(sdl_window_info *window, const render_texi } if(!texture->nocopy || texture->type==TEXTURE_TYPE_DYNAMIC || texture->type==TEXTURE_TYPE_SHADER || - // any of the mame core's device generated bitmap types: - texture->format==SDL_TEXFORMAT_RGB32 || - texture->format==SDL_TEXFORMAT_RGB32_PALETTED || - texture->format==SDL_TEXFORMAT_RGB15 || - texture->format==SDL_TEXFORMAT_RGB15_PALETTED || - texture->format==SDL_TEXFORMAT_PALETTE16 || - texture->format==SDL_TEXFORMAT_PALETTE16A - ) + // any of the mame core's device generated bitmap types: + texture->format==SDL_TEXFORMAT_RGB32 || + texture->format==SDL_TEXFORMAT_RGB32_PALETTED || + texture->format==SDL_TEXFORMAT_RGB15 || + texture->format==SDL_TEXFORMAT_RGB15_PALETTED || + texture->format==SDL_TEXFORMAT_PALETTE16 || + texture->format==SDL_TEXFORMAT_PALETTE16A + ) { mame_printf_verbose("GL texture: copy %d, shader %d, dynamic %d, %dx%d %dx%d [%s, Equal: %d, Palette: %d,\n" - " scale %dx%d, border %d, pitch %d,%d/%d], colors: %d, bytes/pix %d\n", + " scale %dx%d, border %d, pitch %d,%d/%d], colors: %d, bytes/pix %d\n", !texture->nocopy, texture->type==TEXTURE_TYPE_SHADER, texture->type==TEXTURE_TYPE_DYNAMIC, finalwidth, finalheight, finalwidth_create, finalheight_create, texfmt_to_string[texture->format], @@ -1952,45 +1952,45 @@ static void texture_compute_size_type(sdl_window_info *window, const render_texi static int gl_checkFramebufferStatus(void) { - GLenum status; - status=(GLenum)pfn_glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT); - switch(status) { - case GL_FRAMEBUFFER_COMPLETE_EXT: - return 0; - case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: - mame_printf_error("GL FBO: incomplete,incomplete attachment\n"); - return -1; - case GL_FRAMEBUFFER_UNSUPPORTED_EXT: - mame_printf_error("GL FBO: Unsupported framebuffer format\n"); - return -1; - case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: - mame_printf_error("GL FBO: incomplete,missing attachment\n"); - return -1; - case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: - mame_printf_error("GL FBO: incomplete,attached images must have same dimensions\n"); - return -1; - case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: - mame_printf_error("GL FBO: incomplete,attached images must have same format\n"); - return -1; - case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: - mame_printf_error("GL FBO: incomplete,missing draw buffer\n"); - return -1; - case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: - mame_printf_error("GL FBO: incomplete,missing read buffer\n"); - return -1; + GLenum status; + status=(GLenum)pfn_glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT); + switch(status) { + case GL_FRAMEBUFFER_COMPLETE_EXT: + return 0; + case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: + mame_printf_error("GL FBO: incomplete,incomplete attachment\n"); + return -1; + case GL_FRAMEBUFFER_UNSUPPORTED_EXT: + mame_printf_error("GL FBO: Unsupported framebuffer format\n"); + return -1; + case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: + mame_printf_error("GL FBO: incomplete,missing attachment\n"); + return -1; + case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: + mame_printf_error("GL FBO: incomplete,attached images must have same dimensions\n"); + return -1; + case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: + mame_printf_error("GL FBO: incomplete,attached images must have same format\n"); + return -1; + case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: + mame_printf_error("GL FBO: incomplete,missing draw buffer\n"); + return -1; + case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: + mame_printf_error("GL FBO: incomplete,missing read buffer\n"); + return -1; #ifdef GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT - case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT: - mame_printf_error("GL FBO: incomplete, duplicate attachment\n"); - return -1; + case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT: + mame_printf_error("GL FBO: incomplete, duplicate attachment\n"); + return -1; #endif - case 0: - mame_printf_error("GL FBO: incomplete, implementation fault\n"); - return -1; - default: - mame_printf_error("GL FBO: incomplete, implementation ERROR\n"); - /* fall through */ - } - return -1; + case 0: + mame_printf_error("GL FBO: incomplete, implementation fault\n"); + return -1; + default: + mame_printf_error("GL FBO: incomplete, implementation ERROR\n"); + /* fall through */ + } + return -1; } static int texture_fbo_create(UINT32 text_unit, UINT32 text_name, UINT32 fbo_name, int width, int height) @@ -2001,15 +2001,15 @@ static int texture_fbo_create(UINT32 text_unit, UINT32 text_name, UINT32 fbo_nam { GLint _width, _height; if ( gl_texture_check_size(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, - 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, &_width, &_height, 1) ) + 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, &_width, &_height, 1) ) { mame_printf_error("cannot create fbo texture, req: %dx%d, avail: %dx%d - bail out\n", - width, height, (int)_width, (int)_height); + width, height, (int)_width, (int)_height); return -1; } glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, - 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL ); + 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL ); } // non-screen textures will never be filtered glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); @@ -2019,7 +2019,7 @@ static int texture_fbo_create(UINT32 text_unit, UINT32 text_name, UINT32 fbo_nam glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); pfn_glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, text_name, 0); + GL_TEXTURE_2D, text_name, 0); if ( gl_checkFramebufferStatus() ) { @@ -2031,7 +2031,7 @@ static int texture_fbo_create(UINT32 text_unit, UINT32 text_name, UINT32 fbo_nam } static int texture_shader_create(sdl_window_info *window, - const render_texinfo *texsource, texture_info *texture, UINT32 flags) + const render_texinfo *texsource, texture_info *texture, UINT32 flags) { sdl_info *sdl = (sdl_info *) window->dxdata; int uniform_location; @@ -2065,7 +2065,7 @@ static int texture_shader_create(sdl_window_info *window, case SDL_TEXFORMAT_PALETTE16: glsl_shader_type = GLSL_SHADER_TYPE_IDX16; - texture->lut_table_width = sdl->totalColors; + texture->lut_table_width = sdl->totalColors; break; default: @@ -2075,18 +2075,18 @@ static int texture_shader_create(sdl_window_info *window, } /** - * We experience some GLSL LUT calculation inaccuracy on some GL drivers. - * while using the correct lut calculations. - * This error is due to the color index value to GLSL/texture passing process: - * mame:uint16_t -> OpenGL: GLfloat(alpha texture) -> GLSL:uint16_t (value regeneration) - * The latter inaccurate uint16_t value regeneration is buggy on some drivers/cards, - * therefor we always widen the lut size to pow2, - * and shape it equaly into 2D space (max texture size restriction). - * This is a practical GL driver workaround to minimize the chance for - * floating point arithmetic errors in the GLSL engine. - * - * Shape the lut texture to achieve texture max size compliance and equal 2D partitioning - */ + * We experience some GLSL LUT calculation inaccuracy on some GL drivers. + * while using the correct lut calculations. + * This error is due to the color index value to GLSL/texture passing process: + * mame:uint16_t -> OpenGL: GLfloat(alpha texture) -> GLSL:uint16_t (value regeneration) + * The latter inaccurate uint16_t value regeneration is buggy on some drivers/cards, + * therefor we always widen the lut size to pow2, + * and shape it equaly into 2D space (max texture size restriction). + * This is a practical GL driver workaround to minimize the chance for + * floating point arithmetic errors in the GLSL engine. + * + * Shape the lut texture to achieve texture max size compliance and equal 2D partitioning + */ if ( texture->format == SDL_TEXFORMAT_PALETTE16 ) { @@ -2109,9 +2109,9 @@ static int texture_shader_create(sdl_window_info *window, } /** - * always use pow2 for LUT, to minimize the chance for floating point arithmetic errors - * (->buggy GLSL engine) - */ + * always use pow2 for LUT, to minimize the chance for floating point arithmetic errors + * (->buggy GLSL engine) + */ lut_table_height_pow2 = get_valid_pow2_value (texture->lut_table_height, 1 /* texture->texpow2 */); lut_table_width_pow2 = get_valid_pow2_value (texture->lut_table_width, 1 /* texture->texpow2 */); @@ -2227,7 +2227,7 @@ static int texture_shader_create(sdl_window_info *window, for (i=0; i<2; i++) { if ( texture_fbo_create(texture->mpass_textureunit[i], - texture->mpass_texture_mamebm[i], + texture->mpass_texture_mamebm[i], texture->mpass_fbo_mamebm[i], texture->rawwidth_create, texture->rawheight_create) ) { @@ -2251,7 +2251,7 @@ static int texture_shader_create(sdl_window_info *window, for (i=0; i<2; i++) { if ( texture_fbo_create(texture->mpass_textureunit[i], - texture->mpass_texture_scrn[i], + texture->mpass_texture_scrn[i], texture->mpass_fbo_scrn[i], surf_w_pow2, surf_h_pow2) ) { @@ -2275,7 +2275,7 @@ static int texture_shader_create(sdl_window_info *window, { GLint _width, _height; if ( gl_texture_check_size(GL_TEXTURE_2D, 0, GL_RGBA8, lut_table_width_pow2, lut_table_height_pow2, - 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, &_width, &_height, 1) ) + 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, &_width, &_height, 1) ) { mame_printf_error("cannot create lut table texture, req: %dx%d, avail: %dx%d - bail out\n", lut_table_width_pow2, lut_table_height_pow2, (int)_width, (int)_height); @@ -2287,7 +2287,7 @@ static int texture_shader_create(sdl_window_info *window, UINT32 * dummy = (UINT32 *) malloc(lut_table_width_pow2*lut_table_height_pow2 * sizeof(UINT32)); // blank out the whole pal. memset(dummy, 0, lut_table_width_pow2*lut_table_height_pow2 * sizeof(UINT32)); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, lut_table_width_pow2, lut_table_height_pow2, - 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, dummy ); + 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, dummy ); glFinish(); // should not be necessary, .. but make sure we won't access the memory after free free(dummy); } @@ -2295,7 +2295,7 @@ static int texture_shader_create(sdl_window_info *window, glPixelStorei(GL_UNPACK_ROW_LENGTH, texture->lut_table_width); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, texture->lut_table_width, texture->lut_table_height, - GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texsource->palette ); + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texsource->palette ); // non-screen textures will never be filtered glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); @@ -2320,11 +2320,11 @@ static int texture_shader_create(sdl_window_info *window, UINT32 * dummy = NULL; GLint _width, _height; if ( gl_texture_check_size(GL_TEXTURE_2D, 0, texture->texProperties[SDL_TEXFORMAT_INTERNAL], - texture->rawwidth_create, texture->rawheight_create, - 0, - texture->texProperties[SDL_TEXFORMAT_FORMAT], - texture->texProperties[SDL_TEXFORMAT_TYPE], - &_width, &_height, 1) ) + texture->rawwidth_create, texture->rawheight_create, + 0, + texture->texProperties[SDL_TEXFORMAT_FORMAT], + texture->texProperties[SDL_TEXFORMAT_TYPE], + &_width, &_height, 1) ) { mame_printf_error("cannot create bitmap texture, req: %dx%d, avail: %dx%d - bail out\n", texture->rawwidth_create, texture->rawheight_create, (int)_width, (int)_height); @@ -2332,15 +2332,15 @@ static int texture_shader_create(sdl_window_info *window, } dummy = (UINT32 *) malloc(texture->rawwidth_create * texture->rawheight_create * - texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE]); + texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE]); memset(dummy, 0, texture->rawwidth_create * texture->rawheight_create * - texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE]); + texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE]); glTexImage2D(GL_TEXTURE_2D, 0, texture->texProperties[SDL_TEXFORMAT_INTERNAL], - texture->rawwidth_create, texture->rawheight_create, - 0, - texture->texProperties[SDL_TEXFORMAT_FORMAT], - texture->texProperties[SDL_TEXFORMAT_TYPE], dummy); - glFinish(); // should not be necessary, .. but make sure we won't access the memory after free + texture->rawwidth_create, texture->rawheight_create, + 0, + texture->texProperties[SDL_TEXFORMAT_FORMAT], + texture->texProperties[SDL_TEXFORMAT_TYPE], dummy); + glFinish(); // should not be necessary, .. but make sure we won't access the memory after free free(dummy); if ((PRIMFLAG_GET_SCREENTEX(flags)) && video_config.filter) @@ -2373,7 +2373,7 @@ static int texture_shader_create(sdl_window_info *window, UINT32 * dummy = NULL; GLint _width, _height; if ( gl_texture_check_size(GL_TEXTURE_2D, 0, GL_ALPHA16, texture->rawwidth_create, texture->rawheight_create, - 0, GL_ALPHA, GL_UNSIGNED_SHORT, &_width, &_height, 1) ) + 0, GL_ALPHA, GL_UNSIGNED_SHORT, &_width, &_height, 1) ) { mame_printf_error("cannot create lut bitmap texture, req: %dx%d, avail: %dx%d - bail out\n", texture->rawwidth_create, texture->rawheight_create, @@ -2383,10 +2383,10 @@ static int texture_shader_create(sdl_window_info *window, dummy = (UINT32 *) malloc(texture->rawwidth_create * texture->rawheight_create * sizeof(UINT16)); memset(dummy, 0, texture->rawwidth_create * texture->rawheight_create * sizeof(UINT16)); glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA16, - texture->rawwidth_create, texture->rawheight_create, - 0, - GL_ALPHA, GL_UNSIGNED_SHORT, dummy); - glFinish(); // should not be necessary, .. but make sure we won't access the memory after free + texture->rawwidth_create, texture->rawheight_create, + 0, + GL_ALPHA, GL_UNSIGNED_SHORT, dummy); + glFinish(); // should not be necessary, .. but make sure we won't access the memory after free free(dummy); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -2433,29 +2433,29 @@ static texture_info *texture_create(sdl_window_info *window, const render_texinf } // set the texture_format - // - // src/emu/validity.c:validate_display() states, - // an emulated driver can only produce - // BITMAP_FORMAT_IND16 and BITMAP_FORMAT_RGB32 - // where only the first original paletted. - // - // other paletted formats, i.e.: - // SDL_TEXFORMAT_RGB32_PALETTED, SDL_TEXFORMAT_RGB15_PALETTED and SDL_TEXFORMAT_YUY16_PALETTED - // add features like brightness etc by the mame core - // - // all palette lookup may be implemented using shaders later on .. - // that's why we keep the EQUAL flag TRUE, for all original true color bitmaps. - // + // + // src/emu/validity.c:validate_display() states, + // an emulated driver can only produce + // BITMAP_FORMAT_IND16 and BITMAP_FORMAT_RGB32 + // where only the first original paletted. + // + // other paletted formats, i.e.: + // SDL_TEXFORMAT_RGB32_PALETTED, SDL_TEXFORMAT_RGB15_PALETTED and SDL_TEXFORMAT_YUY16_PALETTED + // add features like brightness etc by the mame core + // + // all palette lookup may be implemented using shaders later on .. + // that's why we keep the EQUAL flag TRUE, for all original true color bitmaps. + // switch (PRIMFLAG_GET_TEXFORMAT(flags)) { case TEXFORMAT_ARGB32: texture->format = SDL_TEXFORMAT_ARGB32; break; case TEXFORMAT_RGB32: - if (texsource->palette != NULL) - texture->format = SDL_TEXFORMAT_RGB32_PALETTED; - else - texture->format = SDL_TEXFORMAT_RGB32; + if (texsource->palette != NULL) + texture->format = SDL_TEXFORMAT_RGB32_PALETTED; + else + texture->format = SDL_TEXFORMAT_RGB32; break; case TEXFORMAT_PALETTE16: texture->format = SDL_TEXFORMAT_PALETTE16; @@ -2477,7 +2477,7 @@ static texture_info *texture_create(sdl_window_info *window, const render_texinf // compute the size texture_compute_size_type(window, texsource, texture, flags); - texture->pbo=0; + texture->pbo=0; if ( texture->type != TEXTURE_TYPE_SHADER && sdl->useglsl) { @@ -2487,10 +2487,10 @@ static texture_info *texture_create(sdl_window_info *window, const render_texinf if ( texture->type==TEXTURE_TYPE_SHADER ) { if ( texture_shader_create(window, texsource, texture, flags) ) - { - free(texture); - return NULL; - } + { + free(texture); + return NULL; + } } else { @@ -2504,10 +2504,10 @@ static texture_info *texture_create(sdl_window_info *window, const render_texinf // this doesn't actually upload, it just sets up the PBO's parameters glTexImage2D(texture->texTarget, 0, texture->texProperties[SDL_TEXFORMAT_INTERNAL], - texture->rawwidth_create, texture->rawheight_create, - texture->borderpix ? 1 : 0, - texture->texProperties[SDL_TEXFORMAT_FORMAT], - texture->texProperties[SDL_TEXFORMAT_TYPE], NULL); + texture->rawwidth_create, texture->rawheight_create, + texture->borderpix ? 1 : 0, + texture->texProperties[SDL_TEXFORMAT_FORMAT], + texture->texProperties[SDL_TEXFORMAT_TYPE], NULL); if ((PRIMFLAG_GET_SCREENTEX(flags)) && video_config.filter) { @@ -2544,24 +2544,24 @@ static texture_info *texture_create(sdl_window_info *window, const render_texinf if ( texture->type == TEXTURE_TYPE_DYNAMIC ) { - assert(sdl->usepbo); + assert(sdl->usepbo); - // create the PBO - pfn_glGenBuffers(1, (GLuint *)&texture->pbo); + // create the PBO + pfn_glGenBuffers(1, (GLuint *)&texture->pbo); - pfn_glBindBuffer( GL_PIXEL_UNPACK_BUFFER_ARB, texture->pbo); + pfn_glBindBuffer( GL_PIXEL_UNPACK_BUFFER_ARB, texture->pbo); - // set up the PBO dimension, .. + // set up the PBO dimension, .. pfn_glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, - texture->rawwidth * texture->rawheight * texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE], - NULL, GL_STREAM_DRAW); - } + texture->rawwidth * texture->rawheight * texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE], + NULL, GL_STREAM_DRAW); + } - if ( !texture->nocopy && texture->type!=TEXTURE_TYPE_DYNAMIC ) - { - texture->data = (UINT32 *) malloc(texture->rawwidth* texture->rawheight * texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE]); - texture->data_own=TRUE; - } + if ( !texture->nocopy && texture->type!=TEXTURE_TYPE_DYNAMIC ) + { + texture->data = (UINT32 *) malloc(texture->rawwidth* texture->rawheight * texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE]); + texture->data_own=TRUE; + } // add us to the texture list #ifdef OLD_CODE @@ -2637,8 +2637,8 @@ static void texture_set_data(texture_info *texture, const render_texinfo *texsou if (texture->borderpix) { memset((UINT8 *)texture->data + - (texsource->height + 1) * texture->rawwidth * texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE], - 0, + (texsource->height + 1) * texture->rawwidth * texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE], + 0, (texsource->width * texture->xprescale + 2) * texture->texProperties[SDL_TEXFORMAT_PIXEL_SIZE]); } @@ -2653,7 +2653,7 @@ static void texture_set_data(texture_info *texture, const render_texinfo *texsou // give the card a hint glTexSubImage2D(texture->texTarget, 0, 0, 0, texture->lut_table_width, texture->lut_table_height, - GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texsource->palette ); + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texsource->palette ); } pfn_glActiveTexture(GL_TEXTURE0); glBindTexture(texture->texTarget, texture->texture); @@ -2684,7 +2684,7 @@ static void texture_set_data(texture_info *texture, const render_texinfo *texsou // kick off the DMA glTexSubImage2D(texture->texTarget, 0, 0, 0, texture->rawwidth, texture->rawheight, - texture->texProperties[SDL_TEXFORMAT_FORMAT], + texture->texProperties[SDL_TEXFORMAT_FORMAT], texture->texProperties[SDL_TEXFORMAT_TYPE], NULL); } else @@ -2699,7 +2699,7 @@ static void texture_set_data(texture_info *texture, const render_texinfo *texsou // and upload the image glTexSubImage2D(texture->texTarget, 0, 0, 0, texture->rawwidth, texture->rawheight, - texture->texProperties[SDL_TEXFORMAT_FORMAT], + texture->texProperties[SDL_TEXFORMAT_FORMAT], texture->texProperties[SDL_TEXFORMAT_TYPE], texture->data); } } @@ -2782,15 +2782,15 @@ static texture_info *texture_find(sdl_info *sdl, const render_primitive *prim) //============================================================ static void texture_coord_update(sdl_window_info *window, - texture_info *texture, const render_primitive *prim, int shaderIdx) + texture_info *texture, const render_primitive *prim, int shaderIdx) { sdl_info *sdl = (sdl_info *) window->dxdata; - float ustart, ustop; // beginning/ending U coordinates - float vstart, vstop; // beginning/ending V coordinates + float ustart, ustop; // beginning/ending U coordinates + float vstart, vstop; // beginning/ending V coordinates float du, dv; if ( texture->type != TEXTURE_TYPE_SHADER || - ( texture->type == TEXTURE_TYPE_SHADER && shaderIdx<=sdl->glsl_program_mb2sc ) ) + ( texture->type == TEXTURE_TYPE_SHADER && shaderIdx<=sdl->glsl_program_mb2sc ) ) { // compute the U/V scale factors if (texture->borderpix) @@ -2830,10 +2830,10 @@ static void texture_coord_update(sdl_window_info *window, if ( texture->texTarget == GL_TEXTURE_RECTANGLE_ARB ) { - // texture coordinates for TEXTURE_RECTANGLE are 0,0 -> w,h - // rather than 0,0 -> 1,1 as with normal OpenGL texturing - du *= (float)texture->rawwidth; - dv *= (float)texture->rawheight; + // texture coordinates for TEXTURE_RECTANGLE are 0,0 -> w,h + // rather than 0,0 -> 1,1 as with normal OpenGL texturing + du *= (float)texture->rawwidth; + dv *= (float)texture->rawheight; } if ( texture->type == TEXTURE_TYPE_SHADER && shaderIdx!=sdl->glsl_program_mb2sc ) @@ -2994,29 +2994,29 @@ static texture_info * texture_update(sdl_window_info *window, const render_primi // if we didn't find one, create a new texture if (texture == NULL && prim->texture.base != NULL) - { - texture = texture_create(window, &prim->texture, prim->flags); + { + texture = texture_create(window, &prim->texture, prim->flags); - } + } else if (texture != NULL) - { + { if ( texture->type == TEXTURE_TYPE_SHADER ) { pfn_glUseProgramObjectARB(sdl->glsl_program[shaderIdx]); // back to our shader - } + } else if ( texture->type == TEXTURE_TYPE_DYNAMIC ) - { - assert ( sdl->usepbo ) ; - pfn_glBindBuffer( GL_PIXEL_UNPACK_BUFFER_ARB, texture->pbo); - glEnable(texture->texTarget); + { + assert ( sdl->usepbo ) ; + pfn_glBindBuffer( GL_PIXEL_UNPACK_BUFFER_ARB, texture->pbo); + glEnable(texture->texTarget); } else { - glEnable(texture->texTarget); - } - } + glEnable(texture->texTarget); + } + } - if (texture != NULL) + if (texture != NULL) { if ( texture->type == TEXTURE_TYPE_SHADER ) { @@ -3047,18 +3047,18 @@ static texture_info * texture_update(sdl_window_info *window, const render_primi glEnableClientState(GL_TEXTURE_COORD_ARRAY); if(sdl->usevbo) { - pfn_glBindBuffer( GL_ARRAY_BUFFER_ARB, texture->texCoordBufferName ); - // Load The Data - pfn_glBufferSubData( GL_ARRAY_BUFFER_ARB, 0, 4*2*sizeof(GLfloat), texture->texCoord ); - glTexCoordPointer( 2, GL_FLOAT, 0, (char *) NULL ); // we are using ARB VBO buffers + pfn_glBindBuffer( GL_ARRAY_BUFFER_ARB, texture->texCoordBufferName ); + // Load The Data + pfn_glBufferSubData( GL_ARRAY_BUFFER_ARB, 0, 4*2*sizeof(GLfloat), texture->texCoord ); + glTexCoordPointer( 2, GL_FLOAT, 0, (char *) NULL ); // we are using ARB VBO buffers } else { - glTexCoordPointer(2, GL_FLOAT, 0, texture->texCoord); + glTexCoordPointer(2, GL_FLOAT, 0, texture->texCoord); } } - return texture; + return texture; } static void texture_disable(sdl_info *sdl, texture_info * texture) @@ -3079,7 +3079,7 @@ static void texture_disable(sdl_info *sdl, texture_info * texture) static void texture_all_disable(sdl_info *sdl) { if ( sdl->useglsl ) - { + { pfn_glUseProgramObjectARB(0); // back to fixed function pipeline pfn_glActiveTexture(GL_TEXTURE3); @@ -3094,24 +3094,24 @@ static void texture_all_disable(sdl_info *sdl) pfn_glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, 0); if ( sdl->usefbo ) pfn_glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); - } + } glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); - if(sdl->usetexturerect) - { - glDisable(GL_TEXTURE_RECTANGLE_ARB); - } - glDisable(GL_TEXTURE_2D); + if(sdl->usetexturerect) + { + glDisable(GL_TEXTURE_RECTANGLE_ARB); + } + glDisable(GL_TEXTURE_2D); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - if(sdl->usevbo) - { + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + if(sdl->usevbo) + { pfn_glBindBuffer( GL_ARRAY_BUFFER_ARB, 0); // unbind .. - } + } if ( sdl->usepbo ) { pfn_glBindBuffer( GL_PIXEL_UNPACK_BUFFER_ARB, 0); - } + } } static void drawogl_destroy_all_textures(sdl_window_info *window) @@ -3166,7 +3166,7 @@ static void drawogl_destroy_all_textures(sdl_window_info *window) { pfn_glDeleteBuffers( 1, &(texture->texCoordBufferName) ); texture->texCoordBufferName=0; - } + } if(sdl->usepbo && texture->pbo) { @@ -3202,7 +3202,7 @@ static void drawogl_destroy_all_textures(sdl_window_info *window) #ifdef OLD_CODE texture = next_texture; } - sdl->texlist = NULL; + sdl->texlist = NULL; #else } i++; diff --git a/src/osd/sdl/drawsdl.c b/src/osd/sdl/drawsdl.c index 49e9f85ac75..8a803dbec2a 100644 --- a/src/osd/sdl/drawsdl.c +++ b/src/osd/sdl/drawsdl.c @@ -40,55 +40,55 @@ struct sdl_scale_mode; #if (SDLMAME_SDL2) -#define DRAW2_SCALEMODE_NEAREST "0" -#define DRAW2_SCALEMODE_LINEAR "1" -#define DRAW2_SCALEMODE_BEST "2" +#define DRAW2_SCALEMODE_NEAREST "0" +#define DRAW2_SCALEMODE_LINEAR "1" +#define DRAW2_SCALEMODE_BEST "2" #endif /* sdl_info is the information about SDL for the current screen */ struct sdl_info { - INT32 blittimer; - UINT32 extra_flags; + INT32 blittimer; + UINT32 extra_flags; #if (SDLMAME_SDL2) - SDL_Renderer *sdl_renderer; - SDL_Texture *texture_id; + SDL_Renderer *sdl_renderer; + SDL_Texture *texture_id; #else // SDL surface - SDL_Surface *sdlsurf; - SDL_Overlay *yuvsurf; + SDL_Surface *sdlsurf; + SDL_Overlay *yuvsurf; #endif // YUV overlay - UINT32 *yuv_lookup; - UINT16 *yuv_bitmap; + UINT32 *yuv_lookup; + UINT16 *yuv_bitmap; // if we leave scaling to SDL and the underlying driver, this // is the render_target_width/height to use - int hw_scale_width; - int hw_scale_height; - int last_hofs; - int last_vofs; - int old_blitwidth; - int old_blitheight; + int hw_scale_width; + int hw_scale_height; + int last_hofs; + int last_vofs; + int old_blitwidth; + int old_blitheight; }; struct sdl_scale_mode { - const char *name; - int is_scale; /* Scale mode? */ - int is_yuv; /* Yuv mode? */ - int mult_w; /* Width multiplier */ - int mult_h; /* Height multiplier */ + const char *name; + int is_scale; /* Scale mode? */ + int is_yuv; /* Yuv mode? */ + int mult_w; /* Width multiplier */ + int mult_h; /* Height multiplier */ #if (!SDLMAME_SDL2) - int extra_flags; /* Texture/surface flags */ + int extra_flags; /* Texture/surface flags */ #else - const char *sdl_scale_mode; /* what to use as a hint ? */ + const char *sdl_scale_mode; /* what to use as a hint ? */ #endif - int pixel_format; /* Pixel/Overlay format */ - void (*yuv_blit)(UINT16 *bitmap, sdl_info *sdl, UINT8 *ptr, int pitch); + int pixel_format; /* Pixel/Overlay format */ + void (*yuv_blit)(UINT16 *bitmap, sdl_info *sdl, UINT8 *ptr, int pitch); }; //============================================================ @@ -353,7 +353,7 @@ static void yuv_overlay_init(sdl_window_info *window) //============================================================ #if (SDLMAME_SDL2) -static void drawsdl_show_info(sdl_window_info *window, struct SDL_RendererInfo *render_info) +static void drawsdl_show_info(sdl_window_info *window, struct SDL_RendererInfo *render_info) { #define RF_ENTRY(x) {x, #x } static struct { @@ -388,7 +388,7 @@ static void drawsdl_show_info(sdl_window_info *window, struct SDL_RendererInfo * static int drawsdl_window_create(sdl_window_info *window, int width, int height) { sdl_info *sdl; - const sdl_scale_mode *sm = &scale_modes[video_config.scale_mode]; + const sdl_scale_mode *sm = &scale_modes[video_config.scale_mode]; // allocate memory for our structures sdl = (sdl_info *) osd_malloc(sizeof(sdl_info)); @@ -417,10 +417,10 @@ static int drawsdl_window_create(sdl_window_info *window, int width, int height) mode.h = height; if (window->refresh) mode.refresh_rate = window->refresh; - SDL_SetWindowDisplayMode(window->sdl_window, &mode); // Try to set mode + SDL_SetWindowDisplayMode(window->sdl_window, &mode); // Try to set mode } else - SDL_SetWindowDisplayMode(window->sdl_window, NULL); // Use desktop + SDL_SetWindowDisplayMode(window->sdl_window, NULL); // Use desktop SDL_ShowWindow(window->sdl_window); @@ -439,32 +439,32 @@ static int drawsdl_window_create(sdl_window_info *window, int width, int height) else sdl->sdl_renderer = SDL_CreateRenderer(window->sdl_window, -1, /*SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTDISCARD*/ 0); - //SDL_SelectRenderer(window->sdl_window); + //SDL_SelectRenderer(window->sdl_window); - { - struct SDL_RendererInfo render_info; + { + struct SDL_RendererInfo render_info; - SDL_GetRendererInfo(sdl->sdl_renderer, &render_info); - drawsdl_show_info(window, &render_info); + SDL_GetRendererInfo(sdl->sdl_renderer, &render_info); + drawsdl_show_info(window, &render_info); - // Check scale mode + // Check scale mode - if (sm->pixel_format) - { - int i; - int found = 0; + if (sm->pixel_format) + { + int i; + int found = 0; - for (i=0; i < render_info.num_texture_formats; i++) - if (sm->pixel_format == render_info.texture_formats[i]) - found = 1; + for (i=0; i < render_info.num_texture_formats; i++) + if (sm->pixel_format == render_info.texture_formats[i]) + found = 1; - if (!found) - { - mame_printf_verbose("window: Scale mode %s not supported!\n", sm->name); - ui_popup_time(3, "Scale mode %s not supported!", sm->name); - } - } - } + if (!found) + { + mame_printf_verbose("window: Scale mode %s not supported!\n", sm->name); + ui_popup_time(3, "Scale mode %s not supported!", sm->name); + } + } + } setup_texture(window, width, height); #else @@ -473,7 +473,7 @@ static int drawsdl_window_create(sdl_window_info *window, int width, int height) sdl->extra_flags |= sm->extra_flags; sdl->sdlsurf = SDL_SetVideoMode(width, height, - 0, SDL_SWSURFACE | SDL_ANYFORMAT | sdl->extra_flags); + 0, SDL_SWSURFACE | SDL_ANYFORMAT | sdl->extra_flags); if (!sdl->sdlsurf) return 1; @@ -718,10 +718,10 @@ static int drawsdl_window_draw(sdl_window_info *window, UINT32 dc, int update) } { - Uint32 format; - int access, w, h; + Uint32 format; + int access, w, h; - SDL_QueryTexture(sdl->texture_id, &format, &access, &w, &h); + SDL_QueryTexture(sdl->texture_id, &format, &access, &w, &h); SDL_PixelFormatEnumToMasks(format, &bpp, &rmask, &gmask, &bmask, &amask); bpp = bpp / 8; /* convert to bytes per pixels */ } @@ -876,19 +876,19 @@ static int drawsdl_window_draw(sdl_window_info *window, UINT32 dc, int update) // YUV Blitting //============================================================ -#define CU_CLAMP(v, a, b) ((v < a)? a: ((v > b)? b: v)) +#define CU_CLAMP(v, a, b) ((v < a)? a: ((v > b)? b: v)) #define RGB2YUV_F(r,g,b,y,u,v) \ - (y) = (0.299*(r) + 0.587*(g) + 0.114*(b) ); \ - (u) = (-0.169*(r) - 0.331*(g) + 0.5*(b) + 128); \ - (v) = (0.5*(r) - 0.419*(g) - 0.081*(b) + 128); \ + (y) = (0.299*(r) + 0.587*(g) + 0.114*(b) ); \ + (u) = (-0.169*(r) - 0.331*(g) + 0.5*(b) + 128); \ + (v) = (0.5*(r) - 0.419*(g) - 0.081*(b) + 128); \ (y) = CU_CLAMP(y,0,255); \ (u) = CU_CLAMP(u,0,255); \ (v) = CU_CLAMP(v,0,255) #define RGB2YUV(r,g,b,y,u,v) \ - (y) = (( 8453*(r) + 16594*(g) + 3223*(b) + 524288) >> 15); \ - (u) = (( -4878*(r) - 9578*(g) + 14456*(b) + 4210688) >> 15); \ - (v) = (( 14456*(r) - 12105*(g) - 2351*(b) + 4210688) >> 15) + (y) = (( 8453*(r) + 16594*(g) + 3223*(b) + 524288) >> 15); \ + (u) = (( -4878*(r) - 9578*(g) + 14456*(b) + 4210688) >> 15); \ + (v) = (( 14456*(r) - 12105*(g) - 2351*(b) + 4210688) >> 15) #ifdef LSB_FIRST #define Y1MASK 0x000000FF @@ -921,7 +921,7 @@ static void yuv_lookup_set(sdl_info *sdl, unsigned int pen, unsigned char red, RGB2YUV(red,green,blue,y,u,v); /* Storing this data in YUYV order simplifies using the data for - YUY2, both with and without smoothing... */ + YUY2, both with and without smoothing... */ sdl->yuv_lookup[pen]=(y<<Y1SHIFT)|(u<<USHIFT)|(y<<Y2SHIFT)|(v<<VSHIFT); } @@ -952,7 +952,7 @@ static void yuv_RGB_to_YV12(UINT16 *bitmap, sdl_info *sdl, UINT8 *ptr, int pitch UINT16 *src2; UINT32 *lookup = sdl->yuv_lookup; UINT8 *pixels[3]; - int u1,v1,y1,u2,v2,y2,u3,v3,y3,u4,v4,y4; /* 12 */ + int u1,v1,y1,u2,v2,y2,u3,v3,y3,u4,v4,y4; /* 12 */ pixels[0] = ptr; pixels[1] = ptr + pitch * sdl->hw_scale_height; diff --git a/src/osd/sdl/dview.c b/src/osd/sdl/dview.c index 4984ffedcce..3ab70ec0eb4 100644 --- a/src/osd/sdl/dview.c +++ b/src/osd/sdl/dview.c @@ -25,8 +25,8 @@ static gboolean dview_expose(GtkWidget *wdv, GdkEventExpose *event) if(dv->hs && dv->vs) { gdk_gc_set_foreground(dv->gc, &wdv->style->bg[GTK_STATE_NORMAL]); gdk_draw_rectangle(GDK_DRAWABLE(wdv->window), dv->gc, TRUE, - wdv->allocation.width - dv->vsz, wdv->allocation.height - dv->hsz, - dv->vsz, dv->hsz); + wdv->allocation.width - dv->vsz, wdv->allocation.height - dv->hsz, + dv->vsz, dv->hsz); } viewdata = dv->view->viewdata(); @@ -98,11 +98,11 @@ static gboolean dview_expose(GtkWidget *wdv, GdkEventExpose *event) } gtk_paint_shadow(wdv->style, wdv->window, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - &event->area, wdv, "scrolled_window", - 0, 0, - wdv->allocation.width - (dv->vs ? dv->vsz : 0), - wdv->allocation.height - (dv->hs ? dv->hsz : 0)); + GTK_STATE_NORMAL, GTK_SHADOW_IN, + &event->area, wdv, "scrolled_window", + 0, 0, + wdv->allocation.width - (dv->vs ? dv->vsz : 0), + wdv->allocation.height - (dv->hs ? dv->hsz : 0)); GTK_WIDGET_CLASS(g_type_class_peek_parent(dvc))->expose_event(wdv, event); @@ -241,8 +241,8 @@ static void dview_size_allocate(GtkWidget *wdv, GtkAllocation *allocation) if(gtk_widget_get_realized(wdv)) #endif gdk_window_move_resize(wdv->window, - allocation->x, allocation->y, - allocation->width, allocation->height); + allocation->x, allocation->y, + allocation->width, allocation->height); if(dv->hs) { GtkAllocation al; @@ -347,26 +347,26 @@ static void dview_forall(GtkContainer *dvc, gboolean include_internals, GtkCallb static void dview_class_init(DViewClass *dvc) { #ifndef SDLMAME_WIN32 - GConfClient *conf = gconf_client_get_default(); - char *name = 0; - dvc->fixedfont = 0; + GConfClient *conf = gconf_client_get_default(); + char *name = 0; + dvc->fixedfont = 0; if(conf) name = gconf_client_get_string(conf, "/desktop/gnome/interface/monospace_font_name", 0); - if(name) { - dvc->fixedfont = pango_font_description_from_string(name); - g_free(name); - } + if(name) { + dvc->fixedfont = pango_font_description_from_string(name); + g_free(name); + } - if(!dvc->fixedfont) + if(!dvc->fixedfont) #endif dvc->fixedfont = pango_font_description_from_string("Monospace 10"); - if(!dvc->fixedfont) { + if(!dvc->fixedfont) { mame_printf_error("Couldn't find a monospace font, aborting\n"); abort(); - } + } GTK_CONTAINER_CLASS(dvc)->forall = dview_forall; GTK_WIDGET_CLASS(dvc)->expose_event = dview_expose; @@ -388,7 +388,7 @@ static void dview_init(DView *dv) dvc->fixedfont_width = PANGO_PIXELS(pango_font_metrics_get_approximate_char_width(metrics)); dvc->fixedfont_height = PANGO_PIXELS(pango_font_metrics_get_ascent(metrics) + - pango_font_metrics_get_descent(metrics)); + pango_font_metrics_get_descent(metrics)); } dv->view = 0; diff --git a/src/osd/sdl/dview.h b/src/osd/sdl/dview.h index f6e26aa1441..e8218453fce 100644 --- a/src/osd/sdl/dview.h +++ b/src/osd/sdl/dview.h @@ -26,24 +26,24 @@ struct DView; struct DViewClass { - GtkContainerClass parent_class; - PangoFontDescription *fixedfont; - int fixedfont_width, fixedfont_height; + GtkContainerClass parent_class; + PangoFontDescription *fixedfont; + int fixedfont_width, fixedfont_height; }; struct DView { - GtkContainer parent; - GtkAdjustment *hadj, *vadj; - GtkWidget *hscrollbar, *vscrollbar; - int hsz, vsz; - int hs, vs; - int tr, tc; - gchar *name; - PangoLayout *playout; - GdkGC *gc; - debug_view *view; - int dv_type; + GtkContainer parent; + GtkAdjustment *hadj, *vadj; + GtkWidget *hscrollbar, *vscrollbar; + int hsz, vsz; + int hs, vs; + int tr, tc; + gchar *name; + PangoLayout *playout; + GdkGC *gc; + debug_view *view; + int dv_type; }; diff --git a/src/osd/sdl/gl_shader_mgr.c b/src/osd/sdl/gl_shader_mgr.c index b8a97519894..2a15c9eb9bc 100644 --- a/src/osd/sdl/gl_shader_mgr.c +++ b/src/osd/sdl/gl_shader_mgr.c @@ -14,22 +14,22 @@ static const char * glsl_mamebm_vsh_files [GLSL_VERTEX_SHADER_INT_NUMBER] = { - "/tmp/glsl_general.vsh" // general + "/tmp/glsl_general.vsh" // general }; static const char * glsl_mamebm_fsh_files [GLSL_SHADER_TYPE_NUMBER][GLSL_SHADER_FEAT_INT_NUMBER] = { - {"/tmp/glsl_plain_idx16_lut.fsh", // idx16 lut plain - "/tmp/glsl_bilinear_idx16_lut.fsh" // idx16 lut bilinear - }, + {"/tmp/glsl_plain_idx16_lut.fsh", // idx16 lut plain + "/tmp/glsl_bilinear_idx16_lut.fsh" // idx16 lut bilinear + }, - {"/tmp/glsl_plain_rgb32_lut.fsh", // rgb32 lut plain - "/tmp/glsl_bilinear_rgb32_lut.fsh" // rgb32 lut bilinear - }, + {"/tmp/glsl_plain_rgb32_lut.fsh", // rgb32 lut plain + "/tmp/glsl_bilinear_rgb32_lut.fsh" // rgb32 lut bilinear + }, - {"/tmp/glsl_plain_rgb32_dir.fsh", // rgb32 dir plain - "/tmp/glsl_bilinear_rgb32_dir.fsh" // rgb32 dir bilinear - } + {"/tmp/glsl_plain_rgb32_dir.fsh", // rgb32 dir plain + "/tmp/glsl_bilinear_rgb32_dir.fsh" // rgb32 dir bilinear + } }; #else // GLSL_SOURCE_ON_DISK @@ -47,38 +47,38 @@ static const char * glsl_mamebm_fsh_files [GLSL_SHADER_TYPE_NUMBER][GLSL_SHADER_ static const char * glsl_mamebm_vsh_sources [GLSL_VERTEX_SHADER_INT_NUMBER] = { - glsl_general_vsh_src // general + glsl_general_vsh_src // general }; static const char * glsl_mamebm_fsh_sources [GLSL_SHADER_TYPE_NUMBER][GLSL_SHADER_FEAT_INT_NUMBER] = { - {glsl_plain_idx16_lut_fsh_src, // idx16 lut plain - glsl_bilinear_idx16_lut_fsh_src // idx16 lut bilinear - }, + {glsl_plain_idx16_lut_fsh_src, // idx16 lut plain + glsl_bilinear_idx16_lut_fsh_src // idx16 lut bilinear + }, - {glsl_plain_rgb32_lut_fsh_src, // rgb32 lut plain - glsl_bilinear_rgb32_lut_fsh_src // rgb32 lut bilinear - }, + {glsl_plain_rgb32_lut_fsh_src, // rgb32 lut plain + glsl_bilinear_rgb32_lut_fsh_src // rgb32 lut bilinear + }, - {glsl_plain_rgb32_dir_fsh_src, // rgb32 dir plain - glsl_bilinear_rgb32_dir_fsh_src // rgb32 dir bilinear - } + {glsl_plain_rgb32_dir_fsh_src, // rgb32 dir plain + glsl_bilinear_rgb32_dir_fsh_src // rgb32 dir bilinear + } }; #endif // GLSL_SOURCE_ON_DISK static const char * glsl_mamebm_filter_names [GLSL_SHADER_FEAT_MAX_NUMBER] = { - "plain", - "bilinear", - "custom" + "plain", + "bilinear", + "custom" }; static GLhandleARB glsl_mamebm_programs [GLSL_SHADER_TYPE_NUMBER][GLSL_SHADER_FEAT_MAX_NUMBER+9] = { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* idx16 lut: plain, bilinear, custom0-9, .. */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* rgb32 lut: plain, bilinear, custom0-9, .. */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* rgb32 dir: plain, bilinear, custom0-9, .. */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* idx16 lut: plain, bilinear, custom0-9, .. */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* rgb32 lut: plain, bilinear, custom0-9, .. */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* rgb32 dir: plain, bilinear, custom0-9, .. */ }; /** @@ -86,8 +86,8 @@ static GLhandleARB glsl_mamebm_programs [GLSL_SHADER_TYPE_NUMBER][GLSL_SHADER_FE */ static int glsl_mamebm_fsh2vsh[GLSL_SHADER_FEAT_MAX_NUMBER] = { - 0, // plain -> general - 0, // bilinear -> general + 0, // plain -> general + 0, // bilinear -> general 1, // custom -> custom }; @@ -96,14 +96,14 @@ static GLhandleARB glsl_mamebm_vsh_shader[GLSL_VERTEX_SHADER_MAX_NUMBER+9] = static GLhandleARB glsl_mamebm_fsh_shader [GLSL_SHADER_TYPE_NUMBER][GLSL_SHADER_FEAT_MAX_NUMBER+9] = { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* idx16 lut: plain, bilinear, custom0-9 */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* rgb32 lut: plain, bilinear, custom0-9 */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* rgb32 dir: plain, bilinear, custom0-9 */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* idx16 lut: plain, bilinear, custom0-9 */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* rgb32 lut: plain, bilinear, custom0-9 */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* rgb32 dir: plain, bilinear, custom0-9 */ }; static GLhandleARB glsl_scrn_programs [10] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /* rgb32: custom0-9, .. */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /* rgb32: custom0-9, .. */ }; static GLhandleARB glsl_scrn_vsh_shader[10] = @@ -143,7 +143,7 @@ glsl_shader_info *glsl_shader_init(void) { int i,j, err; - err = gl_shader_loadExtention((PFNGLGETPROCADDRESSOS)SDL_GL_GetProcAddress); + err = gl_shader_loadExtention((PFNGLGETPROCADDRESSOS)SDL_GL_GetProcAddress); if(err) return NULL; for (i=0; !err && i<GLSL_VERTEX_SHADER_INT_NUMBER; i++) @@ -189,7 +189,7 @@ int glsl_shader_free(glsl_shader_info *shinfo) int i,j; pfn_glUseProgramObjectARB(0); // back to fixed function pipeline - glFinish(); + glFinish(); for (i=0; i<GLSL_VERTEX_SHADER_MAX_NUMBER+9; i++) { @@ -280,4 +280,3 @@ int glsl_shader_add_scrn(glsl_shader_info *shinfo, const char * custShaderPrefix NULL /*precompiled*/, fname, 0); return err; } - diff --git a/src/osd/sdl/gl_shader_tool.c b/src/osd/sdl/gl_shader_tool.c index 7fee63e84ed..11f2c325f69 100644 --- a/src/osd/sdl/gl_shader_tool.c +++ b/src/osd/sdl/gl_shader_tool.c @@ -80,12 +80,12 @@ int gl_shader_loadExtention(PFNGLGETPROCADDRESSOS GetProcAddress) pfn_glUniform4ivARB = (PFNGLUNIFORM4IVARBPROC) GetProcAddress ("glUniform4ivARB"); if ( pfn_glGetObjectParameterivARB && pfn_glGetInfoLogARB && pfn_glDeleteObjectARB && pfn_glCreateShaderObjectARB && - pfn_glShaderSourceARB && pfn_glCompileShaderARB && pfn_glCreateProgramObjectARB && pfn_glAttachObjectARB && - pfn_glLinkProgramARB && pfn_glValidateProgramARB && pfn_glUseProgramObjectARB && pfn_glGetUniformLocationARB && - pfn_glGetUniformLocationARB && pfn_glUniform1fARB && pfn_glUniform1iARB && - pfn_glUniform1fvARB && pfn_glUniform2fvARB && pfn_glUniform3fvARB && pfn_glUniform4fvARB && - pfn_glUniform1ivARB && pfn_glUniform2ivARB && pfn_glUniform3ivARB && pfn_glUniform4ivARB - ) + pfn_glShaderSourceARB && pfn_glCompileShaderARB && pfn_glCreateProgramObjectARB && pfn_glAttachObjectARB && + pfn_glLinkProgramARB && pfn_glValidateProgramARB && pfn_glUseProgramObjectARB && pfn_glGetUniformLocationARB && + pfn_glGetUniformLocationARB && pfn_glUniform1fARB && pfn_glUniform1iARB && + pfn_glUniform1fvARB && pfn_glUniform2fvARB && pfn_glUniform3fvARB && pfn_glUniform4fvARB && + pfn_glUniform1ivARB && pfn_glUniform2ivARB && pfn_glUniform3ivARB && pfn_glUniform4ivARB + ) { return 0; } @@ -120,37 +120,37 @@ int gl_shader_loadExtention(PFNGLGETPROCADDRESSOS GetProcAddress) int gl_check_error(GLSLCheckMode m, const char *file, const int line) { - GLenum glerr = glGetError(); + GLenum glerr = glGetError(); - if (GL_NO_ERROR != glerr) - { - if ( CHECK_VERBOSE <= m ) - { + if (GL_NO_ERROR != glerr) + { + if ( CHECK_VERBOSE <= m ) + { mame_printf_warning( "%s:%d: GL Error: %d 0x%X\n", file, line, (int)glerr, (unsigned int)glerr); - } - } + } + } return (GL_NO_ERROR != glerr)? glerr : 0; } int gl_shader_check_error(GLhandleARB obj, GLenum obj_query, GLSLCheckMode m, const char *file, const int line) { - GLsizei length; - GLcharARB buffer[255]; - GLenum glerr; - GLint param; - int res=0; + GLsizei length; + GLcharARB buffer[255]; + GLenum glerr; + GLint param; + int res=0; - glerr = gl_check_error(m, file, line); + glerr = gl_check_error(m, file, line); if(!obj) return glerr; if(obj_query != GL_OBJECT_TYPE_ARB && - obj_query != GL_OBJECT_DELETE_STATUS_ARB && - obj_query != GL_OBJECT_COMPILE_STATUS_ARB && - obj_query != GL_OBJECT_LINK_STATUS_ARB && - obj_query != GL_OBJECT_VALIDATE_STATUS_ARB - ) + obj_query != GL_OBJECT_DELETE_STATUS_ARB && + obj_query != GL_OBJECT_COMPILE_STATUS_ARB && + obj_query != GL_OBJECT_LINK_STATUS_ARB && + obj_query != GL_OBJECT_VALIDATE_STATUS_ARB + ) { mame_printf_warning("%s:%d: GL Error: gl_shader_check_error unsupported object query 0x%X\n", file, line, (unsigned int)obj_query); return -1; @@ -160,7 +160,7 @@ int gl_shader_check_error(GLhandleARB obj, GLenum obj_query, GLSLCheckMode m, co switch(obj_query) { - case GL_OBJECT_TYPE_ARB: + case GL_OBJECT_TYPE_ARB: if( param!=GL_PROGRAM_OBJECT_ARB && param!=GL_SHADER_OBJECT_ARB ) { if ( CHECK_VERBOSE <= m ) @@ -174,7 +174,7 @@ int gl_shader_check_error(GLhandleARB obj, GLenum obj_query, GLSLCheckMode m, co mame_printf_warning("%s:%d: GL Info: object type 0x%X is SHADER, successful\n", file, line, (unsigned int)(FPTR)obj); } break; - case GL_OBJECT_DELETE_STATUS_ARB: + case GL_OBJECT_DELETE_STATUS_ARB: if(param!=1) { if ( CHECK_ALWAYS_VERBOSE <= m ) @@ -184,7 +184,7 @@ int gl_shader_check_error(GLhandleARB obj, GLenum obj_query, GLSLCheckMode m, co mame_printf_warning("%s:%d: GL Info: object 0x%X deletion successful\n", file, line, (unsigned int)(FPTR)obj); } break; - case GL_OBJECT_COMPILE_STATUS_ARB: + case GL_OBJECT_COMPILE_STATUS_ARB: if(param!=1) { if ( CHECK_VERBOSE <= m ) @@ -195,7 +195,7 @@ int gl_shader_check_error(GLhandleARB obj, GLenum obj_query, GLSLCheckMode m, co mame_printf_warning("%s:%d: GL Info: object 0x%X compiled successful\n", file, line, (unsigned int)(FPTR)obj); } break; - case GL_OBJECT_LINK_STATUS_ARB: + case GL_OBJECT_LINK_STATUS_ARB: if(param!=1) { if ( CHECK_VERBOSE <= m ) @@ -206,7 +206,7 @@ int gl_shader_check_error(GLhandleARB obj, GLenum obj_query, GLSLCheckMode m, co mame_printf_warning("%s:%d: GL Info: object 0x%X linked successful\n", file, line, (unsigned int)(FPTR)obj); } break; - case GL_OBJECT_VALIDATE_STATUS_ARB: + case GL_OBJECT_VALIDATE_STATUS_ARB: if(param!=1) { if ( CHECK_VERBOSE <= m ) @@ -217,7 +217,7 @@ int gl_shader_check_error(GLhandleARB obj, GLenum obj_query, GLSLCheckMode m, co mame_printf_warning("%s:%d: GL Info: object 0x%X validation successful\n", file, line, (unsigned int)(FPTR)obj); } break; - } + } if ( res<0 || CHECK_ALWAYS_VERBOSE <= m ) { @@ -247,28 +247,28 @@ int gl_round_to_pow2(int v) } int gl_texture_check_size(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, - GLint border, GLenum format, GLenum type, - GLint *avail_width, GLint *avail_height, - int verbose) + GLint border, GLenum format, GLenum type, + GLint *avail_width, GLint *avail_height, + int verbose) { - int err=1; - GLenum texTargetProxy = (target==GL_TEXTURE_RECTANGLE_ARB)?GL_PROXY_TEXTURE_RECTANGLE_ARB:GL_PROXY_TEXTURE_2D; + int err=1; + GLenum texTargetProxy = (target==GL_TEXTURE_RECTANGLE_ARB)?GL_PROXY_TEXTURE_RECTANGLE_ARB:GL_PROXY_TEXTURE_2D; - if ( !avail_width || !avail_height) + if ( !avail_width || !avail_height) return -1; - *avail_width = 0; - *avail_height = 0; + *avail_width = 0; + *avail_height = 0; - GL_CHECK_ERROR_QUIET(); + GL_CHECK_ERROR_QUIET(); - /* Test the max texture size */ - while(err && width>=1 && height>=1 /* && width>=64 && height>=64 */) - { + /* Test the max texture size */ + while(err && width>=1 && height>=1 /* && width>=64 && height>=64 */) + { glTexImage2D (texTargetProxy, level, - internalFormat, - width, height, - border, format, type, NULL); + internalFormat, + width, height, + border, format, type, NULL); if ( 0!=(err=GL_CHECK_ERROR_NORMAL() )) return err; glGetTexLevelParameteriv( texTargetProxy, level, GL_TEXTURE_WIDTH, avail_width); @@ -282,10 +282,10 @@ int gl_texture_check_size(GLenum target, GLint level, GLint internalFormat, GLsi if(verbose) { mame_printf_warning("gl_texture_size_check: " - "TexImage2D(0x%X, %d, 0x%X, %d, %d, %d, 0x%X, 0x%X): returned size does not match: %dx%d\n", + "TexImage2D(0x%X, %d, 0x%X, %d, %d, %d, 0x%X, 0x%X): returned size does not match: %dx%d\n", (unsigned int)target, (int)level, (int)internalFormat, (int)width, (int)height, (int)border, (unsigned int)format, (unsigned int)type, - (int)*avail_width, (int)*avail_height); + (int)*avail_width, (int)*avail_height); } if ( (*avail_width) == width ) @@ -293,9 +293,9 @@ int gl_texture_check_size(GLenum target, GLint level, GLint internalFormat, GLsi else if ( (*avail_height) == height ) width /= 2; else if (width > height) - width /= 2; + width /= 2; else - height /= 2; + height /= 2; if(verbose) { fprintf (stderr, "gl_texture_size_check: trying [%dx%d] !\n", (int)height, (int)width); @@ -303,13 +303,13 @@ int gl_texture_check_size(GLenum target, GLint level, GLint internalFormat, GLsi } else { err=0; } - } - if(!err) - { - *avail_width = width; - *avail_height = height; - } - return err; + } + if(!err) + { + *avail_width = width; + *avail_height = height; + } + return err; } static int delete_shader_tool( GLhandleARB *program, GLhandleARB *vertex_shader, GLhandleARB *fragment_shader, int externalcall) @@ -345,12 +345,12 @@ static int delete_shader_tool( GLhandleARB *program, GLhandleARB *vertex_shader, *fragment_shader=0; } - return res; + return res; } int gl_compile_shader_source( GLhandleARB *shader, GLenum type, const char * shader_source, int verbose ) { - int err = 0; + int err = 0; if(shader==NULL || shader_source==NULL) { @@ -360,15 +360,15 @@ int gl_compile_shader_source( GLhandleARB *shader, GLenum type, const char * sha mame_printf_warning("error: gl_compile_shader_source: NULL shader source passed\n"); return -1; } - *shader = pfn_glCreateShaderObjectARB(type); + *shader = pfn_glCreateShaderObjectARB(type); err=GL_SHADER_CHECK(*shader, GL_OBJECT_TYPE_ARB); - if(err) goto errout; + if(err) goto errout; - pfn_glShaderSourceARB(*shader, 1, (const GLcharARB **)&shader_source, NULL); + pfn_glShaderSourceARB(*shader, 1, (const GLcharARB **)&shader_source, NULL); - pfn_glCompileShaderARB(*shader); - err=GL_SHADER_CHECK(*shader, GL_OBJECT_COMPILE_STATUS_ARB); - if(err) goto errout; + pfn_glCompileShaderARB(*shader); + err=GL_SHADER_CHECK(*shader, GL_OBJECT_COMPILE_STATUS_ARB); + if(err) goto errout; if(verbose) mame_printf_warning( "<%s>\n", shader_source); @@ -381,12 +381,12 @@ errout: pfn_glDeleteObjectARB(*shader); } mame_printf_warning("failed to process shader: <%s>\n", shader_source); - return err; + return err; } int gl_compile_shader_file( GLhandleARB *shader, GLenum type, const char * shader_file, int verbose ) { - int err = 0, i, c; + int err = 0, i, c; FILE * file = NULL; const int buffer_len=8192; GLcharARB *buffer=NULL; @@ -410,7 +410,7 @@ int gl_compile_shader_file( GLhandleARB *shader, GLenum type, const char * shade buffer = (GLcharARB *) malloc(buffer_len); memset(buffer, 0, buffer_len); - /* Load Shader Sources */ + /* Load Shader Sources */ i=0; while( i<buffer_len-1 && EOF!=(c=fgetc(file)) ) buffer[i++]=(char)c; @@ -418,7 +418,7 @@ int gl_compile_shader_file( GLhandleARB *shader, GLenum type, const char * shade buffer[i]='\0'; err=gl_compile_shader_source(shader, type, buffer, verbose); - if(err) goto errout; + if(err) goto errout; free(buffer); @@ -430,15 +430,15 @@ int gl_compile_shader_file( GLhandleARB *shader, GLenum type, const char * shade errout: free(buffer); mame_printf_warning("failed to process shader_file: %s\n", shader_file); - return err; + return err; } int gl_compile_shader_files( GLhandleARB *program, GLhandleARB *vertex_shader, GLhandleARB *fragment_shader, - const char * vertex_shader_file, - const char * fragment_shader_file, - int verbose - ) + const char * vertex_shader_file, + const char * fragment_shader_file, + int verbose + ) { int err; @@ -461,9 +461,9 @@ int gl_compile_shader_files( GLhandleARB *program, GLhandleARB *vertex_shader, G goto errout; } - *program = pfn_glCreateProgramObjectARB(); - err=GL_SHADER_CHECK(*program, GL_OBJECT_TYPE_ARB); - if(err) goto errout; + *program = pfn_glCreateProgramObjectARB(); + err=GL_SHADER_CHECK(*program, GL_OBJECT_TYPE_ARB); + if(err) goto errout; if(!vertex_shader_file) { @@ -479,7 +479,7 @@ int gl_compile_shader_files( GLhandleARB *program, GLhandleARB *vertex_shader, G err = gl_compile_shader_file(vertex_shader, GL_VERTEX_SHADER_ARB, vertex_shader_file, verbose); if(err) return err; } - pfn_glAttachObjectARB(*program, *vertex_shader); + pfn_glAttachObjectARB(*program, *vertex_shader); if(!fragment_shader_file) { @@ -495,30 +495,30 @@ int gl_compile_shader_files( GLhandleARB *program, GLhandleARB *vertex_shader, G err = gl_compile_shader_file(fragment_shader, GL_FRAGMENT_SHADER_ARB, fragment_shader_file, verbose); if(err) return err; } - pfn_glAttachObjectARB(*program, *fragment_shader); + pfn_glAttachObjectARB(*program, *fragment_shader); - pfn_glLinkProgramARB(*program); - err=GL_SHADER_CHECK(*program, GL_OBJECT_LINK_STATUS_ARB); - if(err) goto errout; + pfn_glLinkProgramARB(*program); + err=GL_SHADER_CHECK(*program, GL_OBJECT_LINK_STATUS_ARB); + if(err) goto errout; - pfn_glValidateProgramARB(*program); - err=GL_SHADER_CHECK(*program, GL_OBJECT_VALIDATE_STATUS_ARB); - if(err) goto errout; + pfn_glValidateProgramARB(*program); + err=GL_SHADER_CHECK(*program, GL_OBJECT_VALIDATE_STATUS_ARB); + if(err) goto errout; - return 0; + return 0; errout: - delete_shader_tool(program, vertex_shader, fragment_shader, 0); - return err; + delete_shader_tool(program, vertex_shader, fragment_shader, 0); + return err; } int gl_compile_shader_sources( GLhandleARB *program, GLhandleARB *vertex_shader, GLhandleARB *fragment_shader, - const GLcharARB * vertex_shader_source, - const GLcharARB * fragment_shader_source - ) + const GLcharARB * vertex_shader_source, + const GLcharARB * fragment_shader_source + ) { - int err = 0; + int err = 0; if (!program) { @@ -539,9 +539,9 @@ int gl_compile_shader_sources( GLhandleARB *program, GLhandleARB *vertex_shader, goto errout; } - *program = pfn_glCreateProgramObjectARB(); - err=GL_SHADER_CHECK(*program, GL_OBJECT_TYPE_ARB); - if(err) goto errout; + *program = pfn_glCreateProgramObjectARB(); + err=GL_SHADER_CHECK(*program, GL_OBJECT_TYPE_ARB); + if(err) goto errout; if(!vertex_shader_source) { @@ -571,38 +571,38 @@ int gl_compile_shader_sources( GLhandleARB *program, GLhandleARB *vertex_shader, err=gl_compile_shader_source(vertex_shader, GL_VERTEX_SHADER_ARB, vertex_shader_source, 0); if(err) goto errout; } - pfn_glAttachObjectARB(*program, *vertex_shader); + pfn_glAttachObjectARB(*program, *vertex_shader); if(fragment_shader_source) { err=gl_compile_shader_source(fragment_shader, GL_FRAGMENT_SHADER_ARB, fragment_shader_source, 0); if(err) goto errout; } - pfn_glAttachObjectARB(*program, *fragment_shader); + pfn_glAttachObjectARB(*program, *fragment_shader); - pfn_glLinkProgramARB(*program); - err=GL_SHADER_CHECK(*program, GL_OBJECT_LINK_STATUS_ARB); - if(err) { + pfn_glLinkProgramARB(*program); + err=GL_SHADER_CHECK(*program, GL_OBJECT_LINK_STATUS_ARB); + if(err) { mame_printf_warning("failed to link program\n"); mame_printf_warning("vertex shader: <%s>\n", vertex_shader_source); mame_printf_warning("fragment shader: <%s>\n", fragment_shader_source); goto errout; } - pfn_glValidateProgramARB(*program); - err=GL_SHADER_CHECK(*program, GL_OBJECT_VALIDATE_STATUS_ARB); - if(err) { + pfn_glValidateProgramARB(*program); + err=GL_SHADER_CHECK(*program, GL_OBJECT_VALIDATE_STATUS_ARB); + if(err) { mame_printf_warning("failed to validate program\n"); mame_printf_warning("vertex shader: <%s>\n", vertex_shader_source); mame_printf_warning("fragment shader: <%s>\n", fragment_shader_source); goto errout; } - return 0; + return 0; errout: - delete_shader_tool(program, vertex_shader, fragment_shader, 0); - return err; + delete_shader_tool(program, vertex_shader, fragment_shader, 0); + return err; } @@ -611,5 +611,3 @@ int gl_delete_shader( GLhandleARB *program, GLhandleARB *vertex_shader, GLhandle { return delete_shader_tool(program, vertex_shader, fragment_shader, 1); } - - diff --git a/src/osd/sdl/gl_shader_tool.h b/src/osd/sdl/gl_shader_tool.h index 84174a40d7f..2013021a844 100644 --- a/src/osd/sdl/gl_shader_tool.h +++ b/src/osd/sdl/gl_shader_tool.h @@ -74,9 +74,9 @@ typedef void * (APIENTRYP PFNGLGETPROCADDRESSOS)(const char *procName); int gl_shader_loadExtention(PFNGLGETPROCADDRESSOS GetProcAddress); enum GLSLCheckMode { - CHECK_QUIET, /* just return 0, if no error, otherwise the GL error code, no stderr output */ - CHECK_VERBOSE, /* same as CHECK_QUIET, but in the case of an error, use stderr to be verbose */ - CHECK_ALWAYS_VERBOSE /* always print out all information available */ + CHECK_QUIET, /* just return 0, if no error, otherwise the GL error code, no stderr output */ + CHECK_VERBOSE, /* same as CHECK_QUIET, but in the case of an error, use stderr to be verbose */ + CHECK_ALWAYS_VERBOSE /* always print out all information available */ }; #define GL_CHECK_ERROR_VERBOSE() gl_check_error(CHECK_ALWAYS_VERBOSE,__FILE__,__LINE__) @@ -100,9 +100,9 @@ enum GLSLCheckMode { int gl_check_error(GLSLCheckMode m, const char *file, const int line); int gl_texture_check_size(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, - GLint border, GLenum format, GLenum type, - GLsizei *avail_width, GLsizei *avail_height, - int verbose); + GLint border, GLenum format, GLenum type, + GLsizei *avail_width, GLsizei *avail_height, + int verbose); int gl_round_to_pow2(int v); @@ -122,26 +122,26 @@ int gl_compile_shader_source( GLhandleARB *shader, GLenum type, const char * sha * this is true for both, vertex and fragment shaders. */ int gl_compile_shader_files( GLhandleARB *program, GLhandleARB *vertex_shader, GLhandleARB *fragment_shader, - const char * vertex_shader_file, - const char * fragment_shader_file, - int verbose - ); + const char * vertex_shader_file, + const char * fragment_shader_file, + int verbose + ); /** * you can pass either a valid shader_file, or a precompiled vertex_shader, * this is true for both, vertex and fragment shaders. */ int gl_compile_shader_sources( GLhandleARB *program, GLhandleARB *vertex_shader, GLhandleARB *fragment_shader, - const GLcharARB * vertex_shader_source, - const GLcharARB * fragment_shader_source - ); + const GLcharARB * vertex_shader_source, + const GLcharARB * fragment_shader_source + ); int gl_delete_shader( GLhandleARB *program, GLhandleARB *vertex_shader, GLhandleARB *fragment_shader ); #if defined(SDLMAME_MACOSX) #ifndef GL_ARB_shader_objects - typedef char GLcharARB; - typedef unsigned int GLhandleARB; + typedef char GLcharARB; + typedef unsigned int GLhandleARB; #endif typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); diff --git a/src/osd/sdl/input.c b/src/osd/sdl/input.c index 75aa92fcdd6..933c2799f0b 100644 --- a/src/osd/sdl/input.c +++ b/src/osd/sdl/input.c @@ -53,12 +53,12 @@ enum POVDIR_DOWN }; -#define MAX_KEYS 256 -#define MAX_AXES 32 -#define MAX_BUTTONS 32 -#define MAX_HATS 8 -#define MAX_POV 4 -#define MAX_DEVMAP_ENTRIES 16 +#define MAX_KEYS 256 +#define MAX_AXES 32 +#define MAX_BUTTONS 32 +#define MAX_HATS 8 +#define MAX_POV 4 +#define MAX_DEVMAP_ENTRIES 16 #if (USE_XINPUT) //For xinput @@ -79,7 +79,7 @@ static int proximity_out_type = INVALID_EVENT_TYPE; // introduced in 1.3 #ifndef SDLK_INDEX -#define SDLK_INDEX(x) (x) +#define SDLK_INDEX(x) (x) #endif @@ -90,9 +90,9 @@ static int proximity_out_type = INVALID_EVENT_TYPE; // state information for a keyboard struct keyboard_state { - INT32 state[0x3ff]; // must be INT32! - INT8 oldkey[MAX_KEYS]; - INT8 currkey[MAX_KEYS]; + INT32 state[0x3ff]; // must be INT32! + INT8 oldkey[MAX_KEYS]; + INT8 currkey[MAX_KEYS]; }; @@ -118,11 +118,11 @@ struct joystick_state // state information for a lightgun struct lightgun_state { - INT32 lX, lY; - INT32 buttons[MAX_BUTTONS]; - XID deviceid; //Xinput device id - INT32 maxx,maxy; - INT32 minx,miny; + INT32 lX, lY; + INT32 buttons[MAX_BUTTONS]; + XID deviceid; //Xinput device id + INT32 maxx,maxy; + INT32 minx,miny; }; #endif @@ -130,21 +130,21 @@ struct lightgun_state struct device_info { // device information - device_info ** head; - device_info * next; - char * name; + device_info ** head; + device_info * next; + char * name; // MAME information - input_device * device; + input_device * device; // device state union { - keyboard_state keyboard; - mouse_state mouse; - joystick_state joystick; + keyboard_state keyboard; + mouse_state mouse; + joystick_state joystick; #if (USE_XINPUT) - lightgun_state lightgun; + lightgun_state lightgun; #endif }; }; @@ -155,40 +155,40 @@ struct device_info //============================================================ // global states -static osd_lock * input_lock; -static UINT8 input_paused; +static osd_lock * input_lock; +static UINT8 input_paused; -static sdl_window_info * focus_window = NULL; +static sdl_window_info * focus_window = NULL; // input buffer - only for SDLMAME_EVENTS_IN_WORKER_THREAD -#define MAX_BUF_EVENTS (500) /* 100 not enough for SDL 1.3 */ -static SDL_Event event_buf[MAX_BUF_EVENTS]; -static int event_buf_count; +#define MAX_BUF_EVENTS (500) /* 100 not enough for SDL 1.3 */ +static SDL_Event event_buf[MAX_BUF_EVENTS]; +static int event_buf_count; // keyboard states -static device_info * keyboard_list; +static device_info * keyboard_list; // mouse states -static UINT8 app_has_mouse_focus; -static UINT8 mouse_enabled; -static device_info * mouse_list; +static UINT8 app_has_mouse_focus; +static UINT8 mouse_enabled; +static device_info * mouse_list; // lightgun states -static UINT8 lightgun_enabled; -static device_info * lightgun_list; +static UINT8 lightgun_enabled; +static device_info * lightgun_list; // joystick states -static device_info * joystick_list; +static device_info * joystick_list; // joystick mapper struct device_map_t { struct { - char *name; - int physical; + char *name; + int physical; } map[MAX_DEVMAP_ENTRIES]; - int logical[MAX_DEVMAP_ENTRIES]; + int logical[MAX_DEVMAP_ENTRIES]; int initialized; }; @@ -231,12 +231,12 @@ static device_info *generic_device_find_index(device_info *devlist_head, int ind // master keyboard translation table struct kt_table { - input_item_id mame_key; - INT32 sdl_key; + input_item_id mame_key; + INT32 sdl_key; //const char * vkey; //const char * ascii; - const char * mame_key_name; - char * ui_name; + const char * mame_key_name; + char * ui_name; }; #if (SDLMAME_SDL2) @@ -260,113 +260,113 @@ struct kt_table { static kt_table sdl_key_trans_table[] = { // MAME key SDL key vkey ascii - KTT_ENTRY0( ESC, ESCAPE, 0x1b, 0x1b, "ESC" ), // 0 - KTT_ENTRY1( 1, 1 ), // 1 - KTT_ENTRY1( 2, 2 ), // 2 - KTT_ENTRY1( 3, 3 ), // 3 - KTT_ENTRY1( 4, 4 ), // 4 - KTT_ENTRY1( 5, 5 ), // 5 - KTT_ENTRY1( 6, 6 ), // 6 - KTT_ENTRY1( 7, 7 ), // 7 - KTT_ENTRY1( 8, 8 ), // 8 - KTT_ENTRY1( 9, 9 ), // 9 - KTT_ENTRY1( 0, 0 ), // 10 - KTT_ENTRY0( MINUS, MINUS, 0xbd, '-', "MINUS" ), // 11 - KTT_ENTRY0( EQUALS, EQUALS, 0xbb, '=', "EQUALS" ), // 12 - KTT_ENTRY0( BACKSPACE, BACKSPACE, 0x08, 0x08, "BACKSPACE" ), // 13 - KTT_ENTRY0( TAB, TAB, 0x09, 0x09, "TAB" ), // 14 - KTT_ENTRY1( Q, Q ), // 15 - KTT_ENTRY1( W, W ), // 16 - KTT_ENTRY1( E, E ), // 17 - KTT_ENTRY1( R, R ), // 18 - KTT_ENTRY1( T, T ), // 19 - KTT_ENTRY1( Y, Y ), // 20 - KTT_ENTRY1( U, U ), // 21 - KTT_ENTRY1( I, I ), // 22 - KTT_ENTRY1( O, O ), // 23 - KTT_ENTRY1( P, P ), // 24 - KTT_ENTRY0( OPENBRACE, LEFTBRACKET, 0xdb, '[', "OPENBRACE" ), // 25 - KTT_ENTRY0( CLOSEBRACE,RIGHTBRACKET, 0xdd, ']', "CLOSEBRACE" ), // 26 - KTT_ENTRY0( ENTER, RETURN, 0x0d, 0x0d, "RETURN" ), // 27 - KTT_ENTRY2( LCONTROL, LCTRL ), // 28 - KTT_ENTRY1( A, A ), // 29 - KTT_ENTRY1( S, S ), // 30 - KTT_ENTRY1( D, D ), // 31 - KTT_ENTRY1( F, F ), // 32 - KTT_ENTRY1( G, G ), // 33 - KTT_ENTRY1( H, H ), // 34 - KTT_ENTRY1( J, J ), // 35 - KTT_ENTRY1( K, K ), // 36 - KTT_ENTRY1( L, L ), // 37 - KTT_ENTRY0( COLON, SEMICOLON, 0xba, ';', "COLON" ), // 38 - KTT_ENTRY0( QUOTE, APOSTROPHE, 0xde, '\'', "QUOTE" ), // 39 - KTT_ENTRY2( LSHIFT, LSHIFT ), // 40 - KTT_ENTRY0( BACKSLASH, BACKSLASH, 0xdc, '\\', "BACKSLASH" ), // 41 - KTT_ENTRY1( Z, Z ), // 42 - KTT_ENTRY1( X, X ), // 43 - KTT_ENTRY1( C, C ), // 44 - KTT_ENTRY1( V, V ), // 45 - KTT_ENTRY1( B, B ), // 46 - KTT_ENTRY1( N, N ), // 47 - KTT_ENTRY1( M, M ), // 48 - KTT_ENTRY0( COMMA, COMMA, 0xbc, ',', "COMMA" ), // 49 - KTT_ENTRY0( STOP, PERIOD, 0xbe, '.', "STOP" ), // 50 - KTT_ENTRY0( SLASH, SLASH, 0xbf, '/', "SLASH" ), // 51 - KTT_ENTRY2( RSHIFT, RSHIFT ), // 52 - KTT_ENTRY0( ASTERISK, KP_MULTIPLY, '*', '*', "ASTERIX" ), // 53 - KTT_ENTRY2( LALT, LALT ), // 54 - KTT_ENTRY0( SPACE, SPACE, ' ', ' ', "SPACE" ), // 55 - KTT_ENTRY2( CAPSLOCK, CAPSLOCK ), // 56 - KTT_ENTRY2( F1, F1 ), // 57 - KTT_ENTRY2( F2, F2 ), // 58 - KTT_ENTRY2( F3, F3 ), // 59 - KTT_ENTRY2( F4, F4 ), // 60 - KTT_ENTRY2( F5, F5 ), // 61 - KTT_ENTRY2( F6, F6 ), // 62 - KTT_ENTRY2( F7, F7 ), // 63 - KTT_ENTRY2( F8, F8 ), // 64 - KTT_ENTRY2( F9, F9 ), // 65 - KTT_ENTRY2( F10, F10 ), // 66 - KTT_ENTRY2( NUMLOCK, NUMLOCKCLEAR ), // 67 - KTT_ENTRY2( SCRLOCK, SCROLLLOCK ), // 68 - KTT_ENTRY2( 7_PAD, KP_7 ), // 69 - KTT_ENTRY2( 8_PAD, KP_8 ), - KTT_ENTRY2( 9_PAD, KP_9 ), - KTT_ENTRY2( MINUS_PAD, KP_MINUS ), - KTT_ENTRY2( 4_PAD, KP_4 ), - KTT_ENTRY2( 5_PAD, KP_5 ), - KTT_ENTRY2( 6_PAD, KP_6 ), - KTT_ENTRY2( PLUS_PAD, KP_PLUS ), - KTT_ENTRY2( 1_PAD, KP_1 ), - KTT_ENTRY2( 2_PAD, KP_2 ), - KTT_ENTRY2( 3_PAD, KP_3 ), - KTT_ENTRY2( 0_PAD, KP_0 ), - KTT_ENTRY2( DEL_PAD, KP_PERIOD ), - KTT_ENTRY2( F11, F11 ), - KTT_ENTRY2( F12, F12 ), - KTT_ENTRY2( F13, F13 ), - KTT_ENTRY2( F14, F14 ), - KTT_ENTRY2( F15, F15 ), - KTT_ENTRY2( ENTER_PAD, KP_ENTER ), - KTT_ENTRY2( RCONTROL, RCTRL ), - KTT_ENTRY2( SLASH_PAD, KP_DIVIDE ), - KTT_ENTRY2( PRTSCR, PRINTSCREEN ), - KTT_ENTRY2( RALT, RALT ), - KTT_ENTRY2( HOME, HOME ), - KTT_ENTRY2( UP, UP ), - KTT_ENTRY2( PGUP, PAGEUP ), - KTT_ENTRY2( LEFT, LEFT ), - KTT_ENTRY2( RIGHT, RIGHT ), - KTT_ENTRY2( END, END ), - KTT_ENTRY2( DOWN, DOWN ), - KTT_ENTRY2( PGDN, PAGEDOWN ), - KTT_ENTRY2( INSERT, INSERT ), + KTT_ENTRY0( ESC, ESCAPE, 0x1b, 0x1b, "ESC" ), // 0 + KTT_ENTRY1( 1, 1 ), // 1 + KTT_ENTRY1( 2, 2 ), // 2 + KTT_ENTRY1( 3, 3 ), // 3 + KTT_ENTRY1( 4, 4 ), // 4 + KTT_ENTRY1( 5, 5 ), // 5 + KTT_ENTRY1( 6, 6 ), // 6 + KTT_ENTRY1( 7, 7 ), // 7 + KTT_ENTRY1( 8, 8 ), // 8 + KTT_ENTRY1( 9, 9 ), // 9 + KTT_ENTRY1( 0, 0 ), // 10 + KTT_ENTRY0( MINUS, MINUS, 0xbd, '-', "MINUS" ), // 11 + KTT_ENTRY0( EQUALS, EQUALS, 0xbb, '=', "EQUALS" ), // 12 + KTT_ENTRY0( BACKSPACE, BACKSPACE, 0x08, 0x08, "BACKSPACE" ), // 13 + KTT_ENTRY0( TAB, TAB, 0x09, 0x09, "TAB" ), // 14 + KTT_ENTRY1( Q, Q ), // 15 + KTT_ENTRY1( W, W ), // 16 + KTT_ENTRY1( E, E ), // 17 + KTT_ENTRY1( R, R ), // 18 + KTT_ENTRY1( T, T ), // 19 + KTT_ENTRY1( Y, Y ), // 20 + KTT_ENTRY1( U, U ), // 21 + KTT_ENTRY1( I, I ), // 22 + KTT_ENTRY1( O, O ), // 23 + KTT_ENTRY1( P, P ), // 24 + KTT_ENTRY0( OPENBRACE, LEFTBRACKET, 0xdb, '[', "OPENBRACE" ), // 25 + KTT_ENTRY0( CLOSEBRACE,RIGHTBRACKET, 0xdd, ']', "CLOSEBRACE" ), // 26 + KTT_ENTRY0( ENTER, RETURN, 0x0d, 0x0d, "RETURN" ), // 27 + KTT_ENTRY2( LCONTROL, LCTRL ), // 28 + KTT_ENTRY1( A, A ), // 29 + KTT_ENTRY1( S, S ), // 30 + KTT_ENTRY1( D, D ), // 31 + KTT_ENTRY1( F, F ), // 32 + KTT_ENTRY1( G, G ), // 33 + KTT_ENTRY1( H, H ), // 34 + KTT_ENTRY1( J, J ), // 35 + KTT_ENTRY1( K, K ), // 36 + KTT_ENTRY1( L, L ), // 37 + KTT_ENTRY0( COLON, SEMICOLON, 0xba, ';', "COLON" ), // 38 + KTT_ENTRY0( QUOTE, APOSTROPHE, 0xde, '\'', "QUOTE" ), // 39 + KTT_ENTRY2( LSHIFT, LSHIFT ), // 40 + KTT_ENTRY0( BACKSLASH, BACKSLASH, 0xdc, '\\', "BACKSLASH" ), // 41 + KTT_ENTRY1( Z, Z ), // 42 + KTT_ENTRY1( X, X ), // 43 + KTT_ENTRY1( C, C ), // 44 + KTT_ENTRY1( V, V ), // 45 + KTT_ENTRY1( B, B ), // 46 + KTT_ENTRY1( N, N ), // 47 + KTT_ENTRY1( M, M ), // 48 + KTT_ENTRY0( COMMA, COMMA, 0xbc, ',', "COMMA" ), // 49 + KTT_ENTRY0( STOP, PERIOD, 0xbe, '.', "STOP" ), // 50 + KTT_ENTRY0( SLASH, SLASH, 0xbf, '/', "SLASH" ), // 51 + KTT_ENTRY2( RSHIFT, RSHIFT ), // 52 + KTT_ENTRY0( ASTERISK, KP_MULTIPLY, '*', '*', "ASTERIX" ), // 53 + KTT_ENTRY2( LALT, LALT ), // 54 + KTT_ENTRY0( SPACE, SPACE, ' ', ' ', "SPACE" ), // 55 + KTT_ENTRY2( CAPSLOCK, CAPSLOCK ), // 56 + KTT_ENTRY2( F1, F1 ), // 57 + KTT_ENTRY2( F2, F2 ), // 58 + KTT_ENTRY2( F3, F3 ), // 59 + KTT_ENTRY2( F4, F4 ), // 60 + KTT_ENTRY2( F5, F5 ), // 61 + KTT_ENTRY2( F6, F6 ), // 62 + KTT_ENTRY2( F7, F7 ), // 63 + KTT_ENTRY2( F8, F8 ), // 64 + KTT_ENTRY2( F9, F9 ), // 65 + KTT_ENTRY2( F10, F10 ), // 66 + KTT_ENTRY2( NUMLOCK, NUMLOCKCLEAR ), // 67 + KTT_ENTRY2( SCRLOCK, SCROLLLOCK ), // 68 + KTT_ENTRY2( 7_PAD, KP_7 ), // 69 + KTT_ENTRY2( 8_PAD, KP_8 ), + KTT_ENTRY2( 9_PAD, KP_9 ), + KTT_ENTRY2( MINUS_PAD, KP_MINUS ), + KTT_ENTRY2( 4_PAD, KP_4 ), + KTT_ENTRY2( 5_PAD, KP_5 ), + KTT_ENTRY2( 6_PAD, KP_6 ), + KTT_ENTRY2( PLUS_PAD, KP_PLUS ), + KTT_ENTRY2( 1_PAD, KP_1 ), + KTT_ENTRY2( 2_PAD, KP_2 ), + KTT_ENTRY2( 3_PAD, KP_3 ), + KTT_ENTRY2( 0_PAD, KP_0 ), + KTT_ENTRY2( DEL_PAD, KP_PERIOD ), + KTT_ENTRY2( F11, F11 ), + KTT_ENTRY2( F12, F12 ), + KTT_ENTRY2( F13, F13 ), + KTT_ENTRY2( F14, F14 ), + KTT_ENTRY2( F15, F15 ), + KTT_ENTRY2( ENTER_PAD, KP_ENTER ), + KTT_ENTRY2( RCONTROL, RCTRL ), + KTT_ENTRY2( SLASH_PAD, KP_DIVIDE ), + KTT_ENTRY2( PRTSCR, PRINTSCREEN ), + KTT_ENTRY2( RALT, RALT ), + KTT_ENTRY2( HOME, HOME ), + KTT_ENTRY2( UP, UP ), + KTT_ENTRY2( PGUP, PAGEUP ), + KTT_ENTRY2( LEFT, LEFT ), + KTT_ENTRY2( RIGHT, RIGHT ), + KTT_ENTRY2( END, END ), + KTT_ENTRY2( DOWN, DOWN ), + KTT_ENTRY2( PGDN, PAGEDOWN ), + KTT_ENTRY2( INSERT, INSERT ), { ITEM_ID_DEL, SDL_SCANCODE_DELETE, "ITEM_ID_DEL", (char *)"DELETE" }, - KTT_ENTRY2( LWIN, LGUI ), - KTT_ENTRY2( RWIN, RGUI ), - KTT_ENTRY2( MENU, MENU ), - KTT_ENTRY0( TILDE, GRAVE, 0xc0, '`', "TILDE" ), - KTT_ENTRY0( BACKSLASH2, NONUSBACKSLASH, 0xdc, '\\', "BACKSLASH2" ), + KTT_ENTRY2( LWIN, LGUI ), + KTT_ENTRY2( RWIN, RGUI ), + KTT_ENTRY2( MENU, MENU ), + KTT_ENTRY0( TILDE, GRAVE, 0xc0, '`', "TILDE" ), + KTT_ENTRY0( BACKSLASH2, NONUSBACKSLASH, 0xdc, '\\', "BACKSLASH2" ), { ITEM_ID_INVALID } }; #else @@ -385,113 +385,113 @@ static kt_table sdl_key_trans_table[] = static kt_table sdl_key_trans_table[] = { // MAME key SDL key vkey ascii - KTT_ENTRY0( ESC, ESCAPE, 0x1b, 0x1b, "ESC" ), - KTT_ENTRY1( 1, 1 ), - KTT_ENTRY1( 2, 2 ), - KTT_ENTRY1( 3, 3 ), - KTT_ENTRY1( 4, 4 ), - KTT_ENTRY1( 5, 5 ), - KTT_ENTRY1( 6, 6 ), - KTT_ENTRY1( 7, 7 ), - KTT_ENTRY1( 8, 8 ), - KTT_ENTRY1( 9, 9 ), - KTT_ENTRY1( 0, 0 ), - KTT_ENTRY0( MINUS, MINUS, 0xbd, '-', "MINUS" ), - KTT_ENTRY0( EQUALS, EQUALS, 0xbb, '=', "EQUALS" ), - KTT_ENTRY0( BACKSPACE, BACKSPACE, 0x08, 0x08, "BACKSPACE" ), - KTT_ENTRY0( TAB, TAB, 0x09, 0x09, "TAB" ), - KTT_ENTRY1( Q, q ), - KTT_ENTRY1( W, w ), - KTT_ENTRY1( E, e ), - KTT_ENTRY1( R, r ), - KTT_ENTRY1( T, t ), - KTT_ENTRY1( Y, y ), - KTT_ENTRY1( U, u ), - KTT_ENTRY1( I, i ), - KTT_ENTRY1( O, o ), - KTT_ENTRY1( P, p ), - KTT_ENTRY0( OPENBRACE, LEFTBRACKET, 0xdb, '[', "OPENBRACE" ), - KTT_ENTRY0( CLOSEBRACE,RIGHTBRACKET, 0xdd, ']', "CLOSEBRACE" ), - KTT_ENTRY0( ENTER, RETURN, 0x0d, 0x0d, "RETURN" ), - KTT_ENTRY2( LCONTROL, LCTRL ), - KTT_ENTRY1( A, a ), - KTT_ENTRY1( S, s ), - KTT_ENTRY1( D, d ), - KTT_ENTRY1( F, f ), - KTT_ENTRY1( G, g ), - KTT_ENTRY1( H, h ), - KTT_ENTRY1( J, j ), - KTT_ENTRY1( K, k ), - KTT_ENTRY1( L, l ), - KTT_ENTRY0( COLON, SEMICOLON, 0xba, ';', "COLON" ), - KTT_ENTRY0( QUOTE, QUOTE, 0xde, '\'', "QUOTE" ), - KTT_ENTRY2( LSHIFT, LSHIFT ), - KTT_ENTRY0( BACKSLASH, BACKSLASH, 0xdc, '\\', "BACKSLASH" ), - KTT_ENTRY1( Z, z ), - KTT_ENTRY1( X, x ), - KTT_ENTRY1( C, c ), - KTT_ENTRY1( V, v ), - KTT_ENTRY1( B, b ), - KTT_ENTRY1( N, n ), - KTT_ENTRY1( M, m ), - KTT_ENTRY0( COMMA, COMMA, 0xbc, ',', "COMMA" ), - KTT_ENTRY0( STOP, PERIOD, 0xbe, '.', "STOP" ), - KTT_ENTRY0( SLASH, SLASH, 0xbf, '/', "SLASH" ), - KTT_ENTRY2( RSHIFT, RSHIFT ), - KTT_ENTRY0( ASTERISK, KP_MULTIPLY, '*', '*', "ASTERIX" ), - KTT_ENTRY2( LALT, LALT ), - KTT_ENTRY0( SPACE, SPACE, ' ', ' ', "SPACE" ), - KTT_ENTRY2( CAPSLOCK, CAPSLOCK ), - KTT_ENTRY2( F1, F1 ), - KTT_ENTRY2( F2, F2 ), - KTT_ENTRY2( F3, F3 ), - KTT_ENTRY2( F4, F4 ), - KTT_ENTRY2( F5, F5 ), - KTT_ENTRY2( F6, F6 ), - KTT_ENTRY2( F7, F7 ), - KTT_ENTRY2( F8, F8 ), - KTT_ENTRY2( F9, F9 ), - KTT_ENTRY2( F10, F10 ), - KTT_ENTRY2( NUMLOCK, NUMLOCK ), - KTT_ENTRY2( SCRLOCK, SCROLLOCK ), - KTT_ENTRY2( 7_PAD, KP7 ), - KTT_ENTRY2( 8_PAD, KP8 ), - KTT_ENTRY2( 9_PAD, KP9 ), - KTT_ENTRY2( MINUS_PAD, KP_MINUS ), - KTT_ENTRY2( 4_PAD, KP4 ), - KTT_ENTRY2( 5_PAD, KP5 ), - KTT_ENTRY2( 6_PAD, KP6 ), - KTT_ENTRY2( PLUS_PAD, KP_PLUS ), - KTT_ENTRY2( 1_PAD, KP1 ), - KTT_ENTRY2( 2_PAD, KP2 ), - KTT_ENTRY2( 3_PAD, KP3 ), - KTT_ENTRY2( 0_PAD, KP0 ), - KTT_ENTRY2( DEL_PAD, KP_PERIOD ), - KTT_ENTRY2( F11, F11 ), - KTT_ENTRY2( F12, F12 ), - KTT_ENTRY2( F13, F13 ), - KTT_ENTRY2( F14, F14 ), - KTT_ENTRY2( F15, F15 ), - KTT_ENTRY2( ENTER_PAD, KP_ENTER ), - KTT_ENTRY2( RCONTROL, RCTRL ), - KTT_ENTRY2( SLASH_PAD, KP_DIVIDE ), - KTT_ENTRY2( PRTSCR, PRINT ), - KTT_ENTRY2( RALT, RALT ), - KTT_ENTRY2( HOME, HOME ), - KTT_ENTRY2( UP, UP ), - KTT_ENTRY2( PGUP, PAGEUP ), - KTT_ENTRY2( LEFT, LEFT ), - KTT_ENTRY2( RIGHT, RIGHT ), - KTT_ENTRY2( END, END ), - KTT_ENTRY2( DOWN, DOWN ), - KTT_ENTRY2( PGDN, PAGEDOWN ), - KTT_ENTRY2( INSERT, INSERT ), + KTT_ENTRY0( ESC, ESCAPE, 0x1b, 0x1b, "ESC" ), + KTT_ENTRY1( 1, 1 ), + KTT_ENTRY1( 2, 2 ), + KTT_ENTRY1( 3, 3 ), + KTT_ENTRY1( 4, 4 ), + KTT_ENTRY1( 5, 5 ), + KTT_ENTRY1( 6, 6 ), + KTT_ENTRY1( 7, 7 ), + KTT_ENTRY1( 8, 8 ), + KTT_ENTRY1( 9, 9 ), + KTT_ENTRY1( 0, 0 ), + KTT_ENTRY0( MINUS, MINUS, 0xbd, '-', "MINUS" ), + KTT_ENTRY0( EQUALS, EQUALS, 0xbb, '=', "EQUALS" ), + KTT_ENTRY0( BACKSPACE, BACKSPACE, 0x08, 0x08, "BACKSPACE" ), + KTT_ENTRY0( TAB, TAB, 0x09, 0x09, "TAB" ), + KTT_ENTRY1( Q, q ), + KTT_ENTRY1( W, w ), + KTT_ENTRY1( E, e ), + KTT_ENTRY1( R, r ), + KTT_ENTRY1( T, t ), + KTT_ENTRY1( Y, y ), + KTT_ENTRY1( U, u ), + KTT_ENTRY1( I, i ), + KTT_ENTRY1( O, o ), + KTT_ENTRY1( P, p ), + KTT_ENTRY0( OPENBRACE, LEFTBRACKET, 0xdb, '[', "OPENBRACE" ), + KTT_ENTRY0( CLOSEBRACE,RIGHTBRACKET, 0xdd, ']', "CLOSEBRACE" ), + KTT_ENTRY0( ENTER, RETURN, 0x0d, 0x0d, "RETURN" ), + KTT_ENTRY2( LCONTROL, LCTRL ), + KTT_ENTRY1( A, a ), + KTT_ENTRY1( S, s ), + KTT_ENTRY1( D, d ), + KTT_ENTRY1( F, f ), + KTT_ENTRY1( G, g ), + KTT_ENTRY1( H, h ), + KTT_ENTRY1( J, j ), + KTT_ENTRY1( K, k ), + KTT_ENTRY1( L, l ), + KTT_ENTRY0( COLON, SEMICOLON, 0xba, ';', "COLON" ), + KTT_ENTRY0( QUOTE, QUOTE, 0xde, '\'', "QUOTE" ), + KTT_ENTRY2( LSHIFT, LSHIFT ), + KTT_ENTRY0( BACKSLASH, BACKSLASH, 0xdc, '\\', "BACKSLASH" ), + KTT_ENTRY1( Z, z ), + KTT_ENTRY1( X, x ), + KTT_ENTRY1( C, c ), + KTT_ENTRY1( V, v ), + KTT_ENTRY1( B, b ), + KTT_ENTRY1( N, n ), + KTT_ENTRY1( M, m ), + KTT_ENTRY0( COMMA, COMMA, 0xbc, ',', "COMMA" ), + KTT_ENTRY0( STOP, PERIOD, 0xbe, '.', "STOP" ), + KTT_ENTRY0( SLASH, SLASH, 0xbf, '/', "SLASH" ), + KTT_ENTRY2( RSHIFT, RSHIFT ), + KTT_ENTRY0( ASTERISK, KP_MULTIPLY, '*', '*', "ASTERIX" ), + KTT_ENTRY2( LALT, LALT ), + KTT_ENTRY0( SPACE, SPACE, ' ', ' ', "SPACE" ), + KTT_ENTRY2( CAPSLOCK, CAPSLOCK ), + KTT_ENTRY2( F1, F1 ), + KTT_ENTRY2( F2, F2 ), + KTT_ENTRY2( F3, F3 ), + KTT_ENTRY2( F4, F4 ), + KTT_ENTRY2( F5, F5 ), + KTT_ENTRY2( F6, F6 ), + KTT_ENTRY2( F7, F7 ), + KTT_ENTRY2( F8, F8 ), + KTT_ENTRY2( F9, F9 ), + KTT_ENTRY2( F10, F10 ), + KTT_ENTRY2( NUMLOCK, NUMLOCK ), + KTT_ENTRY2( SCRLOCK, SCROLLOCK ), + KTT_ENTRY2( 7_PAD, KP7 ), + KTT_ENTRY2( 8_PAD, KP8 ), + KTT_ENTRY2( 9_PAD, KP9 ), + KTT_ENTRY2( MINUS_PAD, KP_MINUS ), + KTT_ENTRY2( 4_PAD, KP4 ), + KTT_ENTRY2( 5_PAD, KP5 ), + KTT_ENTRY2( 6_PAD, KP6 ), + KTT_ENTRY2( PLUS_PAD, KP_PLUS ), + KTT_ENTRY2( 1_PAD, KP1 ), + KTT_ENTRY2( 2_PAD, KP2 ), + KTT_ENTRY2( 3_PAD, KP3 ), + KTT_ENTRY2( 0_PAD, KP0 ), + KTT_ENTRY2( DEL_PAD, KP_PERIOD ), + KTT_ENTRY2( F11, F11 ), + KTT_ENTRY2( F12, F12 ), + KTT_ENTRY2( F13, F13 ), + KTT_ENTRY2( F14, F14 ), + KTT_ENTRY2( F15, F15 ), + KTT_ENTRY2( ENTER_PAD, KP_ENTER ), + KTT_ENTRY2( RCONTROL, RCTRL ), + KTT_ENTRY2( SLASH_PAD, KP_DIVIDE ), + KTT_ENTRY2( PRTSCR, PRINT ), + KTT_ENTRY2( RALT, RALT ), + KTT_ENTRY2( HOME, HOME ), + KTT_ENTRY2( UP, UP ), + KTT_ENTRY2( PGUP, PAGEUP ), + KTT_ENTRY2( LEFT, LEFT ), + KTT_ENTRY2( RIGHT, RIGHT ), + KTT_ENTRY2( END, END ), + KTT_ENTRY2( DOWN, DOWN ), + KTT_ENTRY2( PGDN, PAGEDOWN ), + KTT_ENTRY2( INSERT, INSERT ), { ITEM_ID_DEL, SDLK_DELETE, "ITEM_ID_DEL", (char *)"DELETE" }, - KTT_ENTRY2( LWIN, LSUPER ), - KTT_ENTRY2( RWIN, RSUPER ), - KTT_ENTRY2( MENU, MENU ), - KTT_ENTRY0( TILDE, BACKQUOTE, 0xc0, '`', "TILDE" ), - KTT_ENTRY0( BACKSLASH2, HASH, 0xdc, '\\', "BACKSLASH2" ), + KTT_ENTRY2( LWIN, LSUPER ), + KTT_ENTRY2( RWIN, RSUPER ), + KTT_ENTRY2( MENU, MENU ), + KTT_ENTRY0( TILDE, BACKQUOTE, 0xc0, '`', "TILDE" ), + KTT_ENTRY0( BACKSLASH2, HASH, 0xdc, '\\', "BACKSLASH2" ), { ITEM_ID_INVALID } }; #endif @@ -511,23 +511,23 @@ struct key_lookup_table static key_lookup_table sdl_lookup_table[] = { - KE7(UNKNOWN, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE ) + KE7(UNKNOWN, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE ) KE(SPACE) - KE5(COMMA, MINUS, PERIOD, SLASH, 0 ) - KE8(1, 2, 3, 4, 5, 6, 7, 8 ) - KE3(9, SEMICOLON, EQUALS) - KE5(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, A, B ) - KE8(C, D, E, F, G, H, I, J ) - KE8(K, L, M, N, O, P, Q, R ) - KE8(S, T, U, V, W, X, Y, Z ) - KE8(DELETE, KP_0, KP_1, KP_2, KP_3, KP_4, KP_5, KP_6 ) - KE8(KP_7, KP_8, KP_9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS ) - KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME ) - KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 ) - KE8(F6, F7, F8, F9, F10, F11, F12, F13 ) - KE8(F14, F15, NUMLOCKCLEAR, CAPSLOCK, SCROLLLOCK, RSHIFT, LSHIFT, RCTRL ) - KE5(LCTRL, RALT, LALT, LGUI, RGUI) - KE8(GRAVE, LEFTBRACKET,RIGHTBRACKET, SEMICOLON, APOSTROPHE, BACKSLASH, PRINTSCREEN,MENU ) + KE5(COMMA, MINUS, PERIOD, SLASH, 0 ) + KE8(1, 2, 3, 4, 5, 6, 7, 8 ) + KE3(9, SEMICOLON, EQUALS) + KE5(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, A, B ) + KE8(C, D, E, F, G, H, I, J ) + KE8(K, L, M, N, O, P, Q, R ) + KE8(S, T, U, V, W, X, Y, Z ) + KE8(DELETE, KP_0, KP_1, KP_2, KP_3, KP_4, KP_5, KP_6 ) + KE8(KP_7, KP_8, KP_9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS ) + KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME ) + KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 ) + KE8(F6, F7, F8, F9, F10, F11, F12, F13 ) + KE8(F14, F15, NUMLOCKCLEAR, CAPSLOCK, SCROLLLOCK, RSHIFT, LSHIFT, RCTRL ) + KE5(LCTRL, RALT, LALT, LGUI, RGUI) + KE8(GRAVE, LEFTBRACKET,RIGHTBRACKET, SEMICOLON, APOSTROPHE, BACKSLASH, PRINTSCREEN,MENU ) KE(UNDO) {-1, ""} }; @@ -537,35 +537,35 @@ static key_lookup_table sdl_lookup_table[] = static key_lookup_table sdl_lookup_table[] = { - KE8(UNKNOWN, FIRST, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE ) - KE8(SPACE, EXCLAIM, QUOTEDBL, HASH, DOLLAR, AMPERSAND, QUOTE, LEFTPAREN ) - KE8(RIGHTPAREN, ASTERISK, PLUS, COMMA, MINUS, PERIOD, SLASH, 0 ) - KE8(1, 2, 3, 4, 5, 6, 7, 8 ) - KE8(9, COLON, SEMICOLON, LESS, EQUALS, GREATER, QUESTION, AT ) - KE8(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, CARET, UNDERSCORE, BACKQUOTE, a, b ) - KE8(c, d, e, f, g, h, i, j ) - KE8(k, l, m, n, o, p, q, r ) - KE8(s, t, u, v, w, x, y, z ) - KE8(DELETE, WORLD_0, WORLD_1, WORLD_2, WORLD_3, WORLD_4, WORLD_5, WORLD_6 ) - KE8(WORLD_7, WORLD_8, WORLD_9, WORLD_10, WORLD_11, WORLD_12, WORLD_13, WORLD_14 ) - KE8(WORLD_15, WORLD_16, WORLD_17, WORLD_18, WORLD_19, WORLD_20, WORLD_21, WORLD_22 ) - KE8(WORLD_23, WORLD_24, WORLD_25, WORLD_26, WORLD_27, WORLD_28, WORLD_29, WORLD_30 ) - KE8(WORLD_31, WORLD_32, WORLD_33, WORLD_34, WORLD_35, WORLD_36, WORLD_37, WORLD_38 ) - KE8(WORLD_39, WORLD_40, WORLD_41, WORLD_42, WORLD_43, WORLD_44, WORLD_45, WORLD_46 ) - KE8(WORLD_47, WORLD_48, WORLD_49, WORLD_50, WORLD_51, WORLD_52, WORLD_53, WORLD_54 ) - KE8(WORLD_55, WORLD_56, WORLD_57, WORLD_58, WORLD_59, WORLD_60, WORLD_61, WORLD_62 ) - KE8(WORLD_63, WORLD_64, WORLD_65, WORLD_66, WORLD_67, WORLD_68, WORLD_69, WORLD_70 ) - KE8(WORLD_71, WORLD_72, WORLD_73, WORLD_74, WORLD_75, WORLD_76, WORLD_77, WORLD_78 ) - KE8(WORLD_79, WORLD_80, WORLD_81, WORLD_82, WORLD_83, WORLD_84, WORLD_85, WORLD_86 ) - KE8(WORLD_87, WORLD_88, WORLD_89, WORLD_90, WORLD_91, WORLD_92, WORLD_93, WORLD_94 ) - KE8(WORLD_95, KP0, KP1, KP2, KP3, KP4, KP5, KP6 ) - KE8(KP7, KP8, KP9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS ) - KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME ) - KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 ) - KE8(F6, F7, F8, F9, F10, F11, F12, F13 ) - KE8(F14, F15, NUMLOCK, CAPSLOCK, SCROLLOCK, RSHIFT, LSHIFT, RCTRL ) - KE8(LCTRL, RALT, LALT, RMETA, LMETA, LSUPER, RSUPER, MODE ) - KE8(COMPOSE, HELP, PRINT, SYSREQ, BREAK, MENU, POWER, EURO ) + KE8(UNKNOWN, FIRST, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE ) + KE8(SPACE, EXCLAIM, QUOTEDBL, HASH, DOLLAR, AMPERSAND, QUOTE, LEFTPAREN ) + KE8(RIGHTPAREN, ASTERISK, PLUS, COMMA, MINUS, PERIOD, SLASH, 0 ) + KE8(1, 2, 3, 4, 5, 6, 7, 8 ) + KE8(9, COLON, SEMICOLON, LESS, EQUALS, GREATER, QUESTION, AT ) + KE8(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, CARET, UNDERSCORE, BACKQUOTE, a, b ) + KE8(c, d, e, f, g, h, i, j ) + KE8(k, l, m, n, o, p, q, r ) + KE8(s, t, u, v, w, x, y, z ) + KE8(DELETE, WORLD_0, WORLD_1, WORLD_2, WORLD_3, WORLD_4, WORLD_5, WORLD_6 ) + KE8(WORLD_7, WORLD_8, WORLD_9, WORLD_10, WORLD_11, WORLD_12, WORLD_13, WORLD_14 ) + KE8(WORLD_15, WORLD_16, WORLD_17, WORLD_18, WORLD_19, WORLD_20, WORLD_21, WORLD_22 ) + KE8(WORLD_23, WORLD_24, WORLD_25, WORLD_26, WORLD_27, WORLD_28, WORLD_29, WORLD_30 ) + KE8(WORLD_31, WORLD_32, WORLD_33, WORLD_34, WORLD_35, WORLD_36, WORLD_37, WORLD_38 ) + KE8(WORLD_39, WORLD_40, WORLD_41, WORLD_42, WORLD_43, WORLD_44, WORLD_45, WORLD_46 ) + KE8(WORLD_47, WORLD_48, WORLD_49, WORLD_50, WORLD_51, WORLD_52, WORLD_53, WORLD_54 ) + KE8(WORLD_55, WORLD_56, WORLD_57, WORLD_58, WORLD_59, WORLD_60, WORLD_61, WORLD_62 ) + KE8(WORLD_63, WORLD_64, WORLD_65, WORLD_66, WORLD_67, WORLD_68, WORLD_69, WORLD_70 ) + KE8(WORLD_71, WORLD_72, WORLD_73, WORLD_74, WORLD_75, WORLD_76, WORLD_77, WORLD_78 ) + KE8(WORLD_79, WORLD_80, WORLD_81, WORLD_82, WORLD_83, WORLD_84, WORLD_85, WORLD_86 ) + KE8(WORLD_87, WORLD_88, WORLD_89, WORLD_90, WORLD_91, WORLD_92, WORLD_93, WORLD_94 ) + KE8(WORLD_95, KP0, KP1, KP2, KP3, KP4, KP5, KP6 ) + KE8(KP7, KP8, KP9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS ) + KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME ) + KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 ) + KE8(F6, F7, F8, F9, F10, F11, F12, F13 ) + KE8(F14, F15, NUMLOCK, CAPSLOCK, SCROLLOCK, RSHIFT, LSHIFT, RCTRL ) + KE8(LCTRL, RALT, LALT, RMETA, LMETA, LSUPER, RSUPER, MODE ) + KE8(COMPOSE, HELP, PRINT, SYSREQ, BREAK, MENU, POWER, EURO ) KE(UNDO) KE(LAST) {-1, ""} @@ -792,7 +792,7 @@ static void sdlinput_register_joysticks(running_machine &machine) devinfo->device->add_item(tempname, itemid, generic_button_get_state, &devinfo->joystick.hatsL[hat]); sprintf(tempname, "hat %d Right", hat); itemid = (input_item_id) ((hat < INPUT_MAX_HATS) ? ITEM_ID_HAT1RIGHT + 4 * hat : ITEM_ID_OTHER_SWITCH); - devinfo->device->add_item(tempname, itemid, generic_button_get_state, &devinfo->joystick.hatsR[hat]); + devinfo->device->add_item(tempname, itemid, generic_button_get_state, &devinfo->joystick.hatsR[hat]); } // loop over all (track)balls @@ -927,106 +927,106 @@ static void sdlinput_register_mice(running_machine &machine) XDeviceInfo* find_device_info(Display *display, - char *name, - Bool only_extended) + char *name, + Bool only_extended) { - XDeviceInfo *devices; - XDeviceInfo *found = NULL; - int loop; - int num_devices; - int len = strlen(name); - Bool is_id = True; - XID id = (XID)-1; - - for(loop=0; loop<len; loop++) { - if (!isdigit(name[loop])) { - is_id = False; - break; - } - } - - if (is_id) { - id = atoi(name); - } - - devices = XListInputDevices(display, &num_devices); - - for(loop=0; loop<num_devices; loop++) { - if ((!only_extended || (devices[loop].use >= IsXExtensionDevice)) && - ((!is_id && strcmp(devices[loop].name, name) == 0) || - (is_id && devices[loop].id == id))) { - if (found) { - fprintf(stderr, - "Warning: There are multiple devices named \"%s\".\n" - "To ensure the correct one is selected, please use " - "the device ID instead.\n\n", name); - } else { - found = &devices[loop]; - } - } - } - return found; + XDeviceInfo *devices; + XDeviceInfo *found = NULL; + int loop; + int num_devices; + int len = strlen(name); + Bool is_id = True; + XID id = (XID)-1; + + for(loop=0; loop<len; loop++) { + if (!isdigit(name[loop])) { + is_id = False; + break; + } + } + + if (is_id) { + id = atoi(name); + } + + devices = XListInputDevices(display, &num_devices); + + for(loop=0; loop<num_devices; loop++) { + if ((!only_extended || (devices[loop].use >= IsXExtensionDevice)) && + ((!is_id && strcmp(devices[loop].name, name) == 0) || + (is_id && devices[loop].id == id))) { + if (found) { + fprintf(stderr, + "Warning: There are multiple devices named \"%s\".\n" + "To ensure the correct one is selected, please use " + "the device ID instead.\n\n", name); + } else { + found = &devices[loop]; + } + } + } + return found; } //Copypasted from xinfo static int register_events(Display *dpy, - XDeviceInfo *info, - char *dev_name, - Bool handle_proximity) + XDeviceInfo *info, + char *dev_name, + Bool handle_proximity) { - int number = 0; /* number of events registered */ - XEventClass event_list[7]; - int i; - XDevice *device; - Window root_win; - unsigned long screen; - XInputClassInfo *ip; - - screen = DefaultScreen(dpy); - root_win = RootWindow(dpy, screen); - - device = XOpenDevice(dpy, info->id); - - if (!device) { - fprintf(stderr, "unable to open device %s\n", dev_name); - return 0; - } - - if (device->num_classes > 0) { - for (ip = device->classes, i=0; i<info->num_classes; ip++, i++) { - switch (ip->input_class) { - case KeyClass: - DeviceKeyPress(device, key_press_type, event_list[number]); number++; - DeviceKeyRelease(device, key_release_type, event_list[number]); number++; - break; - - case ButtonClass: - DeviceButtonPress(device, button_press_type, event_list[number]); number++; - DeviceButtonRelease(device, button_release_type, event_list[number]); number++; - break; - - case ValuatorClass: - DeviceMotionNotify(device, motion_type, event_list[number]); number++; - fprintf(stderr, "Motion = %i\n",motion_type); - if (handle_proximity) { - ProximityIn(device, proximity_in_type, event_list[number]); number++; - ProximityOut(device, proximity_out_type, event_list[number]); number++; - } - break; - - default: - fprintf(stderr, "unknown class\n"); - break; - } - } - - if (XSelectExtensionEvent(dpy, root_win, event_list, number)) { - fprintf(stderr, "error selecting extended events\n"); - return 0; - } - } - return number; + int number = 0; /* number of events registered */ + XEventClass event_list[7]; + int i; + XDevice *device; + Window root_win; + unsigned long screen; + XInputClassInfo *ip; + + screen = DefaultScreen(dpy); + root_win = RootWindow(dpy, screen); + + device = XOpenDevice(dpy, info->id); + + if (!device) { + fprintf(stderr, "unable to open device %s\n", dev_name); + return 0; + } + + if (device->num_classes > 0) { + for (ip = device->classes, i=0; i<info->num_classes; ip++, i++) { + switch (ip->input_class) { + case KeyClass: + DeviceKeyPress(device, key_press_type, event_list[number]); number++; + DeviceKeyRelease(device, key_release_type, event_list[number]); number++; + break; + + case ButtonClass: + DeviceButtonPress(device, button_press_type, event_list[number]); number++; + DeviceButtonRelease(device, button_release_type, event_list[number]); number++; + break; + + case ValuatorClass: + DeviceMotionNotify(device, motion_type, event_list[number]); number++; + fprintf(stderr, "Motion = %i\n",motion_type); + if (handle_proximity) { + ProximityIn(device, proximity_in_type, event_list[number]); number++; + ProximityOut(device, proximity_out_type, event_list[number]); number++; + } + break; + + default: + fprintf(stderr, "unknown class\n"); + break; + } + } + + if (XSelectExtensionEvent(dpy, root_win, event_list, number)) { + fprintf(stderr, "error selecting extended events\n"); + return 0; + } + } + return number; } //============================================================ @@ -1035,108 +1035,108 @@ register_events(Display *dpy, static void sdlinput_register_lightguns(running_machine &machine) { - int index; - XExtensionVersion *version; - - lightgun_enabled = machine.options().lightgun(); - devmap_init(machine, &lightgun_map, SDLOPTION_LIGHTGUNINDEX, 8, "Lightgun mapping"); - - XDisplay = XOpenDisplay(NULL); - - if (XDisplay == NULL) { - fprintf(stderr, "Unable to connect to X server\n"); - return; - } - - version = XGetExtensionVersion(XDisplay, INAME); - - if (!version || (version == (XExtensionVersion*) NoSuchExtension)) { - fprintf(stderr, "xinput extension not available!\n"); - return; - } - - - for (index=0; index<8; index++) { - XDeviceInfo *info; - if (strlen(lightgun_map.map[index].name)!=0) { - device_info *devinfo; - char *name=lightgun_map.map[index].name; - char defname[512]; - devinfo = devmap_class_register(machine, &lightgun_map, index, &lightgun_list, DEVICE_CLASS_LIGHTGUN); - fprintf(stderr, "%i: %s\n",index, name); - info=find_device_info(XDisplay, name, 0); - if (!info) continue; - - //Grab device info and translate to stuff mame can use - if (info->num_classes > 0) { - XAnyClassPtr any = (XAnyClassPtr) (info->inputclassinfo); - int i; - for (i=0; i<info->num_classes; i++) { - int button; - XValuatorInfoPtr v; - XAxisInfoPtr a; - int j; - XButtonInfoPtr b; + int index; + XExtensionVersion *version; + + lightgun_enabled = machine.options().lightgun(); + devmap_init(machine, &lightgun_map, SDLOPTION_LIGHTGUNINDEX, 8, "Lightgun mapping"); + + XDisplay = XOpenDisplay(NULL); + + if (XDisplay == NULL) { + fprintf(stderr, "Unable to connect to X server\n"); + return; + } + + version = XGetExtensionVersion(XDisplay, INAME); + + if (!version || (version == (XExtensionVersion*) NoSuchExtension)) { + fprintf(stderr, "xinput extension not available!\n"); + return; + } + + + for (index=0; index<8; index++) { + XDeviceInfo *info; + if (strlen(lightgun_map.map[index].name)!=0) { + device_info *devinfo; + char *name=lightgun_map.map[index].name; + char defname[512]; + devinfo = devmap_class_register(machine, &lightgun_map, index, &lightgun_list, DEVICE_CLASS_LIGHTGUN); + fprintf(stderr, "%i: %s\n",index, name); + info=find_device_info(XDisplay, name, 0); + if (!info) continue; + + //Grab device info and translate to stuff mame can use + if (info->num_classes > 0) { + XAnyClassPtr any = (XAnyClassPtr) (info->inputclassinfo); + int i; + for (i=0; i<info->num_classes; i++) { + int button; + XValuatorInfoPtr v; + XAxisInfoPtr a; + int j; + XButtonInfoPtr b; #if defined(__cplusplus) || defined(c_plusplus) - switch (any->c_class) { + switch (any->c_class) { #else - switch (any->class) { + switch (any->class) { #endif - case ButtonClass: - b = (XButtonInfoPtr) any; - for (button = 0; button < b->num_buttons; button++) - { - input_item_id itemid; - itemid = (input_item_id) (ITEM_ID_BUTTON1 + button); - sprintf(defname, "B%d", button + 1); - devinfo->device->add_item(defname, itemid, generic_button_get_state, &devinfo->lightgun.buttons[button]); - } - break; - case ValuatorClass: - v = (XValuatorInfoPtr) any; - a = (XAxisInfoPtr) ((char *) v + sizeof (XValuatorInfo)); - for (j=0; j<v->num_axes; j++, a++) { - if (j==0) { + case ButtonClass: + b = (XButtonInfoPtr) any; + for (button = 0; button < b->num_buttons; button++) + { + input_item_id itemid; + itemid = (input_item_id) (ITEM_ID_BUTTON1 + button); + sprintf(defname, "B%d", button + 1); + devinfo->device->add_item(defname, itemid, generic_button_get_state, &devinfo->lightgun.buttons[button]); + } + break; + case ValuatorClass: + v = (XValuatorInfoPtr) any; + a = (XAxisInfoPtr) ((char *) v + sizeof (XValuatorInfo)); + for (j=0; j<v->num_axes; j++, a++) { + if (j==0) { #if (USE_XINPUT_DEBUG) - fprintf(stderr, "For index %d: Set minx=%d, maxx=%d\n", - index, - a->min_value, a->max_value); + fprintf(stderr, "For index %d: Set minx=%d, maxx=%d\n", + index, + a->min_value, a->max_value); #endif - devinfo->lightgun.maxx=a->max_value; - devinfo->lightgun.minx=a->min_value; - } - if (j==1) { + devinfo->lightgun.maxx=a->max_value; + devinfo->lightgun.minx=a->min_value; + } + if (j==1) { #if (USE_XINPUT_DEBUG) - fprintf(stderr, "For index %d: Set miny=%d, maxy=%d\n", - index, - a->min_value, a->max_value); + fprintf(stderr, "For index %d: Set miny=%d, maxy=%d\n", + index, + a->min_value, a->max_value); #endif - devinfo->lightgun.maxy=a->max_value; - devinfo->lightgun.miny=a->min_value; - } - } - break; - } - any = (XAnyClassPtr) ((char *) any + any->length); - } - } - - - sprintf(defname, "X %s", devinfo->name); - devinfo->device->add_item(defname, ITEM_ID_XAXIS, generic_axis_get_state, &devinfo->lightgun.lX); - sprintf(defname, "Y %s", devinfo->name); - devinfo->device->add_item(defname, ITEM_ID_YAXIS, generic_axis_get_state, &devinfo->lightgun.lY); - - - devinfo->lightgun.deviceid=info->id; - if (!info) { - fprintf(stderr, "Can't find device %s!\n", lightgun_map.map[index].name); - } else { - fprintf(stderr, "Device %i: Registered %i events.\n",(int)info->id, register_events(XDisplay, info, lightgun_map.map[index].name, 0)); - } - } - } - mame_printf_verbose("Lightgun: End initialization\n"); + devinfo->lightgun.maxy=a->max_value; + devinfo->lightgun.miny=a->min_value; + } + } + break; + } + any = (XAnyClassPtr) ((char *) any + any->length); + } + } + + + sprintf(defname, "X %s", devinfo->name); + devinfo->device->add_item(defname, ITEM_ID_XAXIS, generic_axis_get_state, &devinfo->lightgun.lX); + sprintf(defname, "Y %s", devinfo->name); + devinfo->device->add_item(defname, ITEM_ID_YAXIS, generic_axis_get_state, &devinfo->lightgun.lY); + + + devinfo->lightgun.deviceid=info->id; + if (!info) { + fprintf(stderr, "Can't find device %s!\n", lightgun_map.map[index].name); + } else { + fprintf(stderr, "Device %i: Registered %i events.\n",(int)info->id, register_events(XDisplay, info, lightgun_map.map[index].name, 0)); + } + } + } + mame_printf_verbose("Lightgun: End initialization\n"); } #endif @@ -1470,54 +1470,54 @@ sdl_window_info *sdlinput_get_focus_window(running_machine &machine) #if (USE_XINPUT) device_info *get_lightgun_info_for_deviceid(XID deviceid) { - device_info *devinfo; - int index; - //Find lightgun according to device id - for (index=0; ; index++) { - devinfo = generic_device_find_index(lightgun_list, index); - if (devinfo==NULL) break; - if (devinfo->lightgun.deviceid==deviceid) break; - } - return devinfo; + device_info *devinfo; + int index; + //Find lightgun according to device id + for (index=0; ; index++) { + devinfo = generic_device_find_index(lightgun_list, index); + if (devinfo==NULL) break; + if (devinfo->lightgun.deviceid==deviceid) break; + } + return devinfo; } INT32 normalize_absolute_axis(INT32 raw, INT32 rawmin, INT32 rawmax) { - INT32 rv; - - INT32 center = ((INT64)rawmax + (INT64)rawmin) / 2; - - // make sure we have valid data - if (rawmin >= rawmax) - { - rv = raw; - goto out; - } - - // above center - if (raw >= center) - { - INT32 result = (INT64)(raw - center) * (INT64)INPUT_ABSOLUTE_MAX / (INT64)(rawmax - center); - rv = MIN(result, INPUT_ABSOLUTE_MAX); - goto out; - } - - // below center - else - { - INT32 result = -((INT64)(center - raw) * (INT64)-INPUT_ABSOLUTE_MIN / (INT64)(center - rawmin)); - rv = MAX(result, INPUT_ABSOLUTE_MIN); - goto out; - } - - out: + INT32 rv; + + INT32 center = ((INT64)rawmax + (INT64)rawmin) / 2; + + // make sure we have valid data + if (rawmin >= rawmax) + { + rv = raw; + goto out; + } + + // above center + if (raw >= center) + { + INT32 result = (INT64)(raw - center) * (INT64)INPUT_ABSOLUTE_MAX / (INT64)(rawmax - center); + rv = MIN(result, INPUT_ABSOLUTE_MAX); + goto out; + } + + // below center + else + { + INT32 result = -((INT64)(center - raw) * (INT64)-INPUT_ABSOLUTE_MIN / (INT64)(center - rawmin)); + rv = MAX(result, INPUT_ABSOLUTE_MIN); + goto out; + } + + out: #if (USE_XINPUT_DEBUG) - fprintf(stderr, "raw: %d, rawmin: %d, rawmax: %d, center: %d, rv: %d, ABS_MIN: %d, ABS_MAX: %d\n", - raw, rawmin, rawmax, center, rv, INPUT_ABSOLUTE_MIN, INPUT_ABSOLUTE_MAX); + fprintf(stderr, "raw: %d, rawmin: %d, rawmax: %d, center: %d, rv: %d, ABS_MIN: %d, ABS_MAX: %d\n", + raw, rawmin, rawmax, center, rv, INPUT_ABSOLUTE_MIN, INPUT_ABSOLUTE_MAX); #endif - return rv; + return rv; } #endif @@ -1593,8 +1593,8 @@ void sdlinput_poll(running_machine &machine) int index; // only for SDLMAME_EVENTS_IN_WORKER_THREAD - SDL_Event loc_event_buf[MAX_BUF_EVENTS]; - int loc_event_buf_count; + SDL_Event loc_event_buf[MAX_BUF_EVENTS]; + int loc_event_buf_count; int bufp; #if (USE_XINPUT) @@ -1611,99 +1611,99 @@ void sdlinput_poll(running_machine &machine) } #if (USE_XINPUT) - //Get XInput events - while (XPending(XDisplay)!=0) - { - XNextEvent(XDisplay, &xevent); - if (xevent.type==motion_type) - { - XDeviceMotionEvent *motion = (XDeviceMotionEvent *) &xevent; + //Get XInput events + while (XPending(XDisplay)!=0) + { + XNextEvent(XDisplay, &xevent); + if (xevent.type==motion_type) + { + XDeviceMotionEvent *motion = (XDeviceMotionEvent *) &xevent; #if (USE_XINPUT_DEBUG) - /* - * print a lot of debug informations of the motion event(s). - */ - fprintf(stderr, - "XDeviceMotionEvent:\n" - " type: %d\n" - " serial: %lu\n" - " send_event: %d\n" - " display: %p\n" - " window: --\n" - " deviceid: %lu\n" - " root: --\n" - " subwindow: --\n" - " time: --\n" - " x: %d, y: %d\n" - " x_root: %d, y_root: %d\n" - " state: %u\n" - " is_hint: %2.2X\n" - " same_screen: %d\n" - " device_state: %u\n" - " axes_count: %2.2X\n" - " first_axis: %2.2X\n" - " axis_data[6]: {%d,%d,%d,%d,%d,%d}\n", - motion->type, - motion->serial, - motion->send_event, - motion->display, - /* motion->window, */ - motion->deviceid, - /* motion->root */ - /* motion->subwindow */ - /* motion->time, */ - motion->x, motion->y, - motion->x_root, motion->y_root, - motion->state, - motion->is_hint, - motion->same_screen, - motion->device_state, - motion->axes_count, - motion->first_axis, - motion->axis_data[0], motion->axis_data[1], motion->axis_data[2], motion->axis_data[3], motion->axis_data[4], motion->axis_data[5] - ); + /* + * print a lot of debug informations of the motion event(s). + */ + fprintf(stderr, + "XDeviceMotionEvent:\n" + " type: %d\n" + " serial: %lu\n" + " send_event: %d\n" + " display: %p\n" + " window: --\n" + " deviceid: %lu\n" + " root: --\n" + " subwindow: --\n" + " time: --\n" + " x: %d, y: %d\n" + " x_root: %d, y_root: %d\n" + " state: %u\n" + " is_hint: %2.2X\n" + " same_screen: %d\n" + " device_state: %u\n" + " axes_count: %2.2X\n" + " first_axis: %2.2X\n" + " axis_data[6]: {%d,%d,%d,%d,%d,%d}\n", + motion->type, + motion->serial, + motion->send_event, + motion->display, + /* motion->window, */ + motion->deviceid, + /* motion->root */ + /* motion->subwindow */ + /* motion->time, */ + motion->x, motion->y, + motion->x_root, motion->y_root, + motion->state, + motion->is_hint, + motion->same_screen, + motion->device_state, + motion->axes_count, + motion->first_axis, + motion->axis_data[0], motion->axis_data[1], motion->axis_data[2], motion->axis_data[3], motion->axis_data[4], motion->axis_data[5] + ); #endif - devinfo=get_lightgun_info_for_deviceid(motion->deviceid); - - /* - * We have to check with axis will start on array index 0. - * We have also to check the number of axes that are stored in the array. - */ - switch (motion->first_axis) - { - /* - * Starting with x, check number of axis, if there is also the y axis stored. - */ - case 0: - if (motion->axes_count >= 1) - { - devinfo->lightgun.lX=normalize_absolute_axis(motion->axis_data[0], devinfo->lightgun.minx, devinfo->lightgun.maxx); - if (motion->axes_count >= 2) - { - devinfo->lightgun.lY=normalize_absolute_axis(motion->axis_data[1], devinfo->lightgun.miny, devinfo->lightgun.maxy); - } - } - break; - - /* - * Starting with y, ... - */ - case 1: - if (motion->axes_count >= 1) - { - devinfo->lightgun.lY=normalize_absolute_axis(motion->axis_data[0], devinfo->lightgun.miny, devinfo->lightgun.maxy); - } - break; - } - } - else if (xevent.type==button_press_type || xevent.type==button_release_type) - { - XDeviceButtonEvent *button = (XDeviceButtonEvent *) &xevent; - devinfo=get_lightgun_info_for_deviceid(button->deviceid); - devinfo->lightgun.buttons[button->button]=(xevent.type==button_press_type)?0x80:0; - } - } + devinfo=get_lightgun_info_for_deviceid(motion->deviceid); + + /* + * We have to check with axis will start on array index 0. + * We have also to check the number of axes that are stored in the array. + */ + switch (motion->first_axis) + { + /* + * Starting with x, check number of axis, if there is also the y axis stored. + */ + case 0: + if (motion->axes_count >= 1) + { + devinfo->lightgun.lX=normalize_absolute_axis(motion->axis_data[0], devinfo->lightgun.minx, devinfo->lightgun.maxx); + if (motion->axes_count >= 2) + { + devinfo->lightgun.lY=normalize_absolute_axis(motion->axis_data[1], devinfo->lightgun.miny, devinfo->lightgun.maxy); + } + } + break; + + /* + * Starting with y, ... + */ + case 1: + if (motion->axes_count >= 1) + { + devinfo->lightgun.lY=normalize_absolute_axis(motion->axis_data[0], devinfo->lightgun.miny, devinfo->lightgun.maxy); + } + break; + } + } + else if (xevent.type==button_press_type || xevent.type==button_release_type) + { + XDeviceButtonEvent *button = (XDeviceButtonEvent *) &xevent; + devinfo=get_lightgun_info_for_deviceid(button->deviceid); + devinfo->lightgun.buttons[button->button]=(xevent.type==button_press_type)?0x80:0; + } + } #endif if (SDLMAME_EVENTS_IN_WORKER_THREAD) @@ -1731,7 +1731,7 @@ void sdlinput_poll(running_machine &machine) } if (event.type == SDL_KEYUP && - event.key.keysym.sym == SDLK_CAPSLOCK) + event.key.keysym.sym == SDLK_CAPSLOCK) { /* more caps-lock hack */ event.type = SDL_KEYDOWN; diff --git a/src/osd/sdl/netdev.c b/src/osd/sdl/netdev.c index 27b2d4858ac..f42a8da32f1 100644 --- a/src/osd/sdl/netdev.c +++ b/src/osd/sdl/netdev.c @@ -4,20 +4,20 @@ void sdlnetdev_init(running_machine &machine) { - #ifdef SDLMAME_NET_TAPTUN + #ifdef SDLMAME_NET_TAPTUN init_tap(); - #endif - #ifdef SDLMAME_NET_PCAP - init_pcap(); - #endif + #endif + #ifdef SDLMAME_NET_PCAP + init_pcap(); + #endif } void sdlnetdev_deinit(running_machine &machine) { - #ifdef SDLMAME_NET_TAPTUN + #ifdef SDLMAME_NET_TAPTUN deinit_tap(); - #endif - #ifdef SDLMAME_NET_PCAP - deinit_pcap(); - #endif + #endif + #ifdef SDLMAME_NET_PCAP + deinit_pcap(); + #endif } diff --git a/src/osd/sdl/netdev_pcap.c b/src/osd/sdl/netdev_pcap.c index f8ae41853f5..6f0c3ce6892 100644 --- a/src/osd/sdl/netdev_pcap.c +++ b/src/osd/sdl/netdev_pcap.c @@ -84,14 +84,14 @@ void init_pcap() return; } - if (devs) + if (devs) { - while(devs->next) - { - add_netdev(devs->name, devs->description, create_pcap); - devs = devs->next; - } - } + while(devs->next) + { + add_netdev(devs->name, devs->description, create_pcap); + devs = devs->next; + } + } } void deinit_pcap() diff --git a/src/osd/sdl/netdev_tap.c b/src/osd/sdl/netdev_tap.c index 3e024a4285a..86f734cc7ed 100644 --- a/src/osd/sdl/netdev_tap.c +++ b/src/osd/sdl/netdev_tap.c @@ -8,8 +8,8 @@ #include "osdnet.h" #ifdef __linux__ -#define IFF_TAP 0x0002 -#define IFF_NO_PI 0x1000 +#define IFF_TAP 0x0002 +#define IFF_NO_PI 0x1000 #define TUNSETIFF _IOW('T', 202, int) #endif @@ -51,7 +51,7 @@ netdev_tap::netdev_tap(const char *name, class device_network_interface *ifdev, m_fd = -1; return; } - mame_printf_verbose("netdev_tap: network up!\n"); + mame_printf_verbose("netdev_tap: network up!\n"); strncpy(m_ifname, ifr.ifr_name, 10); fcntl(m_fd, F_SETFL, O_NONBLOCK); diff --git a/src/osd/sdl/osd_opengl.h b/src/osd/sdl/osd_opengl.h index e51b7e52559..c7709f76d03 100644 --- a/src/osd/sdl/osd_opengl.h +++ b/src/osd/sdl/osd_opengl.h @@ -13,8 +13,8 @@ #if USE_OPENGL /* equivalent to #include <GL/gl.h> - * #include <GL/glext.h> - */ + * #include <GL/glext.h> + */ #if (SDLMAME_SDL2) #include <SDL2/SDL_version.h> #else @@ -33,9 +33,9 @@ #endif #else /* - * SDL 1.2.9 does not provide everything we need - * We therefore distribute it ourselves - */ + * SDL 1.2.9 does not provide everything we need + * We therefore distribute it ourselves + */ #include "SDL1211_opengl.h" #endif #ifdef USE_DISPATCH_GL @@ -67,8 +67,8 @@ extern osd_gl_dispatch *gl_dispatch; /* - * Use gl_mangle to map function names - */ + * Use gl_mangle to map function names + */ #define MANGLE(x) gl_dispatch->gl ## x #include "osd_opengl.h" @@ -81,1465 +81,1465 @@ #else /* MANGLE */ /*************************************************************** - * - * Used to redefine opengl functions - * - * Credits: taken from gl_mangle.h - * - ***************************************************************/ + * + * Used to redefine opengl functions + * + * Credits: taken from gl_mangle.h + * + ***************************************************************/ - #define glAccum MANGLE(Accum) - #define glActiveStencilFaceEXT MANGLE(ActiveStencilFaceEXT) - #define glActiveTextureARB MANGLE(ActiveTextureARB) - #define glActiveTexture MANGLE(ActiveTexture) - #define glAlphaFragmentOp1ATI MANGLE(AlphaFragmentOp1ATI) - #define glAlphaFragmentOp2ATI MANGLE(AlphaFragmentOp2ATI) - #define glAlphaFragmentOp3ATI MANGLE(AlphaFragmentOp3ATI) - #define glAlphaFunc MANGLE(AlphaFunc) - #define glApplyTextureEXT MANGLE(ApplyTextureEXT) - #define glAreProgramsResidentNV MANGLE(AreProgramsResidentNV) - #define glAreTexturesResidentEXT MANGLE(AreTexturesResidentEXT) - #define glAreTexturesResident MANGLE(AreTexturesResident) - #define glArrayElementEXT MANGLE(ArrayElementEXT) - #define glArrayElement MANGLE(ArrayElement) - #define glArrayObjectATI MANGLE(ArrayObjectATI) - #define glAsyncMarkerSGIX MANGLE(AsyncMarkerSGIX) - #define glAttachObjectARB MANGLE(AttachObjectARB) - #define glAttachShader MANGLE(AttachShader) - #define glBeginFragmentShaderATI MANGLE(BeginFragmentShaderATI) - #define glBegin MANGLE(Begin) - #define glBeginOcclusionQueryNV MANGLE(BeginOcclusionQueryNV) - #define glBeginQueryARB MANGLE(BeginQueryARB) - #define glBeginQuery MANGLE(BeginQuery) - #define glBeginVertexShaderEXT MANGLE(BeginVertexShaderEXT) - #define glBindAttribLocationARB MANGLE(BindAttribLocationARB) - #define glBindAttribLocation MANGLE(BindAttribLocation) - #define glBindBufferARB MANGLE(BindBufferARB) - #define glBindBuffer MANGLE(BindBuffer) - #define glBindFragmentShaderATI MANGLE(BindFragmentShaderATI) - #define glBindFramebufferEXT MANGLE(BindFramebufferEXT) - #define glBindLightParameterEXT MANGLE(BindLightParameterEXT) - #define glBindMaterialParameterEXT MANGLE(BindMaterialParameterEXT) - #define glBindParameterEXT MANGLE(BindParameterEXT) - #define glBindProgramARB MANGLE(BindProgramARB) - #define glBindProgramNV MANGLE(BindProgramNV) - #define glBindRenderbufferEXT MANGLE(BindRenderbufferEXT) - #define glBindTexGenParameterEXT MANGLE(BindTexGenParameterEXT) - #define glBindTextureEXT MANGLE(BindTextureEXT) - #define glBindTexture MANGLE(BindTexture) - #define glBindTextureUnitParameterEXT MANGLE(BindTextureUnitParameterEXT) - #define glBindVertexArrayAPPLE MANGLE(BindVertexArrayAPPLE) - #define glBindVertexShaderEXT MANGLE(BindVertexShaderEXT) - #define glBinormal3bEXT MANGLE(Binormal3bEXT) - #define glBinormal3bvEXT MANGLE(Binormal3bvEXT) - #define glBinormal3dEXT MANGLE(Binormal3dEXT) - #define glBinormal3dvEXT MANGLE(Binormal3dvEXT) - #define glBinormal3fEXT MANGLE(Binormal3fEXT) - #define glBinormal3fvEXT MANGLE(Binormal3fvEXT) - #define glBinormal3iEXT MANGLE(Binormal3iEXT) - #define glBinormal3ivEXT MANGLE(Binormal3ivEXT) - #define glBinormal3sEXT MANGLE(Binormal3sEXT) - #define glBinormal3svEXT MANGLE(Binormal3svEXT) - #define glBinormalPointerEXT MANGLE(BinormalPointerEXT) - #define glBitmap MANGLE(Bitmap) - #define glBlendColorEXT MANGLE(BlendColorEXT) - #define glBlendColor MANGLE(BlendColor) - #define glBlendEquationEXT MANGLE(BlendEquationEXT) - #define glBlendEquation MANGLE(BlendEquation) - #define glBlendEquationSeparateATI MANGLE(BlendEquationSeparateATI) - #define glBlendEquationSeparateEXT MANGLE(BlendEquationSeparateEXT) - #define glBlendEquationSeparate MANGLE(BlendEquationSeparate) - #define glBlendFunc MANGLE(BlendFunc) - #define glBlendFuncSeparateEXT MANGLE(BlendFuncSeparateEXT) - #define glBlendFuncSeparateINGR MANGLE(BlendFuncSeparateINGR) - #define glBlendFuncSeparate MANGLE(BlendFuncSeparate) - #define glBlitFramebufferEXT MANGLE(BlitFramebufferEXT) - #define glBufferDataARB MANGLE(BufferDataARB) - #define glBufferData MANGLE(BufferData) - #define glBufferSubDataARB MANGLE(BufferSubDataARB) - #define glBufferSubData MANGLE(BufferSubData) - #define glCallList MANGLE(CallList) - #define glCallLists MANGLE(CallLists) - #define glCheckFramebufferStatusEXT MANGLE(CheckFramebufferStatusEXT) - #define glClampColorARB MANGLE(ClampColorARB) - #define glClearAccum MANGLE(ClearAccum) - #define glClearColor MANGLE(ClearColor) - #define glClearDebugLogMESA MANGLE(ClearDebugLogMESA) - #define glClearDepth MANGLE(ClearDepth) - #define glClearIndex MANGLE(ClearIndex) - #define glClear MANGLE(Clear) - #define glClearStencil MANGLE(ClearStencil) - #define glClientActiveTextureARB MANGLE(ClientActiveTextureARB) - #define glClientActiveTexture MANGLE(ClientActiveTexture) - #define glClientActiveVertexStreamATI MANGLE(ClientActiveVertexStreamATI) - #define glClipPlane MANGLE(ClipPlane) - #define glColor3b MANGLE(Color3b) - #define glColor3bv MANGLE(Color3bv) - #define glColor3d MANGLE(Color3d) - #define glColor3dv MANGLE(Color3dv) - #define glColor3f MANGLE(Color3f) - #define glColor3fVertex3fSUN MANGLE(Color3fVertex3fSUN) - #define glColor3fVertex3fvSUN MANGLE(Color3fVertex3fvSUN) - #define glColor3fv MANGLE(Color3fv) - #define glColor3hNV MANGLE(Color3hNV) - #define glColor3hvNV MANGLE(Color3hvNV) - #define glColor3i MANGLE(Color3i) - #define glColor3iv MANGLE(Color3iv) - #define glColor3s MANGLE(Color3s) - #define glColor3sv MANGLE(Color3sv) - #define glColor3ub MANGLE(Color3ub) - #define glColor3ubv MANGLE(Color3ubv) - #define glColor3ui MANGLE(Color3ui) - #define glColor3uiv MANGLE(Color3uiv) - #define glColor3us MANGLE(Color3us) - #define glColor3usv MANGLE(Color3usv) - #define glColor4b MANGLE(Color4b) - #define glColor4bv MANGLE(Color4bv) - #define glColor4d MANGLE(Color4d) - #define glColor4dv MANGLE(Color4dv) - #define glColor4f MANGLE(Color4f) - #define glColor4fNormal3fVertex3fSUN MANGLE(Color4fNormal3fVertex3fSUN) - #define glColor4fNormal3fVertex3fvSUN MANGLE(Color4fNormal3fVertex3fvSUN) - #define glColor4fv MANGLE(Color4fv) - #define glColor4hNV MANGLE(Color4hNV) - #define glColor4hvNV MANGLE(Color4hvNV) - #define glColor4i MANGLE(Color4i) - #define glColor4iv MANGLE(Color4iv) - #define glColor4s MANGLE(Color4s) - #define glColor4sv MANGLE(Color4sv) - #define glColor4ub MANGLE(Color4ub) - #define glColor4ubVertex2fSUN MANGLE(Color4ubVertex2fSUN) - #define glColor4ubVertex2fvSUN MANGLE(Color4ubVertex2fvSUN) - #define glColor4ubVertex3fSUN MANGLE(Color4ubVertex3fSUN) - #define glColor4ubVertex3fvSUN MANGLE(Color4ubVertex3fvSUN) - #define glColor4ubv MANGLE(Color4ubv) - #define glColor4ui MANGLE(Color4ui) - #define glColor4uiv MANGLE(Color4uiv) - #define glColor4us MANGLE(Color4us) - #define glColor4usv MANGLE(Color4usv) - #define glColorFragmentOp1ATI MANGLE(ColorFragmentOp1ATI) - #define glColorFragmentOp2ATI MANGLE(ColorFragmentOp2ATI) - #define glColorFragmentOp3ATI MANGLE(ColorFragmentOp3ATI) - #define glColorMask MANGLE(ColorMask) - #define glColorMaterial MANGLE(ColorMaterial) - #define glColorPointerEXT MANGLE(ColorPointerEXT) - #define glColorPointerListIBM MANGLE(ColorPointerListIBM) - #define glColorPointer MANGLE(ColorPointer) - #define glColorPointervINTEL MANGLE(ColorPointervINTEL) - #define glColorSubTableEXT MANGLE(ColorSubTableEXT) - #define glColorSubTable MANGLE(ColorSubTable) - #define glColorTableEXT MANGLE(ColorTableEXT) - #define glColorTable MANGLE(ColorTable) - #define glColorTableParameterfv MANGLE(ColorTableParameterfv) - #define glColorTableParameterfvSGI MANGLE(ColorTableParameterfvSGI) - #define glColorTableParameteriv MANGLE(ColorTableParameteriv) - #define glColorTableParameterivSGI MANGLE(ColorTableParameterivSGI) - #define glColorTableSGI MANGLE(ColorTableSGI) - #define glCombinerInputNV MANGLE(CombinerInputNV) - #define glCombinerOutputNV MANGLE(CombinerOutputNV) - #define glCombinerParameterfNV MANGLE(CombinerParameterfNV) - #define glCombinerParameterfvNV MANGLE(CombinerParameterfvNV) - #define glCombinerParameteriNV MANGLE(CombinerParameteriNV) - #define glCombinerParameterivNV MANGLE(CombinerParameterivNV) - #define glCombinerStageParameterfvNV MANGLE(CombinerStageParameterfvNV) - #define glCompileShaderARB MANGLE(CompileShaderARB) - #define glCompileShader MANGLE(CompileShader) - #define glCompressedTexImage1DARB MANGLE(CompressedTexImage1DARB) - #define glCompressedTexImage1D MANGLE(CompressedTexImage1D) - #define glCompressedTexImage2DARB MANGLE(CompressedTexImage2DARB) - #define glCompressedTexImage2D MANGLE(CompressedTexImage2D) - #define glCompressedTexImage3DARB MANGLE(CompressedTexImage3DARB) - #define glCompressedTexImage3D MANGLE(CompressedTexImage3D) - #define glCompressedTexSubImage1DARB MANGLE(CompressedTexSubImage1DARB) - #define glCompressedTexSubImage1D MANGLE(CompressedTexSubImage1D) - #define glCompressedTexSubImage2DARB MANGLE(CompressedTexSubImage2DARB) - #define glCompressedTexSubImage2D MANGLE(CompressedTexSubImage2D) - #define glCompressedTexSubImage3DARB MANGLE(CompressedTexSubImage3DARB) - #define glCompressedTexSubImage3D MANGLE(CompressedTexSubImage3D) - #define glConvolutionFilter1DEXT MANGLE(ConvolutionFilter1DEXT) - #define glConvolutionFilter1D MANGLE(ConvolutionFilter1D) - #define glConvolutionFilter2DEXT MANGLE(ConvolutionFilter2DEXT) - #define glConvolutionFilter2D MANGLE(ConvolutionFilter2D) - #define glConvolutionParameterfEXT MANGLE(ConvolutionParameterfEXT) - #define glConvolutionParameterf MANGLE(ConvolutionParameterf) - #define glConvolutionParameterfvEXT MANGLE(ConvolutionParameterfvEXT) - #define glConvolutionParameterfv MANGLE(ConvolutionParameterfv) - #define glConvolutionParameteriEXT MANGLE(ConvolutionParameteriEXT) - #define glConvolutionParameteri MANGLE(ConvolutionParameteri) - #define glConvolutionParameterivEXT MANGLE(ConvolutionParameterivEXT) - #define glConvolutionParameteriv MANGLE(ConvolutionParameteriv) - #define glCopyColorSubTableEXT MANGLE(CopyColorSubTableEXT) - #define glCopyColorSubTable MANGLE(CopyColorSubTable) - #define glCopyColorTable MANGLE(CopyColorTable) - #define glCopyColorTableSGI MANGLE(CopyColorTableSGI) - #define glCopyConvolutionFilter1DEXT MANGLE(CopyConvolutionFilter1DEXT) - #define glCopyConvolutionFilter1D MANGLE(CopyConvolutionFilter1D) - #define glCopyConvolutionFilter2DEXT MANGLE(CopyConvolutionFilter2DEXT) - #define glCopyConvolutionFilter2D MANGLE(CopyConvolutionFilter2D) - #define glCopyPixels MANGLE(CopyPixels) - #define glCopyTexImage1DEXT MANGLE(CopyTexImage1DEXT) - #define glCopyTexImage1D MANGLE(CopyTexImage1D) - #define glCopyTexImage2DEXT MANGLE(CopyTexImage2DEXT) - #define glCopyTexImage2D MANGLE(CopyTexImage2D) - #define glCopyTexSubImage1DEXT MANGLE(CopyTexSubImage1DEXT) - #define glCopyTexSubImage1D MANGLE(CopyTexSubImage1D) - #define glCopyTexSubImage2DEXT MANGLE(CopyTexSubImage2DEXT) - #define glCopyTexSubImage2D MANGLE(CopyTexSubImage2D) - #define glCopyTexSubImage3DEXT MANGLE(CopyTexSubImage3DEXT) - #define glCopyTexSubImage3D MANGLE(CopyTexSubImage3D) - #define glCreateDebugObjectMESA MANGLE(CreateDebugObjectMESA) - #define glCreateProgram MANGLE(CreateProgram) - #define glCreateProgramObjectARB MANGLE(CreateProgramObjectARB) - #define glCreateShader MANGLE(CreateShader) - #define glCreateShaderObjectARB MANGLE(CreateShaderObjectARB) - #define glCullFace MANGLE(CullFace) - #define glCullParameterdvEXT MANGLE(CullParameterdvEXT) - #define glCullParameterfvEXT MANGLE(CullParameterfvEXT) - #define glCurrentPaletteMatrixARB MANGLE(CurrentPaletteMatrixARB) - #define glDeformationMap3dSGIX MANGLE(DeformationMap3dSGIX) - #define glDeformationMap3fSGIX MANGLE(DeformationMap3fSGIX) - #define glDeformSGIX MANGLE(DeformSGIX) - #define glDeleteAsyncMarkersSGIX MANGLE(DeleteAsyncMarkersSGIX) - #define glDeleteBuffersARB MANGLE(DeleteBuffersARB) - #define glDeleteBuffers MANGLE(DeleteBuffers) - #define glDeleteFencesAPPLE MANGLE(DeleteFencesAPPLE) - #define glDeleteFencesNV MANGLE(DeleteFencesNV) - #define glDeleteFragmentShaderATI MANGLE(DeleteFragmentShaderATI) - #define glDeleteFramebuffersEXT MANGLE(DeleteFramebuffersEXT) - #define glDeleteLists MANGLE(DeleteLists) - #define glDeleteObjectARB MANGLE(DeleteObjectARB) - #define glDeleteOcclusionQueriesNV MANGLE(DeleteOcclusionQueriesNV) - #define glDeleteProgram MANGLE(DeleteProgram) - #define glDeleteProgramsARB MANGLE(DeleteProgramsARB) - #define glDeleteProgramsNV MANGLE(DeleteProgramsNV) - #define glDeleteQueriesARB MANGLE(DeleteQueriesARB) - #define glDeleteQueries MANGLE(DeleteQueries) - #define glDeleteRenderbuffersEXT MANGLE(DeleteRenderbuffersEXT) - #define glDeleteShader MANGLE(DeleteShader) - #define glDeleteTexturesEXT MANGLE(DeleteTexturesEXT) - #define glDeleteTextures MANGLE(DeleteTextures) - #define glDeleteVertexArraysAPPLE MANGLE(DeleteVertexArraysAPPLE) - #define glDeleteVertexShaderEXT MANGLE(DeleteVertexShaderEXT) - #define glDepthBoundsEXT MANGLE(DepthBoundsEXT) - #define glDepthFunc MANGLE(DepthFunc) - #define glDepthMask MANGLE(DepthMask) - #define glDepthRange MANGLE(DepthRange) - #define glDetachObjectARB MANGLE(DetachObjectARB) - #define glDetachShader MANGLE(DetachShader) - #define glDetailTexFuncSGIS MANGLE(DetailTexFuncSGIS) - #define glDisableClientState MANGLE(DisableClientState) - #define glDisable MANGLE(Disable) - #define glDisableVariantClientStateEXT MANGLE(DisableVariantClientStateEXT) - #define glDisableVertexAttribArrayARB MANGLE(DisableVertexAttribArrayARB) - #define glDisableVertexAttribArray MANGLE(DisableVertexAttribArray) - #define glDrawArraysEXT MANGLE(DrawArraysEXT) - #define glDrawArrays MANGLE(DrawArrays) - #define glDrawBuffer MANGLE(DrawBuffer) - #define glDrawBuffersARB MANGLE(DrawBuffersARB) - #define glDrawBuffersATI MANGLE(DrawBuffersATI) - #define glDrawBuffers MANGLE(DrawBuffers) - #define glDrawElementArrayAPPLE MANGLE(DrawElementArrayAPPLE) - #define glDrawElementArrayATI MANGLE(DrawElementArrayATI) - #define glDrawElements MANGLE(DrawElements) - #define glDrawMeshArraysSUN MANGLE(DrawMeshArraysSUN) - #define glDrawPixels MANGLE(DrawPixels) - #define glDrawRangeElementArrayAPPLE MANGLE(DrawRangeElementArrayAPPLE) - #define glDrawRangeElementArrayATI MANGLE(DrawRangeElementArrayATI) - #define glDrawRangeElementsEXT MANGLE(DrawRangeElementsEXT) - #define glDrawRangeElements MANGLE(DrawRangeElements) - #define glEdgeFlag MANGLE(EdgeFlag) - #define glEdgeFlagPointerEXT MANGLE(EdgeFlagPointerEXT) - #define glEdgeFlagPointerListIBM MANGLE(EdgeFlagPointerListIBM) - #define glEdgeFlagPointer MANGLE(EdgeFlagPointer) - #define glEdgeFlagv MANGLE(EdgeFlagv) - #define glElementPointerAPPLE MANGLE(ElementPointerAPPLE) - #define glElementPointerATI MANGLE(ElementPointerATI) - #define glEnableClientState MANGLE(EnableClientState) - #define glEnable MANGLE(Enable) - #define glEnableVariantClientStateEXT MANGLE(EnableVariantClientStateEXT) - #define glEnableVertexAttribArrayARB MANGLE(EnableVertexAttribArrayARB) - #define glEnableVertexAttribArray MANGLE(EnableVertexAttribArray) - #define glEndFragmentShaderATI MANGLE(EndFragmentShaderATI) - #define glEndList MANGLE(EndList) - #define glEnd MANGLE(End) - #define glEndOcclusionQueryNV MANGLE(EndOcclusionQueryNV) - #define glEndQueryARB MANGLE(EndQueryARB) - #define glEndQuery MANGLE(EndQuery) - #define glEndVertexShaderEXT MANGLE(EndVertexShaderEXT) - #define glEvalCoord1d MANGLE(EvalCoord1d) - #define glEvalCoord1dv MANGLE(EvalCoord1dv) - #define glEvalCoord1f MANGLE(EvalCoord1f) - #define glEvalCoord1fv MANGLE(EvalCoord1fv) - #define glEvalCoord2d MANGLE(EvalCoord2d) - #define glEvalCoord2dv MANGLE(EvalCoord2dv) - #define glEvalCoord2f MANGLE(EvalCoord2f) - #define glEvalCoord2fv MANGLE(EvalCoord2fv) - #define glEvalMapsNV MANGLE(EvalMapsNV) - #define glEvalMesh1 MANGLE(EvalMesh1) - #define glEvalMesh2 MANGLE(EvalMesh2) - #define glEvalPoint1 MANGLE(EvalPoint1) - #define glEvalPoint2 MANGLE(EvalPoint2) - #define glExecuteProgramNV MANGLE(ExecuteProgramNV) - #define glExtractComponentEXT MANGLE(ExtractComponentEXT) - #define glFeedbackBuffer MANGLE(FeedbackBuffer) - #define glFinalCombinerInputNV MANGLE(FinalCombinerInputNV) - #define glFinishAsyncSGIX MANGLE(FinishAsyncSGIX) - #define glFinishFenceAPPLE MANGLE(FinishFenceAPPLE) - #define glFinishFenceNV MANGLE(FinishFenceNV) - #define glFinish MANGLE(Finish) - #define glFinishObjectAPPLE MANGLE(FinishObjectAPPLE) - #define glFinishTextureSUNX MANGLE(FinishTextureSUNX) - #define glFlush MANGLE(Flush) - #define glFlushPixelDataRangeNV MANGLE(FlushPixelDataRangeNV) - #define glFlushRasterSGIX MANGLE(FlushRasterSGIX) - #define glFlushVertexArrayRangeAPPLE MANGLE(FlushVertexArrayRangeAPPLE) - #define glFlushVertexArrayRangeNV MANGLE(FlushVertexArrayRangeNV) - #define glFogCoorddEXT MANGLE(FogCoorddEXT) - #define glFogCoordd MANGLE(FogCoordd) - #define glFogCoorddvEXT MANGLE(FogCoorddvEXT) - #define glFogCoorddv MANGLE(FogCoorddv) - #define glFogCoordfEXT MANGLE(FogCoordfEXT) - #define glFogCoordf MANGLE(FogCoordf) - #define glFogCoordfvEXT MANGLE(FogCoordfvEXT) - #define glFogCoordfv MANGLE(FogCoordfv) - #define glFogCoordhNV MANGLE(FogCoordhNV) - #define glFogCoordhvNV MANGLE(FogCoordhvNV) - #define glFogCoordPointerEXT MANGLE(FogCoordPointerEXT) - #define glFogCoordPointerListIBM MANGLE(FogCoordPointerListIBM) - #define glFogCoordPointer MANGLE(FogCoordPointer) - #define glFogf MANGLE(Fogf) - #define glFogFuncSGIS MANGLE(FogFuncSGIS) - #define glFogfv MANGLE(Fogfv) - #define glFogi MANGLE(Fogi) - #define glFogiv MANGLE(Fogiv) - #define glFragmentColorMaterialSGIX MANGLE(FragmentColorMaterialSGIX) - #define glFragmentLightfSGIX MANGLE(FragmentLightfSGIX) - #define glFragmentLightfvSGIX MANGLE(FragmentLightfvSGIX) - #define glFragmentLightiSGIX MANGLE(FragmentLightiSGIX) - #define glFragmentLightivSGIX MANGLE(FragmentLightivSGIX) - #define glFragmentLightModelfSGIX MANGLE(FragmentLightModelfSGIX) - #define glFragmentLightModelfvSGIX MANGLE(FragmentLightModelfvSGIX) - #define glFragmentLightModeliSGIX MANGLE(FragmentLightModeliSGIX) - #define glFragmentLightModelivSGIX MANGLE(FragmentLightModelivSGIX) - #define glFragmentMaterialfSGIX MANGLE(FragmentMaterialfSGIX) - #define glFragmentMaterialfvSGIX MANGLE(FragmentMaterialfvSGIX) - #define glFragmentMaterialiSGIX MANGLE(FragmentMaterialiSGIX) - #define glFragmentMaterialivSGIX MANGLE(FragmentMaterialivSGIX) - #define glFramebufferRenderbufferEXT MANGLE(FramebufferRenderbufferEXT) - #define glFramebufferTexture1DEXT MANGLE(FramebufferTexture1DEXT) - #define glFramebufferTexture2DEXT MANGLE(FramebufferTexture2DEXT) - #define glFramebufferTexture3DEXT MANGLE(FramebufferTexture3DEXT) - #define glFrameZoomSGIX MANGLE(FrameZoomSGIX) - #define glFreeObjectBufferATI MANGLE(FreeObjectBufferATI) - #define glFrontFace MANGLE(FrontFace) - #define glFrustum MANGLE(Frustum) - #define glGenAsyncMarkersSGIX MANGLE(GenAsyncMarkersSGIX) - #define glGenBuffersARB MANGLE(GenBuffersARB) - #define glGenBuffers MANGLE(GenBuffers) - #define glGenerateMipmapEXT MANGLE(GenerateMipmapEXT) - #define glGenFencesAPPLE MANGLE(GenFencesAPPLE) - #define glGenFencesNV MANGLE(GenFencesNV) - #define glGenFragmentShadersATI MANGLE(GenFragmentShadersATI) - #define glGenFramebuffersEXT MANGLE(GenFramebuffersEXT) - #define glGenLists MANGLE(GenLists) - #define glGenOcclusionQueriesNV MANGLE(GenOcclusionQueriesNV) - #define glGenProgramsARB MANGLE(GenProgramsARB) - #define glGenProgramsNV MANGLE(GenProgramsNV) - #define glGenQueriesARB MANGLE(GenQueriesARB) - #define glGenQueries MANGLE(GenQueries) - #define glGenRenderbuffersEXT MANGLE(GenRenderbuffersEXT) - #define glGenSymbolsEXT MANGLE(GenSymbolsEXT) - #define glGenTexturesEXT MANGLE(GenTexturesEXT) - #define glGenTextures MANGLE(GenTextures) - #define glGenVertexArraysAPPLE MANGLE(GenVertexArraysAPPLE) - #define glGenVertexShadersEXT MANGLE(GenVertexShadersEXT) - #define glGetActiveAttribARB MANGLE(GetActiveAttribARB) - #define glGetActiveAttrib MANGLE(GetActiveAttrib) - #define glGetActiveUniformARB MANGLE(GetActiveUniformARB) - #define glGetActiveUniform MANGLE(GetActiveUniform) - #define glGetArrayObjectfvATI MANGLE(GetArrayObjectfvATI) - #define glGetArrayObjectivATI MANGLE(GetArrayObjectivATI) - #define glGetAttachedObjectsARB MANGLE(GetAttachedObjectsARB) - #define glGetAttachedShaders MANGLE(GetAttachedShaders) - #define glGetAttribLocationARB MANGLE(GetAttribLocationARB) - #define glGetAttribLocation MANGLE(GetAttribLocation) - #define glGetBooleanv MANGLE(GetBooleanv) - #define glGetBufferParameterivARB MANGLE(GetBufferParameterivARB) - #define glGetBufferParameteriv MANGLE(GetBufferParameteriv) - #define glGetBufferPointervARB MANGLE(GetBufferPointervARB) - #define glGetBufferPointerv MANGLE(GetBufferPointerv) - #define glGetBufferSubDataARB MANGLE(GetBufferSubDataARB) - #define glGetBufferSubData MANGLE(GetBufferSubData) - #define glGetClipPlane MANGLE(GetClipPlane) - #define glGetColorTableEXT MANGLE(GetColorTableEXT) - #define glGetColorTable MANGLE(GetColorTable) - #define glGetColorTableParameterfvEXT MANGLE(GetColorTableParameterfvEXT) - #define glGetColorTableParameterfv MANGLE(GetColorTableParameterfv) - #define glGetColorTableParameterfvSGI MANGLE(GetColorTableParameterfvSGI) - #define glGetColorTableParameterivEXT MANGLE(GetColorTableParameterivEXT) - #define glGetColorTableParameteriv MANGLE(GetColorTableParameteriv) - #define glGetColorTableParameterivSGI MANGLE(GetColorTableParameterivSGI) - #define glGetColorTableSGI MANGLE(GetColorTableSGI) - #define glGetCombinerInputParameterfvNV MANGLE(GetCombinerInputParameterfvNV) - #define glGetCombinerInputParameterivNV MANGLE(GetCombinerInputParameterivNV) - #define glGetCombinerOutputParameterfvNV MANGLE(GetCombinerOutputParameterfvNV) - #define glGetCombinerOutputParameterivNV MANGLE(GetCombinerOutputParameterivNV) - #define glGetCombinerStageParameterfvNV MANGLE(GetCombinerStageParameterfvNV) - #define glGetCompressedTexImageARB MANGLE(GetCompressedTexImageARB) - #define glGetCompressedTexImage MANGLE(GetCompressedTexImage) - #define glGetConvolutionFilterEXT MANGLE(GetConvolutionFilterEXT) - #define glGetConvolutionFilter MANGLE(GetConvolutionFilter) - #define glGetConvolutionParameterfvEXT MANGLE(GetConvolutionParameterfvEXT) - #define glGetConvolutionParameterfv MANGLE(GetConvolutionParameterfv) - #define glGetConvolutionParameterivEXT MANGLE(GetConvolutionParameterivEXT) - #define glGetConvolutionParameteriv MANGLE(GetConvolutionParameteriv) - #define glGetDebugLogLengthMESA MANGLE(GetDebugLogLengthMESA) - #define glGetDebugLogMESA MANGLE(GetDebugLogMESA) - #define glGetDetailTexFuncSGIS MANGLE(GetDetailTexFuncSGIS) - #define glGetDoublev MANGLE(GetDoublev) - #define glGetError MANGLE(GetError) - #define glGetFenceivNV MANGLE(GetFenceivNV) - #define glGetFinalCombinerInputParameterfvNV MANGLE(GetFinalCombinerInputParameterfvNV) - #define glGetFinalCombinerInputParameterivNV MANGLE(GetFinalCombinerInputParameterivNV) - #define glGetFloatv MANGLE(GetFloatv) - #define glGetFogFuncSGIS MANGLE(GetFogFuncSGIS) - #define glGetFragmentLightfvSGIX MANGLE(GetFragmentLightfvSGIX) - #define glGetFragmentLightivSGIX MANGLE(GetFragmentLightivSGIX) - #define glGetFragmentMaterialfvSGIX MANGLE(GetFragmentMaterialfvSGIX) - #define glGetFragmentMaterialivSGIX MANGLE(GetFragmentMaterialivSGIX) - #define glGetFramebufferAttachmentParameterivEXT MANGLE(GetFramebufferAttachmentParameterivEXT) - #define glGetHandleARB MANGLE(GetHandleARB) - #define glGetHistogramEXT MANGLE(GetHistogramEXT) - #define glGetHistogram MANGLE(GetHistogram) - #define glGetHistogramParameterfvEXT MANGLE(GetHistogramParameterfvEXT) - #define glGetHistogramParameterfv MANGLE(GetHistogramParameterfv) - #define glGetHistogramParameterivEXT MANGLE(GetHistogramParameterivEXT) - #define glGetHistogramParameteriv MANGLE(GetHistogramParameteriv) - #define glGetImageTransformParameterfvHP MANGLE(GetImageTransformParameterfvHP) - #define glGetImageTransformParameterivHP MANGLE(GetImageTransformParameterivHP) - #define glGetInfoLogARB MANGLE(GetInfoLogARB) - #define glGetInstrumentsSGIX MANGLE(GetInstrumentsSGIX) - #define glGetIntegerv MANGLE(GetIntegerv) - #define glGetInvariantBooleanvEXT MANGLE(GetInvariantBooleanvEXT) - #define glGetInvariantFloatvEXT MANGLE(GetInvariantFloatvEXT) - #define glGetInvariantIntegervEXT MANGLE(GetInvariantIntegervEXT) - #define glGetLightfv MANGLE(GetLightfv) - #define glGetLightiv MANGLE(GetLightiv) - #define glGetListParameterfvSGIX MANGLE(GetListParameterfvSGIX) - #define glGetListParameterivSGIX MANGLE(GetListParameterivSGIX) - #define glGetLocalConstantBooleanvEXT MANGLE(GetLocalConstantBooleanvEXT) - #define glGetLocalConstantFloatvEXT MANGLE(GetLocalConstantFloatvEXT) - #define glGetLocalConstantIntegervEXT MANGLE(GetLocalConstantIntegervEXT) - #define glGetMapAttribParameterfvNV MANGLE(GetMapAttribParameterfvNV) - #define glGetMapAttribParameterivNV MANGLE(GetMapAttribParameterivNV) - #define glGetMapControlPointsNV MANGLE(GetMapControlPointsNV) - #define glGetMapdv MANGLE(GetMapdv) - #define glGetMapfv MANGLE(GetMapfv) - #define glGetMapiv MANGLE(GetMapiv) - #define glGetMapParameterfvNV MANGLE(GetMapParameterfvNV) - #define glGetMapParameterivNV MANGLE(GetMapParameterivNV) - #define glGetMaterialfv MANGLE(GetMaterialfv) - #define glGetMaterialiv MANGLE(GetMaterialiv) - #define glGetMinmaxEXT MANGLE(GetMinmaxEXT) - #define glGetMinmax MANGLE(GetMinmax) - #define glGetMinmaxParameterfvEXT MANGLE(GetMinmaxParameterfvEXT) - #define glGetMinmaxParameterfv MANGLE(GetMinmaxParameterfv) - #define glGetMinmaxParameterivEXT MANGLE(GetMinmaxParameterivEXT) - #define glGetMinmaxParameteriv MANGLE(GetMinmaxParameteriv) - #define glGetObjectBufferfvATI MANGLE(GetObjectBufferfvATI) - #define glGetObjectBufferivATI MANGLE(GetObjectBufferivATI) - #define glGetObjectParameterfvARB MANGLE(GetObjectParameterfvARB) - #define glGetObjectParameterivARB MANGLE(GetObjectParameterivARB) - #define glGetOcclusionQueryivNV MANGLE(GetOcclusionQueryivNV) - #define glGetOcclusionQueryuivNV MANGLE(GetOcclusionQueryuivNV) - #define glGetPixelMapfv MANGLE(GetPixelMapfv) - #define glGetPixelMapuiv MANGLE(GetPixelMapuiv) - #define glGetPixelMapusv MANGLE(GetPixelMapusv) - #define glGetPixelTexGenParameterfvSGIS MANGLE(GetPixelTexGenParameterfvSGIS) - #define glGetPixelTexGenParameterivSGIS MANGLE(GetPixelTexGenParameterivSGIS) - #define glGetPointervEXT MANGLE(GetPointervEXT) - #define glGetPointerv MANGLE(GetPointerv) - #define glGetPolygonStipple MANGLE(GetPolygonStipple) - #define glGetProgramEnvParameterdvARB MANGLE(GetProgramEnvParameterdvARB) - #define glGetProgramEnvParameterfvARB MANGLE(GetProgramEnvParameterfvARB) - #define glGetProgramInfoLog MANGLE(GetProgramInfoLog) - #define glGetProgramivARB MANGLE(GetProgramivARB) - #define glGetProgramiv MANGLE(GetProgramiv) - #define glGetProgramivNV MANGLE(GetProgramivNV) - #define glGetProgramLocalParameterdvARB MANGLE(GetProgramLocalParameterdvARB) - #define glGetProgramLocalParameterfvARB MANGLE(GetProgramLocalParameterfvARB) - #define glGetProgramNamedParameterdvNV MANGLE(GetProgramNamedParameterdvNV) - #define glGetProgramNamedParameterfvNV MANGLE(GetProgramNamedParameterfvNV) - #define glGetProgramParameterdvNV MANGLE(GetProgramParameterdvNV) - #define glGetProgramParameterfvNV MANGLE(GetProgramParameterfvNV) - #define glGetProgramRegisterfvMESA MANGLE(GetProgramRegisterfvMESA) - #define glGetProgramStringARB MANGLE(GetProgramStringARB) - #define glGetProgramStringNV MANGLE(GetProgramStringNV) - #define glGetQueryivARB MANGLE(GetQueryivARB) - #define glGetQueryiv MANGLE(GetQueryiv) - #define glGetQueryObjecti64vEXT MANGLE(GetQueryObjecti64vEXT) - #define glGetQueryObjectivARB MANGLE(GetQueryObjectivARB) - #define glGetQueryObjectiv MANGLE(GetQueryObjectiv) - #define glGetQueryObjectui64vEXT MANGLE(GetQueryObjectui64vEXT) - #define glGetQueryObjectuivARB MANGLE(GetQueryObjectuivARB) - #define glGetQueryObjectuiv MANGLE(GetQueryObjectuiv) - #define glGetRenderbufferParameterivEXT MANGLE(GetRenderbufferParameterivEXT) - #define glGetSeparableFilterEXT MANGLE(GetSeparableFilterEXT) - #define glGetSeparableFilter MANGLE(GetSeparableFilter) - #define glGetShaderInfoLog MANGLE(GetShaderInfoLog) - #define glGetShaderiv MANGLE(GetShaderiv) - #define glGetShaderSourceARB MANGLE(GetShaderSourceARB) - #define glGetShaderSource MANGLE(GetShaderSource) - #define glGetSharpenTexFuncSGIS MANGLE(GetSharpenTexFuncSGIS) - #define glGetString MANGLE(GetString) - #define glGetTexBumpParameterfvATI MANGLE(GetTexBumpParameterfvATI) - #define glGetTexBumpParameterivATI MANGLE(GetTexBumpParameterivATI) - #define glGetTexEnvfv MANGLE(GetTexEnvfv) - #define glGetTexEnviv MANGLE(GetTexEnviv) - #define glGetTexFilterFuncSGIS MANGLE(GetTexFilterFuncSGIS) - #define glGetTexGendv MANGLE(GetTexGendv) - #define glGetTexGenfv MANGLE(GetTexGenfv) - #define glGetTexGeniv MANGLE(GetTexGeniv) - #define glGetTexImage MANGLE(GetTexImage) - #define glGetTexLevelParameterfv MANGLE(GetTexLevelParameterfv) - #define glGetTexLevelParameteriv MANGLE(GetTexLevelParameteriv) - #define glGetTexParameterfv MANGLE(GetTexParameterfv) - #define glGetTexParameteriv MANGLE(GetTexParameteriv) - #define glGetTrackMatrixivNV MANGLE(GetTrackMatrixivNV) - #define glGetUniformfvARB MANGLE(GetUniformfvARB) - #define glGetUniformfv MANGLE(GetUniformfv) - #define glGetUniformivARB MANGLE(GetUniformivARB) - #define glGetUniformiv MANGLE(GetUniformiv) - #define glGetUniformLocationARB MANGLE(GetUniformLocationARB) - #define glGetUniformLocation MANGLE(GetUniformLocation) - #define glGetVariantArrayObjectfvATI MANGLE(GetVariantArrayObjectfvATI) - #define glGetVariantArrayObjectivATI MANGLE(GetVariantArrayObjectivATI) - #define glGetVariantBooleanvEXT MANGLE(GetVariantBooleanvEXT) - #define glGetVariantFloatvEXT MANGLE(GetVariantFloatvEXT) - #define glGetVariantIntegervEXT MANGLE(GetVariantIntegervEXT) - #define glGetVariantPointervEXT MANGLE(GetVariantPointervEXT) - #define glGetVertexAttribArrayObjectfvATI MANGLE(GetVertexAttribArrayObjectfvATI) - #define glGetVertexAttribArrayObjectivATI MANGLE(GetVertexAttribArrayObjectivATI) - #define glGetVertexAttribdvARB MANGLE(GetVertexAttribdvARB) - #define glGetVertexAttribdv MANGLE(GetVertexAttribdv) - #define glGetVertexAttribdvNV MANGLE(GetVertexAttribdvNV) - #define glGetVertexAttribfvARB MANGLE(GetVertexAttribfvARB) - #define glGetVertexAttribfv MANGLE(GetVertexAttribfv) - #define glGetVertexAttribfvNV MANGLE(GetVertexAttribfvNV) - #define glGetVertexAttribivARB MANGLE(GetVertexAttribivARB) - #define glGetVertexAttribiv MANGLE(GetVertexAttribiv) - #define glGetVertexAttribivNV MANGLE(GetVertexAttribivNV) - #define glGetVertexAttribPointervARB MANGLE(GetVertexAttribPointervARB) - #define glGetVertexAttribPointerv MANGLE(GetVertexAttribPointerv) - #define glGetVertexAttribPointervNV MANGLE(GetVertexAttribPointervNV) - #define glGlobalAlphaFactorbSUN MANGLE(GlobalAlphaFactorbSUN) - #define glGlobalAlphaFactordSUN MANGLE(GlobalAlphaFactordSUN) - #define glGlobalAlphaFactorfSUN MANGLE(GlobalAlphaFactorfSUN) - #define glGlobalAlphaFactoriSUN MANGLE(GlobalAlphaFactoriSUN) - #define glGlobalAlphaFactorsSUN MANGLE(GlobalAlphaFactorsSUN) - #define glGlobalAlphaFactorubSUN MANGLE(GlobalAlphaFactorubSUN) - #define glGlobalAlphaFactoruiSUN MANGLE(GlobalAlphaFactoruiSUN) - #define glGlobalAlphaFactorusSUN MANGLE(GlobalAlphaFactorusSUN) - #define glHint MANGLE(Hint) - #define glHintPGI MANGLE(HintPGI) - #define glHistogramEXT MANGLE(HistogramEXT) - #define glHistogram MANGLE(Histogram) - #define glIglooInterfaceSGIX MANGLE(IglooInterfaceSGIX) - #define glImageTransformParameterfHP MANGLE(ImageTransformParameterfHP) - #define glImageTransformParameterfvHP MANGLE(ImageTransformParameterfvHP) - #define glImageTransformParameteriHP MANGLE(ImageTransformParameteriHP) - #define glImageTransformParameterivHP MANGLE(ImageTransformParameterivHP) - #define glIndexd MANGLE(Indexd) - #define glIndexdv MANGLE(Indexdv) - #define glIndexf MANGLE(Indexf) - #define glIndexFuncEXT MANGLE(IndexFuncEXT) - #define glIndexfv MANGLE(Indexfv) - #define glIndexi MANGLE(Indexi) - #define glIndexiv MANGLE(Indexiv) - #define glIndexMask MANGLE(IndexMask) - #define glIndexMaterialEXT MANGLE(IndexMaterialEXT) - #define glIndexPointerEXT MANGLE(IndexPointerEXT) - #define glIndexPointerListIBM MANGLE(IndexPointerListIBM) - #define glIndexPointer MANGLE(IndexPointer) - #define glIndexs MANGLE(Indexs) - #define glIndexsv MANGLE(Indexsv) - #define glIndexub MANGLE(Indexub) - #define glIndexubv MANGLE(Indexubv) - #define glInitNames MANGLE(InitNames) - #define glInsertComponentEXT MANGLE(InsertComponentEXT) - #define glInstrumentsBufferSGIX MANGLE(InstrumentsBufferSGIX) - #define glInterleavedArrays MANGLE(InterleavedArrays) - #define glIsAsyncMarkerSGIX MANGLE(IsAsyncMarkerSGIX) - #define glIsBufferARB MANGLE(IsBufferARB) - #define glIsBuffer MANGLE(IsBuffer) - #define glIsEnabled MANGLE(IsEnabled) - #define glIsFenceAPPLE MANGLE(IsFenceAPPLE) - #define glIsFenceNV MANGLE(IsFenceNV) - #define glIsFramebufferEXT MANGLE(IsFramebufferEXT) - #define glIsList MANGLE(IsList) - #define glIsObjectBufferATI MANGLE(IsObjectBufferATI) - #define glIsOcclusionQueryNV MANGLE(IsOcclusionQueryNV) - #define glIsProgramARB MANGLE(IsProgramARB) - #define glIsProgram MANGLE(IsProgram) - #define glIsProgramNV MANGLE(IsProgramNV) - #define glIsQueryARB MANGLE(IsQueryARB) - #define glIsQuery MANGLE(IsQuery) - #define glIsRenderbufferEXT MANGLE(IsRenderbufferEXT) - #define glIsShader MANGLE(IsShader) - #define glIsTextureEXT MANGLE(IsTextureEXT) - #define glIsTexture MANGLE(IsTexture) - #define glIsVariantEnabledEXT MANGLE(IsVariantEnabledEXT) - #define glIsVertexArrayAPPLE MANGLE(IsVertexArrayAPPLE) - #define glLightEnviSGIX MANGLE(LightEnviSGIX) - #define glLightf MANGLE(Lightf) - #define glLightfv MANGLE(Lightfv) - #define glLighti MANGLE(Lighti) - #define glLightiv MANGLE(Lightiv) - #define glLightModelf MANGLE(LightModelf) - #define glLightModelfv MANGLE(LightModelfv) - #define glLightModeli MANGLE(LightModeli) - #define glLightModeliv MANGLE(LightModeliv) - #define glLineStipple MANGLE(LineStipple) - #define glLineWidth MANGLE(LineWidth) - #define glLinkProgramARB MANGLE(LinkProgramARB) - #define glLinkProgram MANGLE(LinkProgram) - #define glListBase MANGLE(ListBase) - #define glListParameterfSGIX MANGLE(ListParameterfSGIX) - #define glListParameterfvSGIX MANGLE(ListParameterfvSGIX) - #define glListParameteriSGIX MANGLE(ListParameteriSGIX) - #define glListParameterivSGIX MANGLE(ListParameterivSGIX) - #define glLoadIdentityDeformationMapSGIX MANGLE(LoadIdentityDeformationMapSGIX) - #define glLoadIdentity MANGLE(LoadIdentity) - #define glLoadMatrixd MANGLE(LoadMatrixd) - #define glLoadMatrixf MANGLE(LoadMatrixf) - #define glLoadName MANGLE(LoadName) - #define glLoadProgramNV MANGLE(LoadProgramNV) - #define glLoadTransposeMatrixdARB MANGLE(LoadTransposeMatrixdARB) - #define glLoadTransposeMatrixd MANGLE(LoadTransposeMatrixd) - #define glLoadTransposeMatrixfARB MANGLE(LoadTransposeMatrixfARB) - #define glLoadTransposeMatrixf MANGLE(LoadTransposeMatrixf) - #define glLockArraysEXT MANGLE(LockArraysEXT) - #define glLogicOp MANGLE(LogicOp) - #define glMap1d MANGLE(Map1d) - #define glMap1f MANGLE(Map1f) - #define glMap2d MANGLE(Map2d) - #define glMap2f MANGLE(Map2f) - #define glMapBufferARB MANGLE(MapBufferARB) - #define glMapBuffer MANGLE(MapBuffer) - #define glMapControlPointsNV MANGLE(MapControlPointsNV) - #define glMapGrid1d MANGLE(MapGrid1d) - #define glMapGrid1f MANGLE(MapGrid1f) - #define glMapGrid2d MANGLE(MapGrid2d) - #define glMapGrid2f MANGLE(MapGrid2f) - #define glMapObjectBufferATI MANGLE(MapObjectBufferATI) - #define glMapParameterfvNV MANGLE(MapParameterfvNV) - #define glMapParameterivNV MANGLE(MapParameterivNV) - #define glMaterialf MANGLE(Materialf) - #define glMaterialfv MANGLE(Materialfv) - #define glMateriali MANGLE(Materiali) - #define glMaterialiv MANGLE(Materialiv) - #define glMatrixIndexPointerARB MANGLE(MatrixIndexPointerARB) - #define glMatrixIndexubvARB MANGLE(MatrixIndexubvARB) - #define glMatrixIndexuivARB MANGLE(MatrixIndexuivARB) - #define glMatrixIndexusvARB MANGLE(MatrixIndexusvARB) - #define glMatrixMode MANGLE(MatrixMode) - #define glMinmaxEXT MANGLE(MinmaxEXT) - #define glMinmax MANGLE(Minmax) - #define glMultiDrawArraysEXT MANGLE(MultiDrawArraysEXT) - #define glMultiDrawArrays MANGLE(MultiDrawArrays) - #define glMultiDrawElementArrayAPPLE MANGLE(MultiDrawElementArrayAPPLE) - #define glMultiDrawElementsEXT MANGLE(MultiDrawElementsEXT) - #define glMultiDrawElements MANGLE(MultiDrawElements) - #define glMultiDrawRangeElementArrayAPPLE MANGLE(MultiDrawRangeElementArrayAPPLE) - #define glMultiModeDrawArraysIBM MANGLE(MultiModeDrawArraysIBM) - #define glMultiModeDrawElementsIBM MANGLE(MultiModeDrawElementsIBM) - #define glMultiTexCoord1dARB MANGLE(MultiTexCoord1dARB) - #define glMultiTexCoord1d MANGLE(MultiTexCoord1d) - #define glMultiTexCoord1dvARB MANGLE(MultiTexCoord1dvARB) - #define glMultiTexCoord1dv MANGLE(MultiTexCoord1dv) - #define glMultiTexCoord1fARB MANGLE(MultiTexCoord1fARB) - #define glMultiTexCoord1f MANGLE(MultiTexCoord1f) - #define glMultiTexCoord1fvARB MANGLE(MultiTexCoord1fvARB) - #define glMultiTexCoord1fv MANGLE(MultiTexCoord1fv) - #define glMultiTexCoord1hNV MANGLE(MultiTexCoord1hNV) - #define glMultiTexCoord1hvNV MANGLE(MultiTexCoord1hvNV) - #define glMultiTexCoord1iARB MANGLE(MultiTexCoord1iARB) - #define glMultiTexCoord1i MANGLE(MultiTexCoord1i) - #define glMultiTexCoord1ivARB MANGLE(MultiTexCoord1ivARB) - #define glMultiTexCoord1iv MANGLE(MultiTexCoord1iv) - #define glMultiTexCoord1sARB MANGLE(MultiTexCoord1sARB) - #define glMultiTexCoord1s MANGLE(MultiTexCoord1s) - #define glMultiTexCoord1svARB MANGLE(MultiTexCoord1svARB) - #define glMultiTexCoord1sv MANGLE(MultiTexCoord1sv) - #define glMultiTexCoord2dARB MANGLE(MultiTexCoord2dARB) - #define glMultiTexCoord2d MANGLE(MultiTexCoord2d) - #define glMultiTexCoord2dvARB MANGLE(MultiTexCoord2dvARB) - #define glMultiTexCoord2dv MANGLE(MultiTexCoord2dv) - #define glMultiTexCoord2fARB MANGLE(MultiTexCoord2fARB) - #define glMultiTexCoord2f MANGLE(MultiTexCoord2f) - #define glMultiTexCoord2fvARB MANGLE(MultiTexCoord2fvARB) - #define glMultiTexCoord2fv MANGLE(MultiTexCoord2fv) - #define glMultiTexCoord2hNV MANGLE(MultiTexCoord2hNV) - #define glMultiTexCoord2hvNV MANGLE(MultiTexCoord2hvNV) - #define glMultiTexCoord2iARB MANGLE(MultiTexCoord2iARB) - #define glMultiTexCoord2i MANGLE(MultiTexCoord2i) - #define glMultiTexCoord2ivARB MANGLE(MultiTexCoord2ivARB) - #define glMultiTexCoord2iv MANGLE(MultiTexCoord2iv) - #define glMultiTexCoord2sARB MANGLE(MultiTexCoord2sARB) - #define glMultiTexCoord2s MANGLE(MultiTexCoord2s) - #define glMultiTexCoord2svARB MANGLE(MultiTexCoord2svARB) - #define glMultiTexCoord2sv MANGLE(MultiTexCoord2sv) - #define glMultiTexCoord3dARB MANGLE(MultiTexCoord3dARB) - #define glMultiTexCoord3d MANGLE(MultiTexCoord3d) - #define glMultiTexCoord3dvARB MANGLE(MultiTexCoord3dvARB) - #define glMultiTexCoord3dv MANGLE(MultiTexCoord3dv) - #define glMultiTexCoord3fARB MANGLE(MultiTexCoord3fARB) - #define glMultiTexCoord3f MANGLE(MultiTexCoord3f) - #define glMultiTexCoord3fvARB MANGLE(MultiTexCoord3fvARB) - #define glMultiTexCoord3fv MANGLE(MultiTexCoord3fv) - #define glMultiTexCoord3hNV MANGLE(MultiTexCoord3hNV) - #define glMultiTexCoord3hvNV MANGLE(MultiTexCoord3hvNV) - #define glMultiTexCoord3iARB MANGLE(MultiTexCoord3iARB) - #define glMultiTexCoord3i MANGLE(MultiTexCoord3i) - #define glMultiTexCoord3ivARB MANGLE(MultiTexCoord3ivARB) - #define glMultiTexCoord3iv MANGLE(MultiTexCoord3iv) - #define glMultiTexCoord3sARB MANGLE(MultiTexCoord3sARB) - #define glMultiTexCoord3s MANGLE(MultiTexCoord3s) - #define glMultiTexCoord3svARB MANGLE(MultiTexCoord3svARB) - #define glMultiTexCoord3sv MANGLE(MultiTexCoord3sv) - #define glMultiTexCoord4dARB MANGLE(MultiTexCoord4dARB) - #define glMultiTexCoord4d MANGLE(MultiTexCoord4d) - #define glMultiTexCoord4dvARB MANGLE(MultiTexCoord4dvARB) - #define glMultiTexCoord4dv MANGLE(MultiTexCoord4dv) - #define glMultiTexCoord4fARB MANGLE(MultiTexCoord4fARB) - #define glMultiTexCoord4f MANGLE(MultiTexCoord4f) - #define glMultiTexCoord4fvARB MANGLE(MultiTexCoord4fvARB) - #define glMultiTexCoord4fv MANGLE(MultiTexCoord4fv) - #define glMultiTexCoord4hNV MANGLE(MultiTexCoord4hNV) - #define glMultiTexCoord4hvNV MANGLE(MultiTexCoord4hvNV) - #define glMultiTexCoord4iARB MANGLE(MultiTexCoord4iARB) - #define glMultiTexCoord4i MANGLE(MultiTexCoord4i) - #define glMultiTexCoord4ivARB MANGLE(MultiTexCoord4ivARB) - #define glMultiTexCoord4iv MANGLE(MultiTexCoord4iv) - #define glMultiTexCoord4sARB MANGLE(MultiTexCoord4sARB) - #define glMultiTexCoord4s MANGLE(MultiTexCoord4s) - #define glMultiTexCoord4svARB MANGLE(MultiTexCoord4svARB) - #define glMultiTexCoord4sv MANGLE(MultiTexCoord4sv) - #define glMultMatrixd MANGLE(MultMatrixd) - #define glMultMatrixf MANGLE(MultMatrixf) - #define glMultTransposeMatrixdARB MANGLE(MultTransposeMatrixdARB) - #define glMultTransposeMatrixd MANGLE(MultTransposeMatrixd) - #define glMultTransposeMatrixfARB MANGLE(MultTransposeMatrixfARB) - #define glMultTransposeMatrixf MANGLE(MultTransposeMatrixf) - #define glNewList MANGLE(NewList) - #define glNewObjectBufferATI MANGLE(NewObjectBufferATI) - #define glNormal3b MANGLE(Normal3b) - #define glNormal3bv MANGLE(Normal3bv) - #define glNormal3d MANGLE(Normal3d) - #define glNormal3dv MANGLE(Normal3dv) - #define glNormal3f MANGLE(Normal3f) - #define glNormal3fVertex3fSUN MANGLE(Normal3fVertex3fSUN) - #define glNormal3fVertex3fvSUN MANGLE(Normal3fVertex3fvSUN) - #define glNormal3fv MANGLE(Normal3fv) - #define glNormal3hNV MANGLE(Normal3hNV) - #define glNormal3hvNV MANGLE(Normal3hvNV) - #define glNormal3i MANGLE(Normal3i) - #define glNormal3iv MANGLE(Normal3iv) - #define glNormal3s MANGLE(Normal3s) - #define glNormal3sv MANGLE(Normal3sv) - #define glNormalPointerEXT MANGLE(NormalPointerEXT) - #define glNormalPointerListIBM MANGLE(NormalPointerListIBM) - #define glNormalPointer MANGLE(NormalPointer) - #define glNormalPointervINTEL MANGLE(NormalPointervINTEL) - #define glNormalStream3bATI MANGLE(NormalStream3bATI) - #define glNormalStream3bvATI MANGLE(NormalStream3bvATI) - #define glNormalStream3dATI MANGLE(NormalStream3dATI) - #define glNormalStream3dvATI MANGLE(NormalStream3dvATI) - #define glNormalStream3fATI MANGLE(NormalStream3fATI) - #define glNormalStream3fvATI MANGLE(NormalStream3fvATI) - #define glNormalStream3iATI MANGLE(NormalStream3iATI) - #define glNormalStream3ivATI MANGLE(NormalStream3ivATI) - #define glNormalStream3sATI MANGLE(NormalStream3sATI) - #define glNormalStream3svATI MANGLE(NormalStream3svATI) - #define glOrtho MANGLE(Ortho) - #define glPassTexCoordATI MANGLE(PassTexCoordATI) - #define glPassThrough MANGLE(PassThrough) - #define glPixelDataRangeNV MANGLE(PixelDataRangeNV) - #define glPixelMapfv MANGLE(PixelMapfv) - #define glPixelMapuiv MANGLE(PixelMapuiv) - #define glPixelMapusv MANGLE(PixelMapusv) - #define glPixelStoref MANGLE(PixelStoref) - #define glPixelStorei MANGLE(PixelStorei) - #define glPixelTexGenParameterfSGIS MANGLE(PixelTexGenParameterfSGIS) - #define glPixelTexGenParameterfvSGIS MANGLE(PixelTexGenParameterfvSGIS) - #define glPixelTexGenParameteriSGIS MANGLE(PixelTexGenParameteriSGIS) - #define glPixelTexGenParameterivSGIS MANGLE(PixelTexGenParameterivSGIS) - #define glPixelTexGenSGIX MANGLE(PixelTexGenSGIX) - #define glPixelTransferf MANGLE(PixelTransferf) - #define glPixelTransferi MANGLE(PixelTransferi) - #define glPixelTransformParameterfEXT MANGLE(PixelTransformParameterfEXT) - #define glPixelTransformParameterfvEXT MANGLE(PixelTransformParameterfvEXT) - #define glPixelTransformParameteriEXT MANGLE(PixelTransformParameteriEXT) - #define glPixelTransformParameterivEXT MANGLE(PixelTransformParameterivEXT) - #define glPixelZoom MANGLE(PixelZoom) - #define glPNTrianglesfATI MANGLE(PNTrianglesfATI) - #define glPNTrianglesiATI MANGLE(PNTrianglesiATI) - #define glPointParameterfARB MANGLE(PointParameterfARB) - #define glPointParameterfEXT MANGLE(PointParameterfEXT) - #define glPointParameterf MANGLE(PointParameterf) - #define glPointParameterfSGIS MANGLE(PointParameterfSGIS) - #define glPointParameterfvARB MANGLE(PointParameterfvARB) - #define glPointParameterfvEXT MANGLE(PointParameterfvEXT) - #define glPointParameterfv MANGLE(PointParameterfv) - #define glPointParameterfvSGIS MANGLE(PointParameterfvSGIS) - #define glPointParameteri MANGLE(PointParameteri) - #define glPointParameteriNV MANGLE(PointParameteriNV) - #define glPointParameteriv MANGLE(PointParameteriv) - #define glPointParameterivNV MANGLE(PointParameterivNV) - #define glPointSize MANGLE(PointSize) - #define glPollAsyncSGIX MANGLE(PollAsyncSGIX) - #define glPollInstrumentsSGIX MANGLE(PollInstrumentsSGIX) - #define glPolygonMode MANGLE(PolygonMode) - #define glPolygonOffsetEXT MANGLE(PolygonOffsetEXT) - #define glPolygonOffset MANGLE(PolygonOffset) - #define glPolygonStipple MANGLE(PolygonStipple) - #define glPopAttrib MANGLE(PopAttrib) - #define glPopClientAttrib MANGLE(PopClientAttrib) - #define glPopMatrix MANGLE(PopMatrix) - #define glPopName MANGLE(PopName) - #define glPrimitiveRestartIndexNV MANGLE(PrimitiveRestartIndexNV) - #define glPrimitiveRestartNV MANGLE(PrimitiveRestartNV) - #define glPrioritizeTexturesEXT MANGLE(PrioritizeTexturesEXT) - #define glPrioritizeTextures MANGLE(PrioritizeTextures) - #define glProgramCallbackMESA MANGLE(ProgramCallbackMESA) - #define glProgramEnvParameter4dARB MANGLE(ProgramEnvParameter4dARB) - #define glProgramEnvParameter4dvARB MANGLE(ProgramEnvParameter4dvARB) - #define glProgramEnvParameter4fARB MANGLE(ProgramEnvParameter4fARB) - #define glProgramEnvParameter4fvARB MANGLE(ProgramEnvParameter4fvARB) - #define glProgramEnvParameters4fvEXT MANGLE(ProgramEnvParameters4fvEXT) - #define glProgramLocalParameter4dARB MANGLE(ProgramLocalParameter4dARB) - #define glProgramLocalParameter4dvARB MANGLE(ProgramLocalParameter4dvARB) - #define glProgramLocalParameter4fARB MANGLE(ProgramLocalParameter4fARB) - #define glProgramLocalParameter4fvARB MANGLE(ProgramLocalParameter4fvARB) - #define glProgramLocalParameters4fvEXT MANGLE(ProgramLocalParameters4fvEXT) - #define glProgramNamedParameter4dNV MANGLE(ProgramNamedParameter4dNV) - #define glProgramNamedParameter4dvNV MANGLE(ProgramNamedParameter4dvNV) - #define glProgramNamedParameter4fNV MANGLE(ProgramNamedParameter4fNV) - #define glProgramNamedParameter4fvNV MANGLE(ProgramNamedParameter4fvNV) - #define glProgramParameter4dNV MANGLE(ProgramParameter4dNV) - #define glProgramParameter4dvNV MANGLE(ProgramParameter4dvNV) - #define glProgramParameter4fNV MANGLE(ProgramParameter4fNV) - #define glProgramParameter4fvNV MANGLE(ProgramParameter4fvNV) - #define glProgramParameters4dvNV MANGLE(ProgramParameters4dvNV) - #define glProgramParameters4fvNV MANGLE(ProgramParameters4fvNV) - #define glProgramStringARB MANGLE(ProgramStringARB) - #define glPushAttrib MANGLE(PushAttrib) - #define glPushClientAttrib MANGLE(PushClientAttrib) - #define glPushMatrix MANGLE(PushMatrix) - #define glPushName MANGLE(PushName) - #define glRasterPos2d MANGLE(RasterPos2d) - #define glRasterPos2dv MANGLE(RasterPos2dv) - #define glRasterPos2f MANGLE(RasterPos2f) - #define glRasterPos2fv MANGLE(RasterPos2fv) - #define glRasterPos2i MANGLE(RasterPos2i) - #define glRasterPos2iv MANGLE(RasterPos2iv) - #define glRasterPos2s MANGLE(RasterPos2s) - #define glRasterPos2sv MANGLE(RasterPos2sv) - #define glRasterPos3d MANGLE(RasterPos3d) - #define glRasterPos3dv MANGLE(RasterPos3dv) - #define glRasterPos3f MANGLE(RasterPos3f) - #define glRasterPos3fv MANGLE(RasterPos3fv) - #define glRasterPos3i MANGLE(RasterPos3i) - #define glRasterPos3iv MANGLE(RasterPos3iv) - #define glRasterPos3s MANGLE(RasterPos3s) - #define glRasterPos3sv MANGLE(RasterPos3sv) - #define glRasterPos4d MANGLE(RasterPos4d) - #define glRasterPos4dv MANGLE(RasterPos4dv) - #define glRasterPos4f MANGLE(RasterPos4f) - #define glRasterPos4fv MANGLE(RasterPos4fv) - #define glRasterPos4i MANGLE(RasterPos4i) - #define glRasterPos4iv MANGLE(RasterPos4iv) - #define glRasterPos4s MANGLE(RasterPos4s) - #define glRasterPos4sv MANGLE(RasterPos4sv) - #define glReadBuffer MANGLE(ReadBuffer) - #define glReadInstrumentsSGIX MANGLE(ReadInstrumentsSGIX) - #define glReadPixels MANGLE(ReadPixels) - #define glRectd MANGLE(Rectd) - #define glRectdv MANGLE(Rectdv) - #define glRectf MANGLE(Rectf) - #define glRectfv MANGLE(Rectfv) - #define glRecti MANGLE(Recti) - #define glRectiv MANGLE(Rectiv) - #define glRects MANGLE(Rects) - #define glRectsv MANGLE(Rectsv) - #define glReferencePlaneSGIX MANGLE(ReferencePlaneSGIX) - #define glRenderbufferStorageEXT MANGLE(RenderbufferStorageEXT) - #define glRenderbufferStorageMultisampleEXT MANGLE(RenderbufferStorageMultisampleEXT) - #define glRenderMode MANGLE(RenderMode) - #define glReplacementCodePointerSUN MANGLE(ReplacementCodePointerSUN) - #define glReplacementCodeubSUN MANGLE(ReplacementCodeubSUN) - #define glReplacementCodeubvSUN MANGLE(ReplacementCodeubvSUN) - #define glReplacementCodeuiColor3fVertex3fSUN MANGLE(ReplacementCodeuiColor3fVertex3fSUN) - #define glReplacementCodeuiColor3fVertex3fvSUN MANGLE(ReplacementCodeuiColor3fVertex3fvSUN) - #define glReplacementCodeuiColor4fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fSUN) - #define glReplacementCodeuiColor4fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fvSUN) - #define glReplacementCodeuiColor4ubVertex3fSUN MANGLE(ReplacementCodeuiColor4ubVertex3fSUN) - #define glReplacementCodeuiColor4ubVertex3fvSUN MANGLE(ReplacementCodeuiColor4ubVertex3fvSUN) - #define glReplacementCodeuiNormal3fVertex3fSUN MANGLE(ReplacementCodeuiNormal3fVertex3fSUN) - #define glReplacementCodeuiNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiNormal3fVertex3fvSUN) - #define glReplacementCodeuiSUN MANGLE(ReplacementCodeuiSUN) - #define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN) - #define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN) - #define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN) - #define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN) - #define glReplacementCodeuiTexCoord2fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fVertex3fSUN) - #define glReplacementCodeuiTexCoord2fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fVertex3fvSUN) - #define glReplacementCodeuiVertex3fSUN MANGLE(ReplacementCodeuiVertex3fSUN) - #define glReplacementCodeuiVertex3fvSUN MANGLE(ReplacementCodeuiVertex3fvSUN) - #define glReplacementCodeuivSUN MANGLE(ReplacementCodeuivSUN) - #define glReplacementCodeusSUN MANGLE(ReplacementCodeusSUN) - #define glReplacementCodeusvSUN MANGLE(ReplacementCodeusvSUN) - #define glRequestResidentProgramsNV MANGLE(RequestResidentProgramsNV) - #define glResetHistogramEXT MANGLE(ResetHistogramEXT) - #define glResetHistogram MANGLE(ResetHistogram) - #define glResetMinmaxEXT MANGLE(ResetMinmaxEXT) - #define glResetMinmax MANGLE(ResetMinmax) - #define glResizeBuffersMESA MANGLE(ResizeBuffersMESA) - #define glRotated MANGLE(Rotated) - #define glRotatef MANGLE(Rotatef) - #define glSampleCoverageARB MANGLE(SampleCoverageARB) - #define glSampleCoverage MANGLE(SampleCoverage) - #define glSampleMapATI MANGLE(SampleMapATI) - #define glSampleMaskEXT MANGLE(SampleMaskEXT) - #define glSampleMaskSGIS MANGLE(SampleMaskSGIS) - #define glSamplePatternEXT MANGLE(SamplePatternEXT) - #define glSamplePatternSGIS MANGLE(SamplePatternSGIS) - #define glScaled MANGLE(Scaled) - #define glScalef MANGLE(Scalef) - #define glScissor MANGLE(Scissor) - #define glSecondaryColor3bEXT MANGLE(SecondaryColor3bEXT) - #define glSecondaryColor3b MANGLE(SecondaryColor3b) - #define glSecondaryColor3bvEXT MANGLE(SecondaryColor3bvEXT) - #define glSecondaryColor3bv MANGLE(SecondaryColor3bv) - #define glSecondaryColor3dEXT MANGLE(SecondaryColor3dEXT) - #define glSecondaryColor3d MANGLE(SecondaryColor3d) - #define glSecondaryColor3dvEXT MANGLE(SecondaryColor3dvEXT) - #define glSecondaryColor3dv MANGLE(SecondaryColor3dv) - #define glSecondaryColor3fEXT MANGLE(SecondaryColor3fEXT) - #define glSecondaryColor3f MANGLE(SecondaryColor3f) - #define glSecondaryColor3fvEXT MANGLE(SecondaryColor3fvEXT) - #define glSecondaryColor3fv MANGLE(SecondaryColor3fv) - #define glSecondaryColor3hNV MANGLE(SecondaryColor3hNV) - #define glSecondaryColor3hvNV MANGLE(SecondaryColor3hvNV) - #define glSecondaryColor3iEXT MANGLE(SecondaryColor3iEXT) - #define glSecondaryColor3i MANGLE(SecondaryColor3i) - #define glSecondaryColor3ivEXT MANGLE(SecondaryColor3ivEXT) - #define glSecondaryColor3iv MANGLE(SecondaryColor3iv) - #define glSecondaryColor3sEXT MANGLE(SecondaryColor3sEXT) - #define glSecondaryColor3s MANGLE(SecondaryColor3s) - #define glSecondaryColor3svEXT MANGLE(SecondaryColor3svEXT) - #define glSecondaryColor3sv MANGLE(SecondaryColor3sv) - #define glSecondaryColor3ubEXT MANGLE(SecondaryColor3ubEXT) - #define glSecondaryColor3ub MANGLE(SecondaryColor3ub) - #define glSecondaryColor3ubvEXT MANGLE(SecondaryColor3ubvEXT) - #define glSecondaryColor3ubv MANGLE(SecondaryColor3ubv) - #define glSecondaryColor3uiEXT MANGLE(SecondaryColor3uiEXT) - #define glSecondaryColor3ui MANGLE(SecondaryColor3ui) - #define glSecondaryColor3uivEXT MANGLE(SecondaryColor3uivEXT) - #define glSecondaryColor3uiv MANGLE(SecondaryColor3uiv) - #define glSecondaryColor3usEXT MANGLE(SecondaryColor3usEXT) - #define glSecondaryColor3us MANGLE(SecondaryColor3us) - #define glSecondaryColor3usvEXT MANGLE(SecondaryColor3usvEXT) - #define glSecondaryColor3usv MANGLE(SecondaryColor3usv) - #define glSecondaryColorPointerEXT MANGLE(SecondaryColorPointerEXT) - #define glSecondaryColorPointerListIBM MANGLE(SecondaryColorPointerListIBM) - #define glSecondaryColorPointer MANGLE(SecondaryColorPointer) - #define glSelectBuffer MANGLE(SelectBuffer) - #define glSeparableFilter2DEXT MANGLE(SeparableFilter2DEXT) - #define glSeparableFilter2D MANGLE(SeparableFilter2D) - #define glSetFenceAPPLE MANGLE(SetFenceAPPLE) - #define glSetFenceNV MANGLE(SetFenceNV) - #define glSetFragmentShaderConstantATI MANGLE(SetFragmentShaderConstantATI) - #define glSetInvariantEXT MANGLE(SetInvariantEXT) - #define glSetLocalConstantEXT MANGLE(SetLocalConstantEXT) - #define glShadeModel MANGLE(ShadeModel) - #define glShaderOp1EXT MANGLE(ShaderOp1EXT) - #define glShaderOp2EXT MANGLE(ShaderOp2EXT) - #define glShaderOp3EXT MANGLE(ShaderOp3EXT) - #define glShaderSourceARB MANGLE(ShaderSourceARB) - #define glShaderSource MANGLE(ShaderSource) - #define glSharpenTexFuncSGIS MANGLE(SharpenTexFuncSGIS) - #define glSpriteParameterfSGIX MANGLE(SpriteParameterfSGIX) - #define glSpriteParameterfvSGIX MANGLE(SpriteParameterfvSGIX) - #define glSpriteParameteriSGIX MANGLE(SpriteParameteriSGIX) - #define glSpriteParameterivSGIX MANGLE(SpriteParameterivSGIX) - #define glStartInstrumentsSGIX MANGLE(StartInstrumentsSGIX) - #define glStencilClearTagEXT MANGLE(StencilClearTagEXT) - #define glStencilFunc MANGLE(StencilFunc) - #define glStencilFuncSeparateATI MANGLE(StencilFuncSeparateATI) - #define glStencilFuncSeparate MANGLE(StencilFuncSeparate) - #define glStencilMask MANGLE(StencilMask) - #define glStencilMaskSeparate MANGLE(StencilMaskSeparate) - #define glStencilOp MANGLE(StencilOp) - #define glStencilOpSeparateATI MANGLE(StencilOpSeparateATI) - #define glStencilOpSeparate MANGLE(StencilOpSeparate) - #define glStopInstrumentsSGIX MANGLE(StopInstrumentsSGIX) - #define glStringMarkerGREMEDY MANGLE(StringMarkerGREMEDY) - #define glSwizzleEXT MANGLE(SwizzleEXT) - #define glTagSampleBufferSGIX MANGLE(TagSampleBufferSGIX) - #define glTangent3bEXT MANGLE(Tangent3bEXT) - #define glTangent3bvEXT MANGLE(Tangent3bvEXT) - #define glTangent3dEXT MANGLE(Tangent3dEXT) - #define glTangent3dvEXT MANGLE(Tangent3dvEXT) - #define glTangent3fEXT MANGLE(Tangent3fEXT) - #define glTangent3fvEXT MANGLE(Tangent3fvEXT) - #define glTangent3iEXT MANGLE(Tangent3iEXT) - #define glTangent3ivEXT MANGLE(Tangent3ivEXT) - #define glTangent3sEXT MANGLE(Tangent3sEXT) - #define glTangent3svEXT MANGLE(Tangent3svEXT) - #define glTangentPointerEXT MANGLE(TangentPointerEXT) - #define glTbufferMask3DFX MANGLE(TbufferMask3DFX) - #define glTestFenceAPPLE MANGLE(TestFenceAPPLE) - #define glTestFenceNV MANGLE(TestFenceNV) - #define glTestObjectAPPLE MANGLE(TestObjectAPPLE) - #define glTexBumpParameterfvATI MANGLE(TexBumpParameterfvATI) - #define glTexBumpParameterivATI MANGLE(TexBumpParameterivATI) - #define glTexCoord1d MANGLE(TexCoord1d) - #define glTexCoord1dv MANGLE(TexCoord1dv) - #define glTexCoord1f MANGLE(TexCoord1f) - #define glTexCoord1fv MANGLE(TexCoord1fv) - #define glTexCoord1hNV MANGLE(TexCoord1hNV) - #define glTexCoord1hvNV MANGLE(TexCoord1hvNV) - #define glTexCoord1i MANGLE(TexCoord1i) - #define glTexCoord1iv MANGLE(TexCoord1iv) - #define glTexCoord1s MANGLE(TexCoord1s) - #define glTexCoord1sv MANGLE(TexCoord1sv) - #define glTexCoord2d MANGLE(TexCoord2d) - #define glTexCoord2dv MANGLE(TexCoord2dv) - #define glTexCoord2fColor3fVertex3fSUN MANGLE(TexCoord2fColor3fVertex3fSUN) - #define glTexCoord2fColor3fVertex3fvSUN MANGLE(TexCoord2fColor3fVertex3fvSUN) - #define glTexCoord2fColor4fNormal3fVertex3fSUN MANGLE(TexCoord2fColor4fNormal3fVertex3fSUN) - #define glTexCoord2fColor4fNormal3fVertex3fvSUN MANGLE(TexCoord2fColor4fNormal3fVertex3fvSUN) - #define glTexCoord2fColor4ubVertex3fSUN MANGLE(TexCoord2fColor4ubVertex3fSUN) - #define glTexCoord2fColor4ubVertex3fvSUN MANGLE(TexCoord2fColor4ubVertex3fvSUN) - #define glTexCoord2f MANGLE(TexCoord2f) - #define glTexCoord2fNormal3fVertex3fSUN MANGLE(TexCoord2fNormal3fVertex3fSUN) - #define glTexCoord2fNormal3fVertex3fvSUN MANGLE(TexCoord2fNormal3fVertex3fvSUN) - #define glTexCoord2fVertex3fSUN MANGLE(TexCoord2fVertex3fSUN) - #define glTexCoord2fVertex3fvSUN MANGLE(TexCoord2fVertex3fvSUN) - #define glTexCoord2fv MANGLE(TexCoord2fv) - #define glTexCoord2hNV MANGLE(TexCoord2hNV) - #define glTexCoord2hvNV MANGLE(TexCoord2hvNV) - #define glTexCoord2i MANGLE(TexCoord2i) - #define glTexCoord2iv MANGLE(TexCoord2iv) - #define glTexCoord2s MANGLE(TexCoord2s) - #define glTexCoord2sv MANGLE(TexCoord2sv) - #define glTexCoord3d MANGLE(TexCoord3d) - #define glTexCoord3dv MANGLE(TexCoord3dv) - #define glTexCoord3f MANGLE(TexCoord3f) - #define glTexCoord3fv MANGLE(TexCoord3fv) - #define glTexCoord3hNV MANGLE(TexCoord3hNV) - #define glTexCoord3hvNV MANGLE(TexCoord3hvNV) - #define glTexCoord3i MANGLE(TexCoord3i) - #define glTexCoord3iv MANGLE(TexCoord3iv) - #define glTexCoord3s MANGLE(TexCoord3s) - #define glTexCoord3sv MANGLE(TexCoord3sv) - #define glTexCoord4d MANGLE(TexCoord4d) - #define glTexCoord4dv MANGLE(TexCoord4dv) - #define glTexCoord4fColor4fNormal3fVertex4fSUN MANGLE(TexCoord4fColor4fNormal3fVertex4fSUN) - #define glTexCoord4fColor4fNormal3fVertex4fvSUN MANGLE(TexCoord4fColor4fNormal3fVertex4fvSUN) - #define glTexCoord4f MANGLE(TexCoord4f) - #define glTexCoord4fVertex4fSUN MANGLE(TexCoord4fVertex4fSUN) - #define glTexCoord4fVertex4fvSUN MANGLE(TexCoord4fVertex4fvSUN) - #define glTexCoord4fv MANGLE(TexCoord4fv) - #define glTexCoord4hNV MANGLE(TexCoord4hNV) - #define glTexCoord4hvNV MANGLE(TexCoord4hvNV) - #define glTexCoord4i MANGLE(TexCoord4i) - #define glTexCoord4iv MANGLE(TexCoord4iv) - #define glTexCoord4s MANGLE(TexCoord4s) - #define glTexCoord4sv MANGLE(TexCoord4sv) - #define glTexCoordPointerEXT MANGLE(TexCoordPointerEXT) - #define glTexCoordPointerListIBM MANGLE(TexCoordPointerListIBM) - #define glTexCoordPointer MANGLE(TexCoordPointer) - #define glTexCoordPointervINTEL MANGLE(TexCoordPointervINTEL) - #define glTexEnvf MANGLE(TexEnvf) - #define glTexEnvfv MANGLE(TexEnvfv) - #define glTexEnvi MANGLE(TexEnvi) - #define glTexEnviv MANGLE(TexEnviv) - #define glTexFilterFuncSGIS MANGLE(TexFilterFuncSGIS) - #define glTexGend MANGLE(TexGend) - #define glTexGendv MANGLE(TexGendv) - #define glTexGenf MANGLE(TexGenf) - #define glTexGenfv MANGLE(TexGenfv) - #define glTexGeni MANGLE(TexGeni) - #define glTexGeniv MANGLE(TexGeniv) - #define glTexImage1D MANGLE(TexImage1D) - #define glTexImage2D MANGLE(TexImage2D) - #define glTexImage3DEXT MANGLE(TexImage3DEXT) - #define glTexImage3D MANGLE(TexImage3D) - #define glTexImage4DSGIS MANGLE(TexImage4DSGIS) - #define glTexParameterf MANGLE(TexParameterf) - #define glTexParameterfv MANGLE(TexParameterfv) - #define glTexParameteri MANGLE(TexParameteri) - #define glTexParameteriv MANGLE(TexParameteriv) - #define glTexSubImage1DEXT MANGLE(TexSubImage1DEXT) - #define glTexSubImage1D MANGLE(TexSubImage1D) - #define glTexSubImage2DEXT MANGLE(TexSubImage2DEXT) - #define glTexSubImage2D MANGLE(TexSubImage2D) - #define glTexSubImage3DEXT MANGLE(TexSubImage3DEXT) - #define glTexSubImage3D MANGLE(TexSubImage3D) - #define glTexSubImage4DSGIS MANGLE(TexSubImage4DSGIS) - #define glTextureColorMaskSGIS MANGLE(TextureColorMaskSGIS) - #define glTextureLightEXT MANGLE(TextureLightEXT) - #define glTextureMaterialEXT MANGLE(TextureMaterialEXT) - #define glTextureNormalEXT MANGLE(TextureNormalEXT) - #define glTrackMatrixNV MANGLE(TrackMatrixNV) - #define glTranslated MANGLE(Translated) - #define glTranslatef MANGLE(Translatef) - #define glUniform1fARB MANGLE(Uniform1fARB) - #define glUniform1f MANGLE(Uniform1f) - #define glUniform1fvARB MANGLE(Uniform1fvARB) - #define glUniform1fv MANGLE(Uniform1fv) - #define glUniform1iARB MANGLE(Uniform1iARB) - #define glUniform1i MANGLE(Uniform1i) - #define glUniform1ivARB MANGLE(Uniform1ivARB) - #define glUniform1iv MANGLE(Uniform1iv) - #define glUniform2fARB MANGLE(Uniform2fARB) - #define glUniform2f MANGLE(Uniform2f) - #define glUniform2fvARB MANGLE(Uniform2fvARB) - #define glUniform2fv MANGLE(Uniform2fv) - #define glUniform2iARB MANGLE(Uniform2iARB) - #define glUniform2i MANGLE(Uniform2i) - #define glUniform2ivARB MANGLE(Uniform2ivARB) - #define glUniform2iv MANGLE(Uniform2iv) - #define glUniform3fARB MANGLE(Uniform3fARB) - #define glUniform3f MANGLE(Uniform3f) - #define glUniform3fvARB MANGLE(Uniform3fvARB) - #define glUniform3fv MANGLE(Uniform3fv) - #define glUniform3iARB MANGLE(Uniform3iARB) - #define glUniform3i MANGLE(Uniform3i) - #define glUniform3ivARB MANGLE(Uniform3ivARB) - #define glUniform3iv MANGLE(Uniform3iv) - #define glUniform4fARB MANGLE(Uniform4fARB) - #define glUniform4f MANGLE(Uniform4f) - #define glUniform4fvARB MANGLE(Uniform4fvARB) - #define glUniform4fv MANGLE(Uniform4fv) - #define glUniform4iARB MANGLE(Uniform4iARB) - #define glUniform4i MANGLE(Uniform4i) - #define glUniform4ivARB MANGLE(Uniform4ivARB) - #define glUniform4iv MANGLE(Uniform4iv) - #define glUniformMatrix2fvARB MANGLE(UniformMatrix2fvARB) - #define glUniformMatrix2fv MANGLE(UniformMatrix2fv) - #define glUniformMatrix2x3fv MANGLE(UniformMatrix2x3fv) - #define glUniformMatrix2x4fv MANGLE(UniformMatrix2x4fv) - #define glUniformMatrix3fvARB MANGLE(UniformMatrix3fvARB) - #define glUniformMatrix3fv MANGLE(UniformMatrix3fv) - #define glUniformMatrix3x2fv MANGLE(UniformMatrix3x2fv) - #define glUniformMatrix3x4fv MANGLE(UniformMatrix3x4fv) - #define glUniformMatrix4fvARB MANGLE(UniformMatrix4fvARB) - #define glUniformMatrix4fv MANGLE(UniformMatrix4fv) - #define glUniformMatrix4x2fv MANGLE(UniformMatrix4x2fv) - #define glUniformMatrix4x3fv MANGLE(UniformMatrix4x3fv) - #define glUnlockArraysEXT MANGLE(UnlockArraysEXT) - #define glUnmapBufferARB MANGLE(UnmapBufferARB) - #define glUnmapBuffer MANGLE(UnmapBuffer) - #define glUnmapObjectBufferATI MANGLE(UnmapObjectBufferATI) - #define glUpdateObjectBufferATI MANGLE(UpdateObjectBufferATI) - #define glUseProgram MANGLE(UseProgram) - #define glUseProgramObjectARB MANGLE(UseProgramObjectARB) - #define glValidateProgramARB MANGLE(ValidateProgramARB) - #define glValidateProgram MANGLE(ValidateProgram) - #define glVariantArrayObjectATI MANGLE(VariantArrayObjectATI) - #define glVariantbvEXT MANGLE(VariantbvEXT) - #define glVariantdvEXT MANGLE(VariantdvEXT) - #define glVariantfvEXT MANGLE(VariantfvEXT) - #define glVariantivEXT MANGLE(VariantivEXT) - #define glVariantPointerEXT MANGLE(VariantPointerEXT) - #define glVariantsvEXT MANGLE(VariantsvEXT) - #define glVariantubvEXT MANGLE(VariantubvEXT) - #define glVariantuivEXT MANGLE(VariantuivEXT) - #define glVariantusvEXT MANGLE(VariantusvEXT) - #define glVertex2d MANGLE(Vertex2d) - #define glVertex2dv MANGLE(Vertex2dv) - #define glVertex2f MANGLE(Vertex2f) - #define glVertex2fv MANGLE(Vertex2fv) - #define glVertex2hNV MANGLE(Vertex2hNV) - #define glVertex2hvNV MANGLE(Vertex2hvNV) - #define glVertex2i MANGLE(Vertex2i) - #define glVertex2iv MANGLE(Vertex2iv) - #define glVertex2s MANGLE(Vertex2s) - #define glVertex2sv MANGLE(Vertex2sv) - #define glVertex3d MANGLE(Vertex3d) - #define glVertex3dv MANGLE(Vertex3dv) - #define glVertex3f MANGLE(Vertex3f) - #define glVertex3fv MANGLE(Vertex3fv) - #define glVertex3hNV MANGLE(Vertex3hNV) - #define glVertex3hvNV MANGLE(Vertex3hvNV) - #define glVertex3i MANGLE(Vertex3i) - #define glVertex3iv MANGLE(Vertex3iv) - #define glVertex3s MANGLE(Vertex3s) - #define glVertex3sv MANGLE(Vertex3sv) - #define glVertex4d MANGLE(Vertex4d) - #define glVertex4dv MANGLE(Vertex4dv) - #define glVertex4f MANGLE(Vertex4f) - #define glVertex4fv MANGLE(Vertex4fv) - #define glVertex4hNV MANGLE(Vertex4hNV) - #define glVertex4hvNV MANGLE(Vertex4hvNV) - #define glVertex4i MANGLE(Vertex4i) - #define glVertex4iv MANGLE(Vertex4iv) - #define glVertex4s MANGLE(Vertex4s) - #define glVertex4sv MANGLE(Vertex4sv) - #define glVertexArrayParameteriAPPLE MANGLE(VertexArrayParameteriAPPLE) - #define glVertexArrayRangeAPPLE MANGLE(VertexArrayRangeAPPLE) - #define glVertexArrayRangeNV MANGLE(VertexArrayRangeNV) - #define glVertexAttrib1dARB MANGLE(VertexAttrib1dARB) - #define glVertexAttrib1d MANGLE(VertexAttrib1d) - #define glVertexAttrib1dNV MANGLE(VertexAttrib1dNV) - #define glVertexAttrib1dvARB MANGLE(VertexAttrib1dvARB) - #define glVertexAttrib1dv MANGLE(VertexAttrib1dv) - #define glVertexAttrib1dvNV MANGLE(VertexAttrib1dvNV) - #define glVertexAttrib1fARB MANGLE(VertexAttrib1fARB) - #define glVertexAttrib1f MANGLE(VertexAttrib1f) - #define glVertexAttrib1fNV MANGLE(VertexAttrib1fNV) - #define glVertexAttrib1fvARB MANGLE(VertexAttrib1fvARB) - #define glVertexAttrib1fv MANGLE(VertexAttrib1fv) - #define glVertexAttrib1fvNV MANGLE(VertexAttrib1fvNV) - #define glVertexAttrib1hNV MANGLE(VertexAttrib1hNV) - #define glVertexAttrib1hvNV MANGLE(VertexAttrib1hvNV) - #define glVertexAttrib1sARB MANGLE(VertexAttrib1sARB) - #define glVertexAttrib1s MANGLE(VertexAttrib1s) - #define glVertexAttrib1sNV MANGLE(VertexAttrib1sNV) - #define glVertexAttrib1svARB MANGLE(VertexAttrib1svARB) - #define glVertexAttrib1sv MANGLE(VertexAttrib1sv) - #define glVertexAttrib1svNV MANGLE(VertexAttrib1svNV) - #define glVertexAttrib2dARB MANGLE(VertexAttrib2dARB) - #define glVertexAttrib2d MANGLE(VertexAttrib2d) - #define glVertexAttrib2dNV MANGLE(VertexAttrib2dNV) - #define glVertexAttrib2dvARB MANGLE(VertexAttrib2dvARB) - #define glVertexAttrib2dv MANGLE(VertexAttrib2dv) - #define glVertexAttrib2dvNV MANGLE(VertexAttrib2dvNV) - #define glVertexAttrib2fARB MANGLE(VertexAttrib2fARB) - #define glVertexAttrib2f MANGLE(VertexAttrib2f) - #define glVertexAttrib2fNV MANGLE(VertexAttrib2fNV) - #define glVertexAttrib2fvARB MANGLE(VertexAttrib2fvARB) - #define glVertexAttrib2fv MANGLE(VertexAttrib2fv) - #define glVertexAttrib2fvNV MANGLE(VertexAttrib2fvNV) - #define glVertexAttrib2hNV MANGLE(VertexAttrib2hNV) - #define glVertexAttrib2hvNV MANGLE(VertexAttrib2hvNV) - #define glVertexAttrib2sARB MANGLE(VertexAttrib2sARB) - #define glVertexAttrib2s MANGLE(VertexAttrib2s) - #define glVertexAttrib2sNV MANGLE(VertexAttrib2sNV) - #define glVertexAttrib2svARB MANGLE(VertexAttrib2svARB) - #define glVertexAttrib2sv MANGLE(VertexAttrib2sv) - #define glVertexAttrib2svNV MANGLE(VertexAttrib2svNV) - #define glVertexAttrib3dARB MANGLE(VertexAttrib3dARB) - #define glVertexAttrib3d MANGLE(VertexAttrib3d) - #define glVertexAttrib3dNV MANGLE(VertexAttrib3dNV) - #define glVertexAttrib3dvARB MANGLE(VertexAttrib3dvARB) - #define glVertexAttrib3dv MANGLE(VertexAttrib3dv) - #define glVertexAttrib3dvNV MANGLE(VertexAttrib3dvNV) - #define glVertexAttrib3fARB MANGLE(VertexAttrib3fARB) - #define glVertexAttrib3f MANGLE(VertexAttrib3f) - #define glVertexAttrib3fNV MANGLE(VertexAttrib3fNV) - #define glVertexAttrib3fvARB MANGLE(VertexAttrib3fvARB) - #define glVertexAttrib3fv MANGLE(VertexAttrib3fv) - #define glVertexAttrib3fvNV MANGLE(VertexAttrib3fvNV) - #define glVertexAttrib3hNV MANGLE(VertexAttrib3hNV) - #define glVertexAttrib3hvNV MANGLE(VertexAttrib3hvNV) - #define glVertexAttrib3sARB MANGLE(VertexAttrib3sARB) - #define glVertexAttrib3s MANGLE(VertexAttrib3s) - #define glVertexAttrib3sNV MANGLE(VertexAttrib3sNV) - #define glVertexAttrib3svARB MANGLE(VertexAttrib3svARB) - #define glVertexAttrib3sv MANGLE(VertexAttrib3sv) - #define glVertexAttrib3svNV MANGLE(VertexAttrib3svNV) - #define glVertexAttrib4bvARB MANGLE(VertexAttrib4bvARB) - #define glVertexAttrib4bv MANGLE(VertexAttrib4bv) - #define glVertexAttrib4dARB MANGLE(VertexAttrib4dARB) - #define glVertexAttrib4d MANGLE(VertexAttrib4d) - #define glVertexAttrib4dNV MANGLE(VertexAttrib4dNV) - #define glVertexAttrib4dvARB MANGLE(VertexAttrib4dvARB) - #define glVertexAttrib4dv MANGLE(VertexAttrib4dv) - #define glVertexAttrib4dvNV MANGLE(VertexAttrib4dvNV) - #define glVertexAttrib4fARB MANGLE(VertexAttrib4fARB) - #define glVertexAttrib4f MANGLE(VertexAttrib4f) - #define glVertexAttrib4fNV MANGLE(VertexAttrib4fNV) - #define glVertexAttrib4fvARB MANGLE(VertexAttrib4fvARB) - #define glVertexAttrib4fv MANGLE(VertexAttrib4fv) - #define glVertexAttrib4fvNV MANGLE(VertexAttrib4fvNV) - #define glVertexAttrib4hNV MANGLE(VertexAttrib4hNV) - #define glVertexAttrib4hvNV MANGLE(VertexAttrib4hvNV) - #define glVertexAttrib4ivARB MANGLE(VertexAttrib4ivARB) - #define glVertexAttrib4iv MANGLE(VertexAttrib4iv) - #define glVertexAttrib4NbvARB MANGLE(VertexAttrib4NbvARB) - #define glVertexAttrib4Nbv MANGLE(VertexAttrib4Nbv) - #define glVertexAttrib4NivARB MANGLE(VertexAttrib4NivARB) - #define glVertexAttrib4Niv MANGLE(VertexAttrib4Niv) - #define glVertexAttrib4NsvARB MANGLE(VertexAttrib4NsvARB) - #define glVertexAttrib4Nsv MANGLE(VertexAttrib4Nsv) - #define glVertexAttrib4NubARB MANGLE(VertexAttrib4NubARB) - #define glVertexAttrib4Nub MANGLE(VertexAttrib4Nub) - #define glVertexAttrib4NubvARB MANGLE(VertexAttrib4NubvARB) - #define glVertexAttrib4Nubv MANGLE(VertexAttrib4Nubv) - #define glVertexAttrib4NuivARB MANGLE(VertexAttrib4NuivARB) - #define glVertexAttrib4Nuiv MANGLE(VertexAttrib4Nuiv) - #define glVertexAttrib4NusvARB MANGLE(VertexAttrib4NusvARB) - #define glVertexAttrib4Nusv MANGLE(VertexAttrib4Nusv) - #define glVertexAttrib4sARB MANGLE(VertexAttrib4sARB) - #define glVertexAttrib4s MANGLE(VertexAttrib4s) - #define glVertexAttrib4sNV MANGLE(VertexAttrib4sNV) - #define glVertexAttrib4svARB MANGLE(VertexAttrib4svARB) - #define glVertexAttrib4sv MANGLE(VertexAttrib4sv) - #define glVertexAttrib4svNV MANGLE(VertexAttrib4svNV) - #define glVertexAttrib4ubNV MANGLE(VertexAttrib4ubNV) - #define glVertexAttrib4ubvARB MANGLE(VertexAttrib4ubvARB) - #define glVertexAttrib4ubv MANGLE(VertexAttrib4ubv) - #define glVertexAttrib4ubvNV MANGLE(VertexAttrib4ubvNV) - #define glVertexAttrib4uivARB MANGLE(VertexAttrib4uivARB) - #define glVertexAttrib4uiv MANGLE(VertexAttrib4uiv) - #define glVertexAttrib4usvARB MANGLE(VertexAttrib4usvARB) - #define glVertexAttrib4usv MANGLE(VertexAttrib4usv) - #define glVertexAttribArrayObjectATI MANGLE(VertexAttribArrayObjectATI) - #define glVertexAttribPointerARB MANGLE(VertexAttribPointerARB) - #define glVertexAttribPointer MANGLE(VertexAttribPointer) - #define glVertexAttribPointerNV MANGLE(VertexAttribPointerNV) - #define glVertexAttribs1dvNV MANGLE(VertexAttribs1dvNV) - #define glVertexAttribs1fvNV MANGLE(VertexAttribs1fvNV) - #define glVertexAttribs1hvNV MANGLE(VertexAttribs1hvNV) - #define glVertexAttribs1svNV MANGLE(VertexAttribs1svNV) - #define glVertexAttribs2dvNV MANGLE(VertexAttribs2dvNV) - #define glVertexAttribs2fvNV MANGLE(VertexAttribs2fvNV) - #define glVertexAttribs2hvNV MANGLE(VertexAttribs2hvNV) - #define glVertexAttribs2svNV MANGLE(VertexAttribs2svNV) - #define glVertexAttribs3dvNV MANGLE(VertexAttribs3dvNV) - #define glVertexAttribs3fvNV MANGLE(VertexAttribs3fvNV) - #define glVertexAttribs3hvNV MANGLE(VertexAttribs3hvNV) - #define glVertexAttribs3svNV MANGLE(VertexAttribs3svNV) - #define glVertexAttribs4dvNV MANGLE(VertexAttribs4dvNV) - #define glVertexAttribs4fvNV MANGLE(VertexAttribs4fvNV) - #define glVertexAttribs4hvNV MANGLE(VertexAttribs4hvNV) - #define glVertexAttribs4svNV MANGLE(VertexAttribs4svNV) - #define glVertexAttribs4ubvNV MANGLE(VertexAttribs4ubvNV) - #define glVertexBlendARB MANGLE(VertexBlendARB) - #define glVertexBlendEnvfATI MANGLE(VertexBlendEnvfATI) - #define glVertexBlendEnviATI MANGLE(VertexBlendEnviATI) - #define glVertexPointerEXT MANGLE(VertexPointerEXT) - #define glVertexPointerListIBM MANGLE(VertexPointerListIBM) - #define glVertexPointer MANGLE(VertexPointer) - #define glVertexPointervINTEL MANGLE(VertexPointervINTEL) - #define glVertexStream1dATI MANGLE(VertexStream1dATI) - #define glVertexStream1dvATI MANGLE(VertexStream1dvATI) - #define glVertexStream1fATI MANGLE(VertexStream1fATI) - #define glVertexStream1fvATI MANGLE(VertexStream1fvATI) - #define glVertexStream1iATI MANGLE(VertexStream1iATI) - #define glVertexStream1ivATI MANGLE(VertexStream1ivATI) - #define glVertexStream1sATI MANGLE(VertexStream1sATI) - #define glVertexStream1svATI MANGLE(VertexStream1svATI) - #define glVertexStream2dATI MANGLE(VertexStream2dATI) - #define glVertexStream2dvATI MANGLE(VertexStream2dvATI) - #define glVertexStream2fATI MANGLE(VertexStream2fATI) - #define glVertexStream2fvATI MANGLE(VertexStream2fvATI) - #define glVertexStream2iATI MANGLE(VertexStream2iATI) - #define glVertexStream2ivATI MANGLE(VertexStream2ivATI) - #define glVertexStream2sATI MANGLE(VertexStream2sATI) - #define glVertexStream2svATI MANGLE(VertexStream2svATI) - #define glVertexStream3dATI MANGLE(VertexStream3dATI) - #define glVertexStream3dvATI MANGLE(VertexStream3dvATI) - #define glVertexStream3fATI MANGLE(VertexStream3fATI) - #define glVertexStream3fvATI MANGLE(VertexStream3fvATI) - #define glVertexStream3iATI MANGLE(VertexStream3iATI) - #define glVertexStream3ivATI MANGLE(VertexStream3ivATI) - #define glVertexStream3sATI MANGLE(VertexStream3sATI) - #define glVertexStream3svATI MANGLE(VertexStream3svATI) - #define glVertexStream4dATI MANGLE(VertexStream4dATI) - #define glVertexStream4dvATI MANGLE(VertexStream4dvATI) - #define glVertexStream4fATI MANGLE(VertexStream4fATI) - #define glVertexStream4fvATI MANGLE(VertexStream4fvATI) - #define glVertexStream4iATI MANGLE(VertexStream4iATI) - #define glVertexStream4ivATI MANGLE(VertexStream4ivATI) - #define glVertexStream4sATI MANGLE(VertexStream4sATI) - #define glVertexStream4svATI MANGLE(VertexStream4svATI) - #define glVertexWeightfEXT MANGLE(VertexWeightfEXT) - #define glVertexWeightfvEXT MANGLE(VertexWeightfvEXT) - #define glVertexWeighthNV MANGLE(VertexWeighthNV) - #define glVertexWeighthvNV MANGLE(VertexWeighthvNV) - #define glVertexWeightPointerEXT MANGLE(VertexWeightPointerEXT) - #define glViewport MANGLE(Viewport) - #define glWeightbvARB MANGLE(WeightbvARB) - #define glWeightdvARB MANGLE(WeightdvARB) - #define glWeightfvARB MANGLE(WeightfvARB) - #define glWeightivARB MANGLE(WeightivARB) - #define glWeightPointerARB MANGLE(WeightPointerARB) - #define glWeightsvARB MANGLE(WeightsvARB) - #define glWeightubvARB MANGLE(WeightubvARB) - #define glWeightuivARB MANGLE(WeightuivARB) - #define glWeightusvARB MANGLE(WeightusvARB) - #define glWindowPos2dARB MANGLE(WindowPos2dARB) - #define glWindowPos2d MANGLE(WindowPos2d) - #define glWindowPos2dMESA MANGLE(WindowPos2dMESA) - #define glWindowPos2dvARB MANGLE(WindowPos2dvARB) - #define glWindowPos2dv MANGLE(WindowPos2dv) - #define glWindowPos2dvMESA MANGLE(WindowPos2dvMESA) - #define glWindowPos2fARB MANGLE(WindowPos2fARB) - #define glWindowPos2f MANGLE(WindowPos2f) - #define glWindowPos2fMESA MANGLE(WindowPos2fMESA) - #define glWindowPos2fvARB MANGLE(WindowPos2fvARB) - #define glWindowPos2fv MANGLE(WindowPos2fv) - #define glWindowPos2fvMESA MANGLE(WindowPos2fvMESA) - #define glWindowPos2iARB MANGLE(WindowPos2iARB) - #define glWindowPos2i MANGLE(WindowPos2i) - #define glWindowPos2iMESA MANGLE(WindowPos2iMESA) - #define glWindowPos2ivARB MANGLE(WindowPos2ivARB) - #define glWindowPos2iv MANGLE(WindowPos2iv) - #define glWindowPos2ivMESA MANGLE(WindowPos2ivMESA) - #define glWindowPos2sARB MANGLE(WindowPos2sARB) - #define glWindowPos2s MANGLE(WindowPos2s) - #define glWindowPos2sMESA MANGLE(WindowPos2sMESA) - #define glWindowPos2svARB MANGLE(WindowPos2svARB) - #define glWindowPos2sv MANGLE(WindowPos2sv) - #define glWindowPos2svMESA MANGLE(WindowPos2svMESA) - #define glWindowPos3dARB MANGLE(WindowPos3dARB) - #define glWindowPos3d MANGLE(WindowPos3d) - #define glWindowPos3dMESA MANGLE(WindowPos3dMESA) - #define glWindowPos3dvARB MANGLE(WindowPos3dvARB) - #define glWindowPos3dv MANGLE(WindowPos3dv) - #define glWindowPos3dvMESA MANGLE(WindowPos3dvMESA) - #define glWindowPos3fARB MANGLE(WindowPos3fARB) - #define glWindowPos3f MANGLE(WindowPos3f) - #define glWindowPos3fMESA MANGLE(WindowPos3fMESA) - #define glWindowPos3fvARB MANGLE(WindowPos3fvARB) - #define glWindowPos3fv MANGLE(WindowPos3fv) - #define glWindowPos3fvMESA MANGLE(WindowPos3fvMESA) - #define glWindowPos3iARB MANGLE(WindowPos3iARB) - #define glWindowPos3i MANGLE(WindowPos3i) - #define glWindowPos3iMESA MANGLE(WindowPos3iMESA) - #define glWindowPos3ivARB MANGLE(WindowPos3ivARB) - #define glWindowPos3iv MANGLE(WindowPos3iv) - #define glWindowPos3ivMESA MANGLE(WindowPos3ivMESA) - #define glWindowPos3sARB MANGLE(WindowPos3sARB) - #define glWindowPos3s MANGLE(WindowPos3s) - #define glWindowPos3sMESA MANGLE(WindowPos3sMESA) - #define glWindowPos3svARB MANGLE(WindowPos3svARB) - #define glWindowPos3sv MANGLE(WindowPos3sv) - #define glWindowPos3svMESA MANGLE(WindowPos3svMESA) - #define glWindowPos4dMESA MANGLE(WindowPos4dMESA) - #define glWindowPos4dvMESA MANGLE(WindowPos4dvMESA) - #define glWindowPos4fMESA MANGLE(WindowPos4fMESA) - #define glWindowPos4fvMESA MANGLE(WindowPos4fvMESA) - #define glWindowPos4iMESA MANGLE(WindowPos4iMESA) - #define glWindowPos4ivMESA MANGLE(WindowPos4ivMESA) - #define glWindowPos4sMESA MANGLE(WindowPos4sMESA) - #define glWindowPos4svMESA MANGLE(WindowPos4svMESA) - #define glWriteMaskEXT MANGLE(WriteMaskEXT) + #define glAccum MANGLE(Accum) + #define glActiveStencilFaceEXT MANGLE(ActiveStencilFaceEXT) + #define glActiveTextureARB MANGLE(ActiveTextureARB) + #define glActiveTexture MANGLE(ActiveTexture) + #define glAlphaFragmentOp1ATI MANGLE(AlphaFragmentOp1ATI) + #define glAlphaFragmentOp2ATI MANGLE(AlphaFragmentOp2ATI) + #define glAlphaFragmentOp3ATI MANGLE(AlphaFragmentOp3ATI) + #define glAlphaFunc MANGLE(AlphaFunc) + #define glApplyTextureEXT MANGLE(ApplyTextureEXT) + #define glAreProgramsResidentNV MANGLE(AreProgramsResidentNV) + #define glAreTexturesResidentEXT MANGLE(AreTexturesResidentEXT) + #define glAreTexturesResident MANGLE(AreTexturesResident) + #define glArrayElementEXT MANGLE(ArrayElementEXT) + #define glArrayElement MANGLE(ArrayElement) + #define glArrayObjectATI MANGLE(ArrayObjectATI) + #define glAsyncMarkerSGIX MANGLE(AsyncMarkerSGIX) + #define glAttachObjectARB MANGLE(AttachObjectARB) + #define glAttachShader MANGLE(AttachShader) + #define glBeginFragmentShaderATI MANGLE(BeginFragmentShaderATI) + #define glBegin MANGLE(Begin) + #define glBeginOcclusionQueryNV MANGLE(BeginOcclusionQueryNV) + #define glBeginQueryARB MANGLE(BeginQueryARB) + #define glBeginQuery MANGLE(BeginQuery) + #define glBeginVertexShaderEXT MANGLE(BeginVertexShaderEXT) + #define glBindAttribLocationARB MANGLE(BindAttribLocationARB) + #define glBindAttribLocation MANGLE(BindAttribLocation) + #define glBindBufferARB MANGLE(BindBufferARB) + #define glBindBuffer MANGLE(BindBuffer) + #define glBindFragmentShaderATI MANGLE(BindFragmentShaderATI) + #define glBindFramebufferEXT MANGLE(BindFramebufferEXT) + #define glBindLightParameterEXT MANGLE(BindLightParameterEXT) + #define glBindMaterialParameterEXT MANGLE(BindMaterialParameterEXT) + #define glBindParameterEXT MANGLE(BindParameterEXT) + #define glBindProgramARB MANGLE(BindProgramARB) + #define glBindProgramNV MANGLE(BindProgramNV) + #define glBindRenderbufferEXT MANGLE(BindRenderbufferEXT) + #define glBindTexGenParameterEXT MANGLE(BindTexGenParameterEXT) + #define glBindTextureEXT MANGLE(BindTextureEXT) + #define glBindTexture MANGLE(BindTexture) + #define glBindTextureUnitParameterEXT MANGLE(BindTextureUnitParameterEXT) + #define glBindVertexArrayAPPLE MANGLE(BindVertexArrayAPPLE) + #define glBindVertexShaderEXT MANGLE(BindVertexShaderEXT) + #define glBinormal3bEXT MANGLE(Binormal3bEXT) + #define glBinormal3bvEXT MANGLE(Binormal3bvEXT) + #define glBinormal3dEXT MANGLE(Binormal3dEXT) + #define glBinormal3dvEXT MANGLE(Binormal3dvEXT) + #define glBinormal3fEXT MANGLE(Binormal3fEXT) + #define glBinormal3fvEXT MANGLE(Binormal3fvEXT) + #define glBinormal3iEXT MANGLE(Binormal3iEXT) + #define glBinormal3ivEXT MANGLE(Binormal3ivEXT) + #define glBinormal3sEXT MANGLE(Binormal3sEXT) + #define glBinormal3svEXT MANGLE(Binormal3svEXT) + #define glBinormalPointerEXT MANGLE(BinormalPointerEXT) + #define glBitmap MANGLE(Bitmap) + #define glBlendColorEXT MANGLE(BlendColorEXT) + #define glBlendColor MANGLE(BlendColor) + #define glBlendEquationEXT MANGLE(BlendEquationEXT) + #define glBlendEquation MANGLE(BlendEquation) + #define glBlendEquationSeparateATI MANGLE(BlendEquationSeparateATI) + #define glBlendEquationSeparateEXT MANGLE(BlendEquationSeparateEXT) + #define glBlendEquationSeparate MANGLE(BlendEquationSeparate) + #define glBlendFunc MANGLE(BlendFunc) + #define glBlendFuncSeparateEXT MANGLE(BlendFuncSeparateEXT) + #define glBlendFuncSeparateINGR MANGLE(BlendFuncSeparateINGR) + #define glBlendFuncSeparate MANGLE(BlendFuncSeparate) + #define glBlitFramebufferEXT MANGLE(BlitFramebufferEXT) + #define glBufferDataARB MANGLE(BufferDataARB) + #define glBufferData MANGLE(BufferData) + #define glBufferSubDataARB MANGLE(BufferSubDataARB) + #define glBufferSubData MANGLE(BufferSubData) + #define glCallList MANGLE(CallList) + #define glCallLists MANGLE(CallLists) + #define glCheckFramebufferStatusEXT MANGLE(CheckFramebufferStatusEXT) + #define glClampColorARB MANGLE(ClampColorARB) + #define glClearAccum MANGLE(ClearAccum) + #define glClearColor MANGLE(ClearColor) + #define glClearDebugLogMESA MANGLE(ClearDebugLogMESA) + #define glClearDepth MANGLE(ClearDepth) + #define glClearIndex MANGLE(ClearIndex) + #define glClear MANGLE(Clear) + #define glClearStencil MANGLE(ClearStencil) + #define glClientActiveTextureARB MANGLE(ClientActiveTextureARB) + #define glClientActiveTexture MANGLE(ClientActiveTexture) + #define glClientActiveVertexStreamATI MANGLE(ClientActiveVertexStreamATI) + #define glClipPlane MANGLE(ClipPlane) + #define glColor3b MANGLE(Color3b) + #define glColor3bv MANGLE(Color3bv) + #define glColor3d MANGLE(Color3d) + #define glColor3dv MANGLE(Color3dv) + #define glColor3f MANGLE(Color3f) + #define glColor3fVertex3fSUN MANGLE(Color3fVertex3fSUN) + #define glColor3fVertex3fvSUN MANGLE(Color3fVertex3fvSUN) + #define glColor3fv MANGLE(Color3fv) + #define glColor3hNV MANGLE(Color3hNV) + #define glColor3hvNV MANGLE(Color3hvNV) + #define glColor3i MANGLE(Color3i) + #define glColor3iv MANGLE(Color3iv) + #define glColor3s MANGLE(Color3s) + #define glColor3sv MANGLE(Color3sv) + #define glColor3ub MANGLE(Color3ub) + #define glColor3ubv MANGLE(Color3ubv) + #define glColor3ui MANGLE(Color3ui) + #define glColor3uiv MANGLE(Color3uiv) + #define glColor3us MANGLE(Color3us) + #define glColor3usv MANGLE(Color3usv) + #define glColor4b MANGLE(Color4b) + #define glColor4bv MANGLE(Color4bv) + #define glColor4d MANGLE(Color4d) + #define glColor4dv MANGLE(Color4dv) + #define glColor4f MANGLE(Color4f) + #define glColor4fNormal3fVertex3fSUN MANGLE(Color4fNormal3fVertex3fSUN) + #define glColor4fNormal3fVertex3fvSUN MANGLE(Color4fNormal3fVertex3fvSUN) + #define glColor4fv MANGLE(Color4fv) + #define glColor4hNV MANGLE(Color4hNV) + #define glColor4hvNV MANGLE(Color4hvNV) + #define glColor4i MANGLE(Color4i) + #define glColor4iv MANGLE(Color4iv) + #define glColor4s MANGLE(Color4s) + #define glColor4sv MANGLE(Color4sv) + #define glColor4ub MANGLE(Color4ub) + #define glColor4ubVertex2fSUN MANGLE(Color4ubVertex2fSUN) + #define glColor4ubVertex2fvSUN MANGLE(Color4ubVertex2fvSUN) + #define glColor4ubVertex3fSUN MANGLE(Color4ubVertex3fSUN) + #define glColor4ubVertex3fvSUN MANGLE(Color4ubVertex3fvSUN) + #define glColor4ubv MANGLE(Color4ubv) + #define glColor4ui MANGLE(Color4ui) + #define glColor4uiv MANGLE(Color4uiv) + #define glColor4us MANGLE(Color4us) + #define glColor4usv MANGLE(Color4usv) + #define glColorFragmentOp1ATI MANGLE(ColorFragmentOp1ATI) + #define glColorFragmentOp2ATI MANGLE(ColorFragmentOp2ATI) + #define glColorFragmentOp3ATI MANGLE(ColorFragmentOp3ATI) + #define glColorMask MANGLE(ColorMask) + #define glColorMaterial MANGLE(ColorMaterial) + #define glColorPointerEXT MANGLE(ColorPointerEXT) + #define glColorPointerListIBM MANGLE(ColorPointerListIBM) + #define glColorPointer MANGLE(ColorPointer) + #define glColorPointervINTEL MANGLE(ColorPointervINTEL) + #define glColorSubTableEXT MANGLE(ColorSubTableEXT) + #define glColorSubTable MANGLE(ColorSubTable) + #define glColorTableEXT MANGLE(ColorTableEXT) + #define glColorTable MANGLE(ColorTable) + #define glColorTableParameterfv MANGLE(ColorTableParameterfv) + #define glColorTableParameterfvSGI MANGLE(ColorTableParameterfvSGI) + #define glColorTableParameteriv MANGLE(ColorTableParameteriv) + #define glColorTableParameterivSGI MANGLE(ColorTableParameterivSGI) + #define glColorTableSGI MANGLE(ColorTableSGI) + #define glCombinerInputNV MANGLE(CombinerInputNV) + #define glCombinerOutputNV MANGLE(CombinerOutputNV) + #define glCombinerParameterfNV MANGLE(CombinerParameterfNV) + #define glCombinerParameterfvNV MANGLE(CombinerParameterfvNV) + #define glCombinerParameteriNV MANGLE(CombinerParameteriNV) + #define glCombinerParameterivNV MANGLE(CombinerParameterivNV) + #define glCombinerStageParameterfvNV MANGLE(CombinerStageParameterfvNV) + #define glCompileShaderARB MANGLE(CompileShaderARB) + #define glCompileShader MANGLE(CompileShader) + #define glCompressedTexImage1DARB MANGLE(CompressedTexImage1DARB) + #define glCompressedTexImage1D MANGLE(CompressedTexImage1D) + #define glCompressedTexImage2DARB MANGLE(CompressedTexImage2DARB) + #define glCompressedTexImage2D MANGLE(CompressedTexImage2D) + #define glCompressedTexImage3DARB MANGLE(CompressedTexImage3DARB) + #define glCompressedTexImage3D MANGLE(CompressedTexImage3D) + #define glCompressedTexSubImage1DARB MANGLE(CompressedTexSubImage1DARB) + #define glCompressedTexSubImage1D MANGLE(CompressedTexSubImage1D) + #define glCompressedTexSubImage2DARB MANGLE(CompressedTexSubImage2DARB) + #define glCompressedTexSubImage2D MANGLE(CompressedTexSubImage2D) + #define glCompressedTexSubImage3DARB MANGLE(CompressedTexSubImage3DARB) + #define glCompressedTexSubImage3D MANGLE(CompressedTexSubImage3D) + #define glConvolutionFilter1DEXT MANGLE(ConvolutionFilter1DEXT) + #define glConvolutionFilter1D MANGLE(ConvolutionFilter1D) + #define glConvolutionFilter2DEXT MANGLE(ConvolutionFilter2DEXT) + #define glConvolutionFilter2D MANGLE(ConvolutionFilter2D) + #define glConvolutionParameterfEXT MANGLE(ConvolutionParameterfEXT) + #define glConvolutionParameterf MANGLE(ConvolutionParameterf) + #define glConvolutionParameterfvEXT MANGLE(ConvolutionParameterfvEXT) + #define glConvolutionParameterfv MANGLE(ConvolutionParameterfv) + #define glConvolutionParameteriEXT MANGLE(ConvolutionParameteriEXT) + #define glConvolutionParameteri MANGLE(ConvolutionParameteri) + #define glConvolutionParameterivEXT MANGLE(ConvolutionParameterivEXT) + #define glConvolutionParameteriv MANGLE(ConvolutionParameteriv) + #define glCopyColorSubTableEXT MANGLE(CopyColorSubTableEXT) + #define glCopyColorSubTable MANGLE(CopyColorSubTable) + #define glCopyColorTable MANGLE(CopyColorTable) + #define glCopyColorTableSGI MANGLE(CopyColorTableSGI) + #define glCopyConvolutionFilter1DEXT MANGLE(CopyConvolutionFilter1DEXT) + #define glCopyConvolutionFilter1D MANGLE(CopyConvolutionFilter1D) + #define glCopyConvolutionFilter2DEXT MANGLE(CopyConvolutionFilter2DEXT) + #define glCopyConvolutionFilter2D MANGLE(CopyConvolutionFilter2D) + #define glCopyPixels MANGLE(CopyPixels) + #define glCopyTexImage1DEXT MANGLE(CopyTexImage1DEXT) + #define glCopyTexImage1D MANGLE(CopyTexImage1D) + #define glCopyTexImage2DEXT MANGLE(CopyTexImage2DEXT) + #define glCopyTexImage2D MANGLE(CopyTexImage2D) + #define glCopyTexSubImage1DEXT MANGLE(CopyTexSubImage1DEXT) + #define glCopyTexSubImage1D MANGLE(CopyTexSubImage1D) + #define glCopyTexSubImage2DEXT MANGLE(CopyTexSubImage2DEXT) + #define glCopyTexSubImage2D MANGLE(CopyTexSubImage2D) + #define glCopyTexSubImage3DEXT MANGLE(CopyTexSubImage3DEXT) + #define glCopyTexSubImage3D MANGLE(CopyTexSubImage3D) + #define glCreateDebugObjectMESA MANGLE(CreateDebugObjectMESA) + #define glCreateProgram MANGLE(CreateProgram) + #define glCreateProgramObjectARB MANGLE(CreateProgramObjectARB) + #define glCreateShader MANGLE(CreateShader) + #define glCreateShaderObjectARB MANGLE(CreateShaderObjectARB) + #define glCullFace MANGLE(CullFace) + #define glCullParameterdvEXT MANGLE(CullParameterdvEXT) + #define glCullParameterfvEXT MANGLE(CullParameterfvEXT) + #define glCurrentPaletteMatrixARB MANGLE(CurrentPaletteMatrixARB) + #define glDeformationMap3dSGIX MANGLE(DeformationMap3dSGIX) + #define glDeformationMap3fSGIX MANGLE(DeformationMap3fSGIX) + #define glDeformSGIX MANGLE(DeformSGIX) + #define glDeleteAsyncMarkersSGIX MANGLE(DeleteAsyncMarkersSGIX) + #define glDeleteBuffersARB MANGLE(DeleteBuffersARB) + #define glDeleteBuffers MANGLE(DeleteBuffers) + #define glDeleteFencesAPPLE MANGLE(DeleteFencesAPPLE) + #define glDeleteFencesNV MANGLE(DeleteFencesNV) + #define glDeleteFragmentShaderATI MANGLE(DeleteFragmentShaderATI) + #define glDeleteFramebuffersEXT MANGLE(DeleteFramebuffersEXT) + #define glDeleteLists MANGLE(DeleteLists) + #define glDeleteObjectARB MANGLE(DeleteObjectARB) + #define glDeleteOcclusionQueriesNV MANGLE(DeleteOcclusionQueriesNV) + #define glDeleteProgram MANGLE(DeleteProgram) + #define glDeleteProgramsARB MANGLE(DeleteProgramsARB) + #define glDeleteProgramsNV MANGLE(DeleteProgramsNV) + #define glDeleteQueriesARB MANGLE(DeleteQueriesARB) + #define glDeleteQueries MANGLE(DeleteQueries) + #define glDeleteRenderbuffersEXT MANGLE(DeleteRenderbuffersEXT) + #define glDeleteShader MANGLE(DeleteShader) + #define glDeleteTexturesEXT MANGLE(DeleteTexturesEXT) + #define glDeleteTextures MANGLE(DeleteTextures) + #define glDeleteVertexArraysAPPLE MANGLE(DeleteVertexArraysAPPLE) + #define glDeleteVertexShaderEXT MANGLE(DeleteVertexShaderEXT) + #define glDepthBoundsEXT MANGLE(DepthBoundsEXT) + #define glDepthFunc MANGLE(DepthFunc) + #define glDepthMask MANGLE(DepthMask) + #define glDepthRange MANGLE(DepthRange) + #define glDetachObjectARB MANGLE(DetachObjectARB) + #define glDetachShader MANGLE(DetachShader) + #define glDetailTexFuncSGIS MANGLE(DetailTexFuncSGIS) + #define glDisableClientState MANGLE(DisableClientState) + #define glDisable MANGLE(Disable) + #define glDisableVariantClientStateEXT MANGLE(DisableVariantClientStateEXT) + #define glDisableVertexAttribArrayARB MANGLE(DisableVertexAttribArrayARB) + #define glDisableVertexAttribArray MANGLE(DisableVertexAttribArray) + #define glDrawArraysEXT MANGLE(DrawArraysEXT) + #define glDrawArrays MANGLE(DrawArrays) + #define glDrawBuffer MANGLE(DrawBuffer) + #define glDrawBuffersARB MANGLE(DrawBuffersARB) + #define glDrawBuffersATI MANGLE(DrawBuffersATI) + #define glDrawBuffers MANGLE(DrawBuffers) + #define glDrawElementArrayAPPLE MANGLE(DrawElementArrayAPPLE) + #define glDrawElementArrayATI MANGLE(DrawElementArrayATI) + #define glDrawElements MANGLE(DrawElements) + #define glDrawMeshArraysSUN MANGLE(DrawMeshArraysSUN) + #define glDrawPixels MANGLE(DrawPixels) + #define glDrawRangeElementArrayAPPLE MANGLE(DrawRangeElementArrayAPPLE) + #define glDrawRangeElementArrayATI MANGLE(DrawRangeElementArrayATI) + #define glDrawRangeElementsEXT MANGLE(DrawRangeElementsEXT) + #define glDrawRangeElements MANGLE(DrawRangeElements) + #define glEdgeFlag MANGLE(EdgeFlag) + #define glEdgeFlagPointerEXT MANGLE(EdgeFlagPointerEXT) + #define glEdgeFlagPointerListIBM MANGLE(EdgeFlagPointerListIBM) + #define glEdgeFlagPointer MANGLE(EdgeFlagPointer) + #define glEdgeFlagv MANGLE(EdgeFlagv) + #define glElementPointerAPPLE MANGLE(ElementPointerAPPLE) + #define glElementPointerATI MANGLE(ElementPointerATI) + #define glEnableClientState MANGLE(EnableClientState) + #define glEnable MANGLE(Enable) + #define glEnableVariantClientStateEXT MANGLE(EnableVariantClientStateEXT) + #define glEnableVertexAttribArrayARB MANGLE(EnableVertexAttribArrayARB) + #define glEnableVertexAttribArray MANGLE(EnableVertexAttribArray) + #define glEndFragmentShaderATI MANGLE(EndFragmentShaderATI) + #define glEndList MANGLE(EndList) + #define glEnd MANGLE(End) + #define glEndOcclusionQueryNV MANGLE(EndOcclusionQueryNV) + #define glEndQueryARB MANGLE(EndQueryARB) + #define glEndQuery MANGLE(EndQuery) + #define glEndVertexShaderEXT MANGLE(EndVertexShaderEXT) + #define glEvalCoord1d MANGLE(EvalCoord1d) + #define glEvalCoord1dv MANGLE(EvalCoord1dv) + #define glEvalCoord1f MANGLE(EvalCoord1f) + #define glEvalCoord1fv MANGLE(EvalCoord1fv) + #define glEvalCoord2d MANGLE(EvalCoord2d) + #define glEvalCoord2dv MANGLE(EvalCoord2dv) + #define glEvalCoord2f MANGLE(EvalCoord2f) + #define glEvalCoord2fv MANGLE(EvalCoord2fv) + #define glEvalMapsNV MANGLE(EvalMapsNV) + #define glEvalMesh1 MANGLE(EvalMesh1) + #define glEvalMesh2 MANGLE(EvalMesh2) + #define glEvalPoint1 MANGLE(EvalPoint1) + #define glEvalPoint2 MANGLE(EvalPoint2) + #define glExecuteProgramNV MANGLE(ExecuteProgramNV) + #define glExtractComponentEXT MANGLE(ExtractComponentEXT) + #define glFeedbackBuffer MANGLE(FeedbackBuffer) + #define glFinalCombinerInputNV MANGLE(FinalCombinerInputNV) + #define glFinishAsyncSGIX MANGLE(FinishAsyncSGIX) + #define glFinishFenceAPPLE MANGLE(FinishFenceAPPLE) + #define glFinishFenceNV MANGLE(FinishFenceNV) + #define glFinish MANGLE(Finish) + #define glFinishObjectAPPLE MANGLE(FinishObjectAPPLE) + #define glFinishTextureSUNX MANGLE(FinishTextureSUNX) + #define glFlush MANGLE(Flush) + #define glFlushPixelDataRangeNV MANGLE(FlushPixelDataRangeNV) + #define glFlushRasterSGIX MANGLE(FlushRasterSGIX) + #define glFlushVertexArrayRangeAPPLE MANGLE(FlushVertexArrayRangeAPPLE) + #define glFlushVertexArrayRangeNV MANGLE(FlushVertexArrayRangeNV) + #define glFogCoorddEXT MANGLE(FogCoorddEXT) + #define glFogCoordd MANGLE(FogCoordd) + #define glFogCoorddvEXT MANGLE(FogCoorddvEXT) + #define glFogCoorddv MANGLE(FogCoorddv) + #define glFogCoordfEXT MANGLE(FogCoordfEXT) + #define glFogCoordf MANGLE(FogCoordf) + #define glFogCoordfvEXT MANGLE(FogCoordfvEXT) + #define glFogCoordfv MANGLE(FogCoordfv) + #define glFogCoordhNV MANGLE(FogCoordhNV) + #define glFogCoordhvNV MANGLE(FogCoordhvNV) + #define glFogCoordPointerEXT MANGLE(FogCoordPointerEXT) + #define glFogCoordPointerListIBM MANGLE(FogCoordPointerListIBM) + #define glFogCoordPointer MANGLE(FogCoordPointer) + #define glFogf MANGLE(Fogf) + #define glFogFuncSGIS MANGLE(FogFuncSGIS) + #define glFogfv MANGLE(Fogfv) + #define glFogi MANGLE(Fogi) + #define glFogiv MANGLE(Fogiv) + #define glFragmentColorMaterialSGIX MANGLE(FragmentColorMaterialSGIX) + #define glFragmentLightfSGIX MANGLE(FragmentLightfSGIX) + #define glFragmentLightfvSGIX MANGLE(FragmentLightfvSGIX) + #define glFragmentLightiSGIX MANGLE(FragmentLightiSGIX) + #define glFragmentLightivSGIX MANGLE(FragmentLightivSGIX) + #define glFragmentLightModelfSGIX MANGLE(FragmentLightModelfSGIX) + #define glFragmentLightModelfvSGIX MANGLE(FragmentLightModelfvSGIX) + #define glFragmentLightModeliSGIX MANGLE(FragmentLightModeliSGIX) + #define glFragmentLightModelivSGIX MANGLE(FragmentLightModelivSGIX) + #define glFragmentMaterialfSGIX MANGLE(FragmentMaterialfSGIX) + #define glFragmentMaterialfvSGIX MANGLE(FragmentMaterialfvSGIX) + #define glFragmentMaterialiSGIX MANGLE(FragmentMaterialiSGIX) + #define glFragmentMaterialivSGIX MANGLE(FragmentMaterialivSGIX) + #define glFramebufferRenderbufferEXT MANGLE(FramebufferRenderbufferEXT) + #define glFramebufferTexture1DEXT MANGLE(FramebufferTexture1DEXT) + #define glFramebufferTexture2DEXT MANGLE(FramebufferTexture2DEXT) + #define glFramebufferTexture3DEXT MANGLE(FramebufferTexture3DEXT) + #define glFrameZoomSGIX MANGLE(FrameZoomSGIX) + #define glFreeObjectBufferATI MANGLE(FreeObjectBufferATI) + #define glFrontFace MANGLE(FrontFace) + #define glFrustum MANGLE(Frustum) + #define glGenAsyncMarkersSGIX MANGLE(GenAsyncMarkersSGIX) + #define glGenBuffersARB MANGLE(GenBuffersARB) + #define glGenBuffers MANGLE(GenBuffers) + #define glGenerateMipmapEXT MANGLE(GenerateMipmapEXT) + #define glGenFencesAPPLE MANGLE(GenFencesAPPLE) + #define glGenFencesNV MANGLE(GenFencesNV) + #define glGenFragmentShadersATI MANGLE(GenFragmentShadersATI) + #define glGenFramebuffersEXT MANGLE(GenFramebuffersEXT) + #define glGenLists MANGLE(GenLists) + #define glGenOcclusionQueriesNV MANGLE(GenOcclusionQueriesNV) + #define glGenProgramsARB MANGLE(GenProgramsARB) + #define glGenProgramsNV MANGLE(GenProgramsNV) + #define glGenQueriesARB MANGLE(GenQueriesARB) + #define glGenQueries MANGLE(GenQueries) + #define glGenRenderbuffersEXT MANGLE(GenRenderbuffersEXT) + #define glGenSymbolsEXT MANGLE(GenSymbolsEXT) + #define glGenTexturesEXT MANGLE(GenTexturesEXT) + #define glGenTextures MANGLE(GenTextures) + #define glGenVertexArraysAPPLE MANGLE(GenVertexArraysAPPLE) + #define glGenVertexShadersEXT MANGLE(GenVertexShadersEXT) + #define glGetActiveAttribARB MANGLE(GetActiveAttribARB) + #define glGetActiveAttrib MANGLE(GetActiveAttrib) + #define glGetActiveUniformARB MANGLE(GetActiveUniformARB) + #define glGetActiveUniform MANGLE(GetActiveUniform) + #define glGetArrayObjectfvATI MANGLE(GetArrayObjectfvATI) + #define glGetArrayObjectivATI MANGLE(GetArrayObjectivATI) + #define glGetAttachedObjectsARB MANGLE(GetAttachedObjectsARB) + #define glGetAttachedShaders MANGLE(GetAttachedShaders) + #define glGetAttribLocationARB MANGLE(GetAttribLocationARB) + #define glGetAttribLocation MANGLE(GetAttribLocation) + #define glGetBooleanv MANGLE(GetBooleanv) + #define glGetBufferParameterivARB MANGLE(GetBufferParameterivARB) + #define glGetBufferParameteriv MANGLE(GetBufferParameteriv) + #define glGetBufferPointervARB MANGLE(GetBufferPointervARB) + #define glGetBufferPointerv MANGLE(GetBufferPointerv) + #define glGetBufferSubDataARB MANGLE(GetBufferSubDataARB) + #define glGetBufferSubData MANGLE(GetBufferSubData) + #define glGetClipPlane MANGLE(GetClipPlane) + #define glGetColorTableEXT MANGLE(GetColorTableEXT) + #define glGetColorTable MANGLE(GetColorTable) + #define glGetColorTableParameterfvEXT MANGLE(GetColorTableParameterfvEXT) + #define glGetColorTableParameterfv MANGLE(GetColorTableParameterfv) + #define glGetColorTableParameterfvSGI MANGLE(GetColorTableParameterfvSGI) + #define glGetColorTableParameterivEXT MANGLE(GetColorTableParameterivEXT) + #define glGetColorTableParameteriv MANGLE(GetColorTableParameteriv) + #define glGetColorTableParameterivSGI MANGLE(GetColorTableParameterivSGI) + #define glGetColorTableSGI MANGLE(GetColorTableSGI) + #define glGetCombinerInputParameterfvNV MANGLE(GetCombinerInputParameterfvNV) + #define glGetCombinerInputParameterivNV MANGLE(GetCombinerInputParameterivNV) + #define glGetCombinerOutputParameterfvNV MANGLE(GetCombinerOutputParameterfvNV) + #define glGetCombinerOutputParameterivNV MANGLE(GetCombinerOutputParameterivNV) + #define glGetCombinerStageParameterfvNV MANGLE(GetCombinerStageParameterfvNV) + #define glGetCompressedTexImageARB MANGLE(GetCompressedTexImageARB) + #define glGetCompressedTexImage MANGLE(GetCompressedTexImage) + #define glGetConvolutionFilterEXT MANGLE(GetConvolutionFilterEXT) + #define glGetConvolutionFilter MANGLE(GetConvolutionFilter) + #define glGetConvolutionParameterfvEXT MANGLE(GetConvolutionParameterfvEXT) + #define glGetConvolutionParameterfv MANGLE(GetConvolutionParameterfv) + #define glGetConvolutionParameterivEXT MANGLE(GetConvolutionParameterivEXT) + #define glGetConvolutionParameteriv MANGLE(GetConvolutionParameteriv) + #define glGetDebugLogLengthMESA MANGLE(GetDebugLogLengthMESA) + #define glGetDebugLogMESA MANGLE(GetDebugLogMESA) + #define glGetDetailTexFuncSGIS MANGLE(GetDetailTexFuncSGIS) + #define glGetDoublev MANGLE(GetDoublev) + #define glGetError MANGLE(GetError) + #define glGetFenceivNV MANGLE(GetFenceivNV) + #define glGetFinalCombinerInputParameterfvNV MANGLE(GetFinalCombinerInputParameterfvNV) + #define glGetFinalCombinerInputParameterivNV MANGLE(GetFinalCombinerInputParameterivNV) + #define glGetFloatv MANGLE(GetFloatv) + #define glGetFogFuncSGIS MANGLE(GetFogFuncSGIS) + #define glGetFragmentLightfvSGIX MANGLE(GetFragmentLightfvSGIX) + #define glGetFragmentLightivSGIX MANGLE(GetFragmentLightivSGIX) + #define glGetFragmentMaterialfvSGIX MANGLE(GetFragmentMaterialfvSGIX) + #define glGetFragmentMaterialivSGIX MANGLE(GetFragmentMaterialivSGIX) + #define glGetFramebufferAttachmentParameterivEXT MANGLE(GetFramebufferAttachmentParameterivEXT) + #define glGetHandleARB MANGLE(GetHandleARB) + #define glGetHistogramEXT MANGLE(GetHistogramEXT) + #define glGetHistogram MANGLE(GetHistogram) + #define glGetHistogramParameterfvEXT MANGLE(GetHistogramParameterfvEXT) + #define glGetHistogramParameterfv MANGLE(GetHistogramParameterfv) + #define glGetHistogramParameterivEXT MANGLE(GetHistogramParameterivEXT) + #define glGetHistogramParameteriv MANGLE(GetHistogramParameteriv) + #define glGetImageTransformParameterfvHP MANGLE(GetImageTransformParameterfvHP) + #define glGetImageTransformParameterivHP MANGLE(GetImageTransformParameterivHP) + #define glGetInfoLogARB MANGLE(GetInfoLogARB) + #define glGetInstrumentsSGIX MANGLE(GetInstrumentsSGIX) + #define glGetIntegerv MANGLE(GetIntegerv) + #define glGetInvariantBooleanvEXT MANGLE(GetInvariantBooleanvEXT) + #define glGetInvariantFloatvEXT MANGLE(GetInvariantFloatvEXT) + #define glGetInvariantIntegervEXT MANGLE(GetInvariantIntegervEXT) + #define glGetLightfv MANGLE(GetLightfv) + #define glGetLightiv MANGLE(GetLightiv) + #define glGetListParameterfvSGIX MANGLE(GetListParameterfvSGIX) + #define glGetListParameterivSGIX MANGLE(GetListParameterivSGIX) + #define glGetLocalConstantBooleanvEXT MANGLE(GetLocalConstantBooleanvEXT) + #define glGetLocalConstantFloatvEXT MANGLE(GetLocalConstantFloatvEXT) + #define glGetLocalConstantIntegervEXT MANGLE(GetLocalConstantIntegervEXT) + #define glGetMapAttribParameterfvNV MANGLE(GetMapAttribParameterfvNV) + #define glGetMapAttribParameterivNV MANGLE(GetMapAttribParameterivNV) + #define glGetMapControlPointsNV MANGLE(GetMapControlPointsNV) + #define glGetMapdv MANGLE(GetMapdv) + #define glGetMapfv MANGLE(GetMapfv) + #define glGetMapiv MANGLE(GetMapiv) + #define glGetMapParameterfvNV MANGLE(GetMapParameterfvNV) + #define glGetMapParameterivNV MANGLE(GetMapParameterivNV) + #define glGetMaterialfv MANGLE(GetMaterialfv) + #define glGetMaterialiv MANGLE(GetMaterialiv) + #define glGetMinmaxEXT MANGLE(GetMinmaxEXT) + #define glGetMinmax MANGLE(GetMinmax) + #define glGetMinmaxParameterfvEXT MANGLE(GetMinmaxParameterfvEXT) + #define glGetMinmaxParameterfv MANGLE(GetMinmaxParameterfv) + #define glGetMinmaxParameterivEXT MANGLE(GetMinmaxParameterivEXT) + #define glGetMinmaxParameteriv MANGLE(GetMinmaxParameteriv) + #define glGetObjectBufferfvATI MANGLE(GetObjectBufferfvATI) + #define glGetObjectBufferivATI MANGLE(GetObjectBufferivATI) + #define glGetObjectParameterfvARB MANGLE(GetObjectParameterfvARB) + #define glGetObjectParameterivARB MANGLE(GetObjectParameterivARB) + #define glGetOcclusionQueryivNV MANGLE(GetOcclusionQueryivNV) + #define glGetOcclusionQueryuivNV MANGLE(GetOcclusionQueryuivNV) + #define glGetPixelMapfv MANGLE(GetPixelMapfv) + #define glGetPixelMapuiv MANGLE(GetPixelMapuiv) + #define glGetPixelMapusv MANGLE(GetPixelMapusv) + #define glGetPixelTexGenParameterfvSGIS MANGLE(GetPixelTexGenParameterfvSGIS) + #define glGetPixelTexGenParameterivSGIS MANGLE(GetPixelTexGenParameterivSGIS) + #define glGetPointervEXT MANGLE(GetPointervEXT) + #define glGetPointerv MANGLE(GetPointerv) + #define glGetPolygonStipple MANGLE(GetPolygonStipple) + #define glGetProgramEnvParameterdvARB MANGLE(GetProgramEnvParameterdvARB) + #define glGetProgramEnvParameterfvARB MANGLE(GetProgramEnvParameterfvARB) + #define glGetProgramInfoLog MANGLE(GetProgramInfoLog) + #define glGetProgramivARB MANGLE(GetProgramivARB) + #define glGetProgramiv MANGLE(GetProgramiv) + #define glGetProgramivNV MANGLE(GetProgramivNV) + #define glGetProgramLocalParameterdvARB MANGLE(GetProgramLocalParameterdvARB) + #define glGetProgramLocalParameterfvARB MANGLE(GetProgramLocalParameterfvARB) + #define glGetProgramNamedParameterdvNV MANGLE(GetProgramNamedParameterdvNV) + #define glGetProgramNamedParameterfvNV MANGLE(GetProgramNamedParameterfvNV) + #define glGetProgramParameterdvNV MANGLE(GetProgramParameterdvNV) + #define glGetProgramParameterfvNV MANGLE(GetProgramParameterfvNV) + #define glGetProgramRegisterfvMESA MANGLE(GetProgramRegisterfvMESA) + #define glGetProgramStringARB MANGLE(GetProgramStringARB) + #define glGetProgramStringNV MANGLE(GetProgramStringNV) + #define glGetQueryivARB MANGLE(GetQueryivARB) + #define glGetQueryiv MANGLE(GetQueryiv) + #define glGetQueryObjecti64vEXT MANGLE(GetQueryObjecti64vEXT) + #define glGetQueryObjectivARB MANGLE(GetQueryObjectivARB) + #define glGetQueryObjectiv MANGLE(GetQueryObjectiv) + #define glGetQueryObjectui64vEXT MANGLE(GetQueryObjectui64vEXT) + #define glGetQueryObjectuivARB MANGLE(GetQueryObjectuivARB) + #define glGetQueryObjectuiv MANGLE(GetQueryObjectuiv) + #define glGetRenderbufferParameterivEXT MANGLE(GetRenderbufferParameterivEXT) + #define glGetSeparableFilterEXT MANGLE(GetSeparableFilterEXT) + #define glGetSeparableFilter MANGLE(GetSeparableFilter) + #define glGetShaderInfoLog MANGLE(GetShaderInfoLog) + #define glGetShaderiv MANGLE(GetShaderiv) + #define glGetShaderSourceARB MANGLE(GetShaderSourceARB) + #define glGetShaderSource MANGLE(GetShaderSource) + #define glGetSharpenTexFuncSGIS MANGLE(GetSharpenTexFuncSGIS) + #define glGetString MANGLE(GetString) + #define glGetTexBumpParameterfvATI MANGLE(GetTexBumpParameterfvATI) + #define glGetTexBumpParameterivATI MANGLE(GetTexBumpParameterivATI) + #define glGetTexEnvfv MANGLE(GetTexEnvfv) + #define glGetTexEnviv MANGLE(GetTexEnviv) + #define glGetTexFilterFuncSGIS MANGLE(GetTexFilterFuncSGIS) + #define glGetTexGendv MANGLE(GetTexGendv) + #define glGetTexGenfv MANGLE(GetTexGenfv) + #define glGetTexGeniv MANGLE(GetTexGeniv) + #define glGetTexImage MANGLE(GetTexImage) + #define glGetTexLevelParameterfv MANGLE(GetTexLevelParameterfv) + #define glGetTexLevelParameteriv MANGLE(GetTexLevelParameteriv) + #define glGetTexParameterfv MANGLE(GetTexParameterfv) + #define glGetTexParameteriv MANGLE(GetTexParameteriv) + #define glGetTrackMatrixivNV MANGLE(GetTrackMatrixivNV) + #define glGetUniformfvARB MANGLE(GetUniformfvARB) + #define glGetUniformfv MANGLE(GetUniformfv) + #define glGetUniformivARB MANGLE(GetUniformivARB) + #define glGetUniformiv MANGLE(GetUniformiv) + #define glGetUniformLocationARB MANGLE(GetUniformLocationARB) + #define glGetUniformLocation MANGLE(GetUniformLocation) + #define glGetVariantArrayObjectfvATI MANGLE(GetVariantArrayObjectfvATI) + #define glGetVariantArrayObjectivATI MANGLE(GetVariantArrayObjectivATI) + #define glGetVariantBooleanvEXT MANGLE(GetVariantBooleanvEXT) + #define glGetVariantFloatvEXT MANGLE(GetVariantFloatvEXT) + #define glGetVariantIntegervEXT MANGLE(GetVariantIntegervEXT) + #define glGetVariantPointervEXT MANGLE(GetVariantPointervEXT) + #define glGetVertexAttribArrayObjectfvATI MANGLE(GetVertexAttribArrayObjectfvATI) + #define glGetVertexAttribArrayObjectivATI MANGLE(GetVertexAttribArrayObjectivATI) + #define glGetVertexAttribdvARB MANGLE(GetVertexAttribdvARB) + #define glGetVertexAttribdv MANGLE(GetVertexAttribdv) + #define glGetVertexAttribdvNV MANGLE(GetVertexAttribdvNV) + #define glGetVertexAttribfvARB MANGLE(GetVertexAttribfvARB) + #define glGetVertexAttribfv MANGLE(GetVertexAttribfv) + #define glGetVertexAttribfvNV MANGLE(GetVertexAttribfvNV) + #define glGetVertexAttribivARB MANGLE(GetVertexAttribivARB) + #define glGetVertexAttribiv MANGLE(GetVertexAttribiv) + #define glGetVertexAttribivNV MANGLE(GetVertexAttribivNV) + #define glGetVertexAttribPointervARB MANGLE(GetVertexAttribPointervARB) + #define glGetVertexAttribPointerv MANGLE(GetVertexAttribPointerv) + #define glGetVertexAttribPointervNV MANGLE(GetVertexAttribPointervNV) + #define glGlobalAlphaFactorbSUN MANGLE(GlobalAlphaFactorbSUN) + #define glGlobalAlphaFactordSUN MANGLE(GlobalAlphaFactordSUN) + #define glGlobalAlphaFactorfSUN MANGLE(GlobalAlphaFactorfSUN) + #define glGlobalAlphaFactoriSUN MANGLE(GlobalAlphaFactoriSUN) + #define glGlobalAlphaFactorsSUN MANGLE(GlobalAlphaFactorsSUN) + #define glGlobalAlphaFactorubSUN MANGLE(GlobalAlphaFactorubSUN) + #define glGlobalAlphaFactoruiSUN MANGLE(GlobalAlphaFactoruiSUN) + #define glGlobalAlphaFactorusSUN MANGLE(GlobalAlphaFactorusSUN) + #define glHint MANGLE(Hint) + #define glHintPGI MANGLE(HintPGI) + #define glHistogramEXT MANGLE(HistogramEXT) + #define glHistogram MANGLE(Histogram) + #define glIglooInterfaceSGIX MANGLE(IglooInterfaceSGIX) + #define glImageTransformParameterfHP MANGLE(ImageTransformParameterfHP) + #define glImageTransformParameterfvHP MANGLE(ImageTransformParameterfvHP) + #define glImageTransformParameteriHP MANGLE(ImageTransformParameteriHP) + #define glImageTransformParameterivHP MANGLE(ImageTransformParameterivHP) + #define glIndexd MANGLE(Indexd) + #define glIndexdv MANGLE(Indexdv) + #define glIndexf MANGLE(Indexf) + #define glIndexFuncEXT MANGLE(IndexFuncEXT) + #define glIndexfv MANGLE(Indexfv) + #define glIndexi MANGLE(Indexi) + #define glIndexiv MANGLE(Indexiv) + #define glIndexMask MANGLE(IndexMask) + #define glIndexMaterialEXT MANGLE(IndexMaterialEXT) + #define glIndexPointerEXT MANGLE(IndexPointerEXT) + #define glIndexPointerListIBM MANGLE(IndexPointerListIBM) + #define glIndexPointer MANGLE(IndexPointer) + #define glIndexs MANGLE(Indexs) + #define glIndexsv MANGLE(Indexsv) + #define glIndexub MANGLE(Indexub) + #define glIndexubv MANGLE(Indexubv) + #define glInitNames MANGLE(InitNames) + #define glInsertComponentEXT MANGLE(InsertComponentEXT) + #define glInstrumentsBufferSGIX MANGLE(InstrumentsBufferSGIX) + #define glInterleavedArrays MANGLE(InterleavedArrays) + #define glIsAsyncMarkerSGIX MANGLE(IsAsyncMarkerSGIX) + #define glIsBufferARB MANGLE(IsBufferARB) + #define glIsBuffer MANGLE(IsBuffer) + #define glIsEnabled MANGLE(IsEnabled) + #define glIsFenceAPPLE MANGLE(IsFenceAPPLE) + #define glIsFenceNV MANGLE(IsFenceNV) + #define glIsFramebufferEXT MANGLE(IsFramebufferEXT) + #define glIsList MANGLE(IsList) + #define glIsObjectBufferATI MANGLE(IsObjectBufferATI) + #define glIsOcclusionQueryNV MANGLE(IsOcclusionQueryNV) + #define glIsProgramARB MANGLE(IsProgramARB) + #define glIsProgram MANGLE(IsProgram) + #define glIsProgramNV MANGLE(IsProgramNV) + #define glIsQueryARB MANGLE(IsQueryARB) + #define glIsQuery MANGLE(IsQuery) + #define glIsRenderbufferEXT MANGLE(IsRenderbufferEXT) + #define glIsShader MANGLE(IsShader) + #define glIsTextureEXT MANGLE(IsTextureEXT) + #define glIsTexture MANGLE(IsTexture) + #define glIsVariantEnabledEXT MANGLE(IsVariantEnabledEXT) + #define glIsVertexArrayAPPLE MANGLE(IsVertexArrayAPPLE) + #define glLightEnviSGIX MANGLE(LightEnviSGIX) + #define glLightf MANGLE(Lightf) + #define glLightfv MANGLE(Lightfv) + #define glLighti MANGLE(Lighti) + #define glLightiv MANGLE(Lightiv) + #define glLightModelf MANGLE(LightModelf) + #define glLightModelfv MANGLE(LightModelfv) + #define glLightModeli MANGLE(LightModeli) + #define glLightModeliv MANGLE(LightModeliv) + #define glLineStipple MANGLE(LineStipple) + #define glLineWidth MANGLE(LineWidth) + #define glLinkProgramARB MANGLE(LinkProgramARB) + #define glLinkProgram MANGLE(LinkProgram) + #define glListBase MANGLE(ListBase) + #define glListParameterfSGIX MANGLE(ListParameterfSGIX) + #define glListParameterfvSGIX MANGLE(ListParameterfvSGIX) + #define glListParameteriSGIX MANGLE(ListParameteriSGIX) + #define glListParameterivSGIX MANGLE(ListParameterivSGIX) + #define glLoadIdentityDeformationMapSGIX MANGLE(LoadIdentityDeformationMapSGIX) + #define glLoadIdentity MANGLE(LoadIdentity) + #define glLoadMatrixd MANGLE(LoadMatrixd) + #define glLoadMatrixf MANGLE(LoadMatrixf) + #define glLoadName MANGLE(LoadName) + #define glLoadProgramNV MANGLE(LoadProgramNV) + #define glLoadTransposeMatrixdARB MANGLE(LoadTransposeMatrixdARB) + #define glLoadTransposeMatrixd MANGLE(LoadTransposeMatrixd) + #define glLoadTransposeMatrixfARB MANGLE(LoadTransposeMatrixfARB) + #define glLoadTransposeMatrixf MANGLE(LoadTransposeMatrixf) + #define glLockArraysEXT MANGLE(LockArraysEXT) + #define glLogicOp MANGLE(LogicOp) + #define glMap1d MANGLE(Map1d) + #define glMap1f MANGLE(Map1f) + #define glMap2d MANGLE(Map2d) + #define glMap2f MANGLE(Map2f) + #define glMapBufferARB MANGLE(MapBufferARB) + #define glMapBuffer MANGLE(MapBuffer) + #define glMapControlPointsNV MANGLE(MapControlPointsNV) + #define glMapGrid1d MANGLE(MapGrid1d) + #define glMapGrid1f MANGLE(MapGrid1f) + #define glMapGrid2d MANGLE(MapGrid2d) + #define glMapGrid2f MANGLE(MapGrid2f) + #define glMapObjectBufferATI MANGLE(MapObjectBufferATI) + #define glMapParameterfvNV MANGLE(MapParameterfvNV) + #define glMapParameterivNV MANGLE(MapParameterivNV) + #define glMaterialf MANGLE(Materialf) + #define glMaterialfv MANGLE(Materialfv) + #define glMateriali MANGLE(Materiali) + #define glMaterialiv MANGLE(Materialiv) + #define glMatrixIndexPointerARB MANGLE(MatrixIndexPointerARB) + #define glMatrixIndexubvARB MANGLE(MatrixIndexubvARB) + #define glMatrixIndexuivARB MANGLE(MatrixIndexuivARB) + #define glMatrixIndexusvARB MANGLE(MatrixIndexusvARB) + #define glMatrixMode MANGLE(MatrixMode) + #define glMinmaxEXT MANGLE(MinmaxEXT) + #define glMinmax MANGLE(Minmax) + #define glMultiDrawArraysEXT MANGLE(MultiDrawArraysEXT) + #define glMultiDrawArrays MANGLE(MultiDrawArrays) + #define glMultiDrawElementArrayAPPLE MANGLE(MultiDrawElementArrayAPPLE) + #define glMultiDrawElementsEXT MANGLE(MultiDrawElementsEXT) + #define glMultiDrawElements MANGLE(MultiDrawElements) + #define glMultiDrawRangeElementArrayAPPLE MANGLE(MultiDrawRangeElementArrayAPPLE) + #define glMultiModeDrawArraysIBM MANGLE(MultiModeDrawArraysIBM) + #define glMultiModeDrawElementsIBM MANGLE(MultiModeDrawElementsIBM) + #define glMultiTexCoord1dARB MANGLE(MultiTexCoord1dARB) + #define glMultiTexCoord1d MANGLE(MultiTexCoord1d) + #define glMultiTexCoord1dvARB MANGLE(MultiTexCoord1dvARB) + #define glMultiTexCoord1dv MANGLE(MultiTexCoord1dv) + #define glMultiTexCoord1fARB MANGLE(MultiTexCoord1fARB) + #define glMultiTexCoord1f MANGLE(MultiTexCoord1f) + #define glMultiTexCoord1fvARB MANGLE(MultiTexCoord1fvARB) + #define glMultiTexCoord1fv MANGLE(MultiTexCoord1fv) + #define glMultiTexCoord1hNV MANGLE(MultiTexCoord1hNV) + #define glMultiTexCoord1hvNV MANGLE(MultiTexCoord1hvNV) + #define glMultiTexCoord1iARB MANGLE(MultiTexCoord1iARB) + #define glMultiTexCoord1i MANGLE(MultiTexCoord1i) + #define glMultiTexCoord1ivARB MANGLE(MultiTexCoord1ivARB) + #define glMultiTexCoord1iv MANGLE(MultiTexCoord1iv) + #define glMultiTexCoord1sARB MANGLE(MultiTexCoord1sARB) + #define glMultiTexCoord1s MANGLE(MultiTexCoord1s) + #define glMultiTexCoord1svARB MANGLE(MultiTexCoord1svARB) + #define glMultiTexCoord1sv MANGLE(MultiTexCoord1sv) + #define glMultiTexCoord2dARB MANGLE(MultiTexCoord2dARB) + #define glMultiTexCoord2d MANGLE(MultiTexCoord2d) + #define glMultiTexCoord2dvARB MANGLE(MultiTexCoord2dvARB) + #define glMultiTexCoord2dv MANGLE(MultiTexCoord2dv) + #define glMultiTexCoord2fARB MANGLE(MultiTexCoord2fARB) + #define glMultiTexCoord2f MANGLE(MultiTexCoord2f) + #define glMultiTexCoord2fvARB MANGLE(MultiTexCoord2fvARB) + #define glMultiTexCoord2fv MANGLE(MultiTexCoord2fv) + #define glMultiTexCoord2hNV MANGLE(MultiTexCoord2hNV) + #define glMultiTexCoord2hvNV MANGLE(MultiTexCoord2hvNV) + #define glMultiTexCoord2iARB MANGLE(MultiTexCoord2iARB) + #define glMultiTexCoord2i MANGLE(MultiTexCoord2i) + #define glMultiTexCoord2ivARB MANGLE(MultiTexCoord2ivARB) + #define glMultiTexCoord2iv MANGLE(MultiTexCoord2iv) + #define glMultiTexCoord2sARB MANGLE(MultiTexCoord2sARB) + #define glMultiTexCoord2s MANGLE(MultiTexCoord2s) + #define glMultiTexCoord2svARB MANGLE(MultiTexCoord2svARB) + #define glMultiTexCoord2sv MANGLE(MultiTexCoord2sv) + #define glMultiTexCoord3dARB MANGLE(MultiTexCoord3dARB) + #define glMultiTexCoord3d MANGLE(MultiTexCoord3d) + #define glMultiTexCoord3dvARB MANGLE(MultiTexCoord3dvARB) + #define glMultiTexCoord3dv MANGLE(MultiTexCoord3dv) + #define glMultiTexCoord3fARB MANGLE(MultiTexCoord3fARB) + #define glMultiTexCoord3f MANGLE(MultiTexCoord3f) + #define glMultiTexCoord3fvARB MANGLE(MultiTexCoord3fvARB) + #define glMultiTexCoord3fv MANGLE(MultiTexCoord3fv) + #define glMultiTexCoord3hNV MANGLE(MultiTexCoord3hNV) + #define glMultiTexCoord3hvNV MANGLE(MultiTexCoord3hvNV) + #define glMultiTexCoord3iARB MANGLE(MultiTexCoord3iARB) + #define glMultiTexCoord3i MANGLE(MultiTexCoord3i) + #define glMultiTexCoord3ivARB MANGLE(MultiTexCoord3ivARB) + #define glMultiTexCoord3iv MANGLE(MultiTexCoord3iv) + #define glMultiTexCoord3sARB MANGLE(MultiTexCoord3sARB) + #define glMultiTexCoord3s MANGLE(MultiTexCoord3s) + #define glMultiTexCoord3svARB MANGLE(MultiTexCoord3svARB) + #define glMultiTexCoord3sv MANGLE(MultiTexCoord3sv) + #define glMultiTexCoord4dARB MANGLE(MultiTexCoord4dARB) + #define glMultiTexCoord4d MANGLE(MultiTexCoord4d) + #define glMultiTexCoord4dvARB MANGLE(MultiTexCoord4dvARB) + #define glMultiTexCoord4dv MANGLE(MultiTexCoord4dv) + #define glMultiTexCoord4fARB MANGLE(MultiTexCoord4fARB) + #define glMultiTexCoord4f MANGLE(MultiTexCoord4f) + #define glMultiTexCoord4fvARB MANGLE(MultiTexCoord4fvARB) + #define glMultiTexCoord4fv MANGLE(MultiTexCoord4fv) + #define glMultiTexCoord4hNV MANGLE(MultiTexCoord4hNV) + #define glMultiTexCoord4hvNV MANGLE(MultiTexCoord4hvNV) + #define glMultiTexCoord4iARB MANGLE(MultiTexCoord4iARB) + #define glMultiTexCoord4i MANGLE(MultiTexCoord4i) + #define glMultiTexCoord4ivARB MANGLE(MultiTexCoord4ivARB) + #define glMultiTexCoord4iv MANGLE(MultiTexCoord4iv) + #define glMultiTexCoord4sARB MANGLE(MultiTexCoord4sARB) + #define glMultiTexCoord4s MANGLE(MultiTexCoord4s) + #define glMultiTexCoord4svARB MANGLE(MultiTexCoord4svARB) + #define glMultiTexCoord4sv MANGLE(MultiTexCoord4sv) + #define glMultMatrixd MANGLE(MultMatrixd) + #define glMultMatrixf MANGLE(MultMatrixf) + #define glMultTransposeMatrixdARB MANGLE(MultTransposeMatrixdARB) + #define glMultTransposeMatrixd MANGLE(MultTransposeMatrixd) + #define glMultTransposeMatrixfARB MANGLE(MultTransposeMatrixfARB) + #define glMultTransposeMatrixf MANGLE(MultTransposeMatrixf) + #define glNewList MANGLE(NewList) + #define glNewObjectBufferATI MANGLE(NewObjectBufferATI) + #define glNormal3b MANGLE(Normal3b) + #define glNormal3bv MANGLE(Normal3bv) + #define glNormal3d MANGLE(Normal3d) + #define glNormal3dv MANGLE(Normal3dv) + #define glNormal3f MANGLE(Normal3f) + #define glNormal3fVertex3fSUN MANGLE(Normal3fVertex3fSUN) + #define glNormal3fVertex3fvSUN MANGLE(Normal3fVertex3fvSUN) + #define glNormal3fv MANGLE(Normal3fv) + #define glNormal3hNV MANGLE(Normal3hNV) + #define glNormal3hvNV MANGLE(Normal3hvNV) + #define glNormal3i MANGLE(Normal3i) + #define glNormal3iv MANGLE(Normal3iv) + #define glNormal3s MANGLE(Normal3s) + #define glNormal3sv MANGLE(Normal3sv) + #define glNormalPointerEXT MANGLE(NormalPointerEXT) + #define glNormalPointerListIBM MANGLE(NormalPointerListIBM) + #define glNormalPointer MANGLE(NormalPointer) + #define glNormalPointervINTEL MANGLE(NormalPointervINTEL) + #define glNormalStream3bATI MANGLE(NormalStream3bATI) + #define glNormalStream3bvATI MANGLE(NormalStream3bvATI) + #define glNormalStream3dATI MANGLE(NormalStream3dATI) + #define glNormalStream3dvATI MANGLE(NormalStream3dvATI) + #define glNormalStream3fATI MANGLE(NormalStream3fATI) + #define glNormalStream3fvATI MANGLE(NormalStream3fvATI) + #define glNormalStream3iATI MANGLE(NormalStream3iATI) + #define glNormalStream3ivATI MANGLE(NormalStream3ivATI) + #define glNormalStream3sATI MANGLE(NormalStream3sATI) + #define glNormalStream3svATI MANGLE(NormalStream3svATI) + #define glOrtho MANGLE(Ortho) + #define glPassTexCoordATI MANGLE(PassTexCoordATI) + #define glPassThrough MANGLE(PassThrough) + #define glPixelDataRangeNV MANGLE(PixelDataRangeNV) + #define glPixelMapfv MANGLE(PixelMapfv) + #define glPixelMapuiv MANGLE(PixelMapuiv) + #define glPixelMapusv MANGLE(PixelMapusv) + #define glPixelStoref MANGLE(PixelStoref) + #define glPixelStorei MANGLE(PixelStorei) + #define glPixelTexGenParameterfSGIS MANGLE(PixelTexGenParameterfSGIS) + #define glPixelTexGenParameterfvSGIS MANGLE(PixelTexGenParameterfvSGIS) + #define glPixelTexGenParameteriSGIS MANGLE(PixelTexGenParameteriSGIS) + #define glPixelTexGenParameterivSGIS MANGLE(PixelTexGenParameterivSGIS) + #define glPixelTexGenSGIX MANGLE(PixelTexGenSGIX) + #define glPixelTransferf MANGLE(PixelTransferf) + #define glPixelTransferi MANGLE(PixelTransferi) + #define glPixelTransformParameterfEXT MANGLE(PixelTransformParameterfEXT) + #define glPixelTransformParameterfvEXT MANGLE(PixelTransformParameterfvEXT) + #define glPixelTransformParameteriEXT MANGLE(PixelTransformParameteriEXT) + #define glPixelTransformParameterivEXT MANGLE(PixelTransformParameterivEXT) + #define glPixelZoom MANGLE(PixelZoom) + #define glPNTrianglesfATI MANGLE(PNTrianglesfATI) + #define glPNTrianglesiATI MANGLE(PNTrianglesiATI) + #define glPointParameterfARB MANGLE(PointParameterfARB) + #define glPointParameterfEXT MANGLE(PointParameterfEXT) + #define glPointParameterf MANGLE(PointParameterf) + #define glPointParameterfSGIS MANGLE(PointParameterfSGIS) + #define glPointParameterfvARB MANGLE(PointParameterfvARB) + #define glPointParameterfvEXT MANGLE(PointParameterfvEXT) + #define glPointParameterfv MANGLE(PointParameterfv) + #define glPointParameterfvSGIS MANGLE(PointParameterfvSGIS) + #define glPointParameteri MANGLE(PointParameteri) + #define glPointParameteriNV MANGLE(PointParameteriNV) + #define glPointParameteriv MANGLE(PointParameteriv) + #define glPointParameterivNV MANGLE(PointParameterivNV) + #define glPointSize MANGLE(PointSize) + #define glPollAsyncSGIX MANGLE(PollAsyncSGIX) + #define glPollInstrumentsSGIX MANGLE(PollInstrumentsSGIX) + #define glPolygonMode MANGLE(PolygonMode) + #define glPolygonOffsetEXT MANGLE(PolygonOffsetEXT) + #define glPolygonOffset MANGLE(PolygonOffset) + #define glPolygonStipple MANGLE(PolygonStipple) + #define glPopAttrib MANGLE(PopAttrib) + #define glPopClientAttrib MANGLE(PopClientAttrib) + #define glPopMatrix MANGLE(PopMatrix) + #define glPopName MANGLE(PopName) + #define glPrimitiveRestartIndexNV MANGLE(PrimitiveRestartIndexNV) + #define glPrimitiveRestartNV MANGLE(PrimitiveRestartNV) + #define glPrioritizeTexturesEXT MANGLE(PrioritizeTexturesEXT) + #define glPrioritizeTextures MANGLE(PrioritizeTextures) + #define glProgramCallbackMESA MANGLE(ProgramCallbackMESA) + #define glProgramEnvParameter4dARB MANGLE(ProgramEnvParameter4dARB) + #define glProgramEnvParameter4dvARB MANGLE(ProgramEnvParameter4dvARB) + #define glProgramEnvParameter4fARB MANGLE(ProgramEnvParameter4fARB) + #define glProgramEnvParameter4fvARB MANGLE(ProgramEnvParameter4fvARB) + #define glProgramEnvParameters4fvEXT MANGLE(ProgramEnvParameters4fvEXT) + #define glProgramLocalParameter4dARB MANGLE(ProgramLocalParameter4dARB) + #define glProgramLocalParameter4dvARB MANGLE(ProgramLocalParameter4dvARB) + #define glProgramLocalParameter4fARB MANGLE(ProgramLocalParameter4fARB) + #define glProgramLocalParameter4fvARB MANGLE(ProgramLocalParameter4fvARB) + #define glProgramLocalParameters4fvEXT MANGLE(ProgramLocalParameters4fvEXT) + #define glProgramNamedParameter4dNV MANGLE(ProgramNamedParameter4dNV) + #define glProgramNamedParameter4dvNV MANGLE(ProgramNamedParameter4dvNV) + #define glProgramNamedParameter4fNV MANGLE(ProgramNamedParameter4fNV) + #define glProgramNamedParameter4fvNV MANGLE(ProgramNamedParameter4fvNV) + #define glProgramParameter4dNV MANGLE(ProgramParameter4dNV) + #define glProgramParameter4dvNV MANGLE(ProgramParameter4dvNV) + #define glProgramParameter4fNV MANGLE(ProgramParameter4fNV) + #define glProgramParameter4fvNV MANGLE(ProgramParameter4fvNV) + #define glProgramParameters4dvNV MANGLE(ProgramParameters4dvNV) + #define glProgramParameters4fvNV MANGLE(ProgramParameters4fvNV) + #define glProgramStringARB MANGLE(ProgramStringARB) + #define glPushAttrib MANGLE(PushAttrib) + #define glPushClientAttrib MANGLE(PushClientAttrib) + #define glPushMatrix MANGLE(PushMatrix) + #define glPushName MANGLE(PushName) + #define glRasterPos2d MANGLE(RasterPos2d) + #define glRasterPos2dv MANGLE(RasterPos2dv) + #define glRasterPos2f MANGLE(RasterPos2f) + #define glRasterPos2fv MANGLE(RasterPos2fv) + #define glRasterPos2i MANGLE(RasterPos2i) + #define glRasterPos2iv MANGLE(RasterPos2iv) + #define glRasterPos2s MANGLE(RasterPos2s) + #define glRasterPos2sv MANGLE(RasterPos2sv) + #define glRasterPos3d MANGLE(RasterPos3d) + #define glRasterPos3dv MANGLE(RasterPos3dv) + #define glRasterPos3f MANGLE(RasterPos3f) + #define glRasterPos3fv MANGLE(RasterPos3fv) + #define glRasterPos3i MANGLE(RasterPos3i) + #define glRasterPos3iv MANGLE(RasterPos3iv) + #define glRasterPos3s MANGLE(RasterPos3s) + #define glRasterPos3sv MANGLE(RasterPos3sv) + #define glRasterPos4d MANGLE(RasterPos4d) + #define glRasterPos4dv MANGLE(RasterPos4dv) + #define glRasterPos4f MANGLE(RasterPos4f) + #define glRasterPos4fv MANGLE(RasterPos4fv) + #define glRasterPos4i MANGLE(RasterPos4i) + #define glRasterPos4iv MANGLE(RasterPos4iv) + #define glRasterPos4s MANGLE(RasterPos4s) + #define glRasterPos4sv MANGLE(RasterPos4sv) + #define glReadBuffer MANGLE(ReadBuffer) + #define glReadInstrumentsSGIX MANGLE(ReadInstrumentsSGIX) + #define glReadPixels MANGLE(ReadPixels) + #define glRectd MANGLE(Rectd) + #define glRectdv MANGLE(Rectdv) + #define glRectf MANGLE(Rectf) + #define glRectfv MANGLE(Rectfv) + #define glRecti MANGLE(Recti) + #define glRectiv MANGLE(Rectiv) + #define glRects MANGLE(Rects) + #define glRectsv MANGLE(Rectsv) + #define glReferencePlaneSGIX MANGLE(ReferencePlaneSGIX) + #define glRenderbufferStorageEXT MANGLE(RenderbufferStorageEXT) + #define glRenderbufferStorageMultisampleEXT MANGLE(RenderbufferStorageMultisampleEXT) + #define glRenderMode MANGLE(RenderMode) + #define glReplacementCodePointerSUN MANGLE(ReplacementCodePointerSUN) + #define glReplacementCodeubSUN MANGLE(ReplacementCodeubSUN) + #define glReplacementCodeubvSUN MANGLE(ReplacementCodeubvSUN) + #define glReplacementCodeuiColor3fVertex3fSUN MANGLE(ReplacementCodeuiColor3fVertex3fSUN) + #define glReplacementCodeuiColor3fVertex3fvSUN MANGLE(ReplacementCodeuiColor3fVertex3fvSUN) + #define glReplacementCodeuiColor4fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fSUN) + #define glReplacementCodeuiColor4fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fvSUN) + #define glReplacementCodeuiColor4ubVertex3fSUN MANGLE(ReplacementCodeuiColor4ubVertex3fSUN) + #define glReplacementCodeuiColor4ubVertex3fvSUN MANGLE(ReplacementCodeuiColor4ubVertex3fvSUN) + #define glReplacementCodeuiNormal3fVertex3fSUN MANGLE(ReplacementCodeuiNormal3fVertex3fSUN) + #define glReplacementCodeuiNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiNormal3fVertex3fvSUN) + #define glReplacementCodeuiSUN MANGLE(ReplacementCodeuiSUN) + #define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN) + #define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN) + #define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN) + #define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN) + #define glReplacementCodeuiTexCoord2fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fVertex3fSUN) + #define glReplacementCodeuiTexCoord2fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fVertex3fvSUN) + #define glReplacementCodeuiVertex3fSUN MANGLE(ReplacementCodeuiVertex3fSUN) + #define glReplacementCodeuiVertex3fvSUN MANGLE(ReplacementCodeuiVertex3fvSUN) + #define glReplacementCodeuivSUN MANGLE(ReplacementCodeuivSUN) + #define glReplacementCodeusSUN MANGLE(ReplacementCodeusSUN) + #define glReplacementCodeusvSUN MANGLE(ReplacementCodeusvSUN) + #define glRequestResidentProgramsNV MANGLE(RequestResidentProgramsNV) + #define glResetHistogramEXT MANGLE(ResetHistogramEXT) + #define glResetHistogram MANGLE(ResetHistogram) + #define glResetMinmaxEXT MANGLE(ResetMinmaxEXT) + #define glResetMinmax MANGLE(ResetMinmax) + #define glResizeBuffersMESA MANGLE(ResizeBuffersMESA) + #define glRotated MANGLE(Rotated) + #define glRotatef MANGLE(Rotatef) + #define glSampleCoverageARB MANGLE(SampleCoverageARB) + #define glSampleCoverage MANGLE(SampleCoverage) + #define glSampleMapATI MANGLE(SampleMapATI) + #define glSampleMaskEXT MANGLE(SampleMaskEXT) + #define glSampleMaskSGIS MANGLE(SampleMaskSGIS) + #define glSamplePatternEXT MANGLE(SamplePatternEXT) + #define glSamplePatternSGIS MANGLE(SamplePatternSGIS) + #define glScaled MANGLE(Scaled) + #define glScalef MANGLE(Scalef) + #define glScissor MANGLE(Scissor) + #define glSecondaryColor3bEXT MANGLE(SecondaryColor3bEXT) + #define glSecondaryColor3b MANGLE(SecondaryColor3b) + #define glSecondaryColor3bvEXT MANGLE(SecondaryColor3bvEXT) + #define glSecondaryColor3bv MANGLE(SecondaryColor3bv) + #define glSecondaryColor3dEXT MANGLE(SecondaryColor3dEXT) + #define glSecondaryColor3d MANGLE(SecondaryColor3d) + #define glSecondaryColor3dvEXT MANGLE(SecondaryColor3dvEXT) + #define glSecondaryColor3dv MANGLE(SecondaryColor3dv) + #define glSecondaryColor3fEXT MANGLE(SecondaryColor3fEXT) + #define glSecondaryColor3f MANGLE(SecondaryColor3f) + #define glSecondaryColor3fvEXT MANGLE(SecondaryColor3fvEXT) + #define glSecondaryColor3fv MANGLE(SecondaryColor3fv) + #define glSecondaryColor3hNV MANGLE(SecondaryColor3hNV) + #define glSecondaryColor3hvNV MANGLE(SecondaryColor3hvNV) + #define glSecondaryColor3iEXT MANGLE(SecondaryColor3iEXT) + #define glSecondaryColor3i MANGLE(SecondaryColor3i) + #define glSecondaryColor3ivEXT MANGLE(SecondaryColor3ivEXT) + #define glSecondaryColor3iv MANGLE(SecondaryColor3iv) + #define glSecondaryColor3sEXT MANGLE(SecondaryColor3sEXT) + #define glSecondaryColor3s MANGLE(SecondaryColor3s) + #define glSecondaryColor3svEXT MANGLE(SecondaryColor3svEXT) + #define glSecondaryColor3sv MANGLE(SecondaryColor3sv) + #define glSecondaryColor3ubEXT MANGLE(SecondaryColor3ubEXT) + #define glSecondaryColor3ub MANGLE(SecondaryColor3ub) + #define glSecondaryColor3ubvEXT MANGLE(SecondaryColor3ubvEXT) + #define glSecondaryColor3ubv MANGLE(SecondaryColor3ubv) + #define glSecondaryColor3uiEXT MANGLE(SecondaryColor3uiEXT) + #define glSecondaryColor3ui MANGLE(SecondaryColor3ui) + #define glSecondaryColor3uivEXT MANGLE(SecondaryColor3uivEXT) + #define glSecondaryColor3uiv MANGLE(SecondaryColor3uiv) + #define glSecondaryColor3usEXT MANGLE(SecondaryColor3usEXT) + #define glSecondaryColor3us MANGLE(SecondaryColor3us) + #define glSecondaryColor3usvEXT MANGLE(SecondaryColor3usvEXT) + #define glSecondaryColor3usv MANGLE(SecondaryColor3usv) + #define glSecondaryColorPointerEXT MANGLE(SecondaryColorPointerEXT) + #define glSecondaryColorPointerListIBM MANGLE(SecondaryColorPointerListIBM) + #define glSecondaryColorPointer MANGLE(SecondaryColorPointer) + #define glSelectBuffer MANGLE(SelectBuffer) + #define glSeparableFilter2DEXT MANGLE(SeparableFilter2DEXT) + #define glSeparableFilter2D MANGLE(SeparableFilter2D) + #define glSetFenceAPPLE MANGLE(SetFenceAPPLE) + #define glSetFenceNV MANGLE(SetFenceNV) + #define glSetFragmentShaderConstantATI MANGLE(SetFragmentShaderConstantATI) + #define glSetInvariantEXT MANGLE(SetInvariantEXT) + #define glSetLocalConstantEXT MANGLE(SetLocalConstantEXT) + #define glShadeModel MANGLE(ShadeModel) + #define glShaderOp1EXT MANGLE(ShaderOp1EXT) + #define glShaderOp2EXT MANGLE(ShaderOp2EXT) + #define glShaderOp3EXT MANGLE(ShaderOp3EXT) + #define glShaderSourceARB MANGLE(ShaderSourceARB) + #define glShaderSource MANGLE(ShaderSource) + #define glSharpenTexFuncSGIS MANGLE(SharpenTexFuncSGIS) + #define glSpriteParameterfSGIX MANGLE(SpriteParameterfSGIX) + #define glSpriteParameterfvSGIX MANGLE(SpriteParameterfvSGIX) + #define glSpriteParameteriSGIX MANGLE(SpriteParameteriSGIX) + #define glSpriteParameterivSGIX MANGLE(SpriteParameterivSGIX) + #define glStartInstrumentsSGIX MANGLE(StartInstrumentsSGIX) + #define glStencilClearTagEXT MANGLE(StencilClearTagEXT) + #define glStencilFunc MANGLE(StencilFunc) + #define glStencilFuncSeparateATI MANGLE(StencilFuncSeparateATI) + #define glStencilFuncSeparate MANGLE(StencilFuncSeparate) + #define glStencilMask MANGLE(StencilMask) + #define glStencilMaskSeparate MANGLE(StencilMaskSeparate) + #define glStencilOp MANGLE(StencilOp) + #define glStencilOpSeparateATI MANGLE(StencilOpSeparateATI) + #define glStencilOpSeparate MANGLE(StencilOpSeparate) + #define glStopInstrumentsSGIX MANGLE(StopInstrumentsSGIX) + #define glStringMarkerGREMEDY MANGLE(StringMarkerGREMEDY) + #define glSwizzleEXT MANGLE(SwizzleEXT) + #define glTagSampleBufferSGIX MANGLE(TagSampleBufferSGIX) + #define glTangent3bEXT MANGLE(Tangent3bEXT) + #define glTangent3bvEXT MANGLE(Tangent3bvEXT) + #define glTangent3dEXT MANGLE(Tangent3dEXT) + #define glTangent3dvEXT MANGLE(Tangent3dvEXT) + #define glTangent3fEXT MANGLE(Tangent3fEXT) + #define glTangent3fvEXT MANGLE(Tangent3fvEXT) + #define glTangent3iEXT MANGLE(Tangent3iEXT) + #define glTangent3ivEXT MANGLE(Tangent3ivEXT) + #define glTangent3sEXT MANGLE(Tangent3sEXT) + #define glTangent3svEXT MANGLE(Tangent3svEXT) + #define glTangentPointerEXT MANGLE(TangentPointerEXT) + #define glTbufferMask3DFX MANGLE(TbufferMask3DFX) + #define glTestFenceAPPLE MANGLE(TestFenceAPPLE) + #define glTestFenceNV MANGLE(TestFenceNV) + #define glTestObjectAPPLE MANGLE(TestObjectAPPLE) + #define glTexBumpParameterfvATI MANGLE(TexBumpParameterfvATI) + #define glTexBumpParameterivATI MANGLE(TexBumpParameterivATI) + #define glTexCoord1d MANGLE(TexCoord1d) + #define glTexCoord1dv MANGLE(TexCoord1dv) + #define glTexCoord1f MANGLE(TexCoord1f) + #define glTexCoord1fv MANGLE(TexCoord1fv) + #define glTexCoord1hNV MANGLE(TexCoord1hNV) + #define glTexCoord1hvNV MANGLE(TexCoord1hvNV) + #define glTexCoord1i MANGLE(TexCoord1i) + #define glTexCoord1iv MANGLE(TexCoord1iv) + #define glTexCoord1s MANGLE(TexCoord1s) + #define glTexCoord1sv MANGLE(TexCoord1sv) + #define glTexCoord2d MANGLE(TexCoord2d) + #define glTexCoord2dv MANGLE(TexCoord2dv) + #define glTexCoord2fColor3fVertex3fSUN MANGLE(TexCoord2fColor3fVertex3fSUN) + #define glTexCoord2fColor3fVertex3fvSUN MANGLE(TexCoord2fColor3fVertex3fvSUN) + #define glTexCoord2fColor4fNormal3fVertex3fSUN MANGLE(TexCoord2fColor4fNormal3fVertex3fSUN) + #define glTexCoord2fColor4fNormal3fVertex3fvSUN MANGLE(TexCoord2fColor4fNormal3fVertex3fvSUN) + #define glTexCoord2fColor4ubVertex3fSUN MANGLE(TexCoord2fColor4ubVertex3fSUN) + #define glTexCoord2fColor4ubVertex3fvSUN MANGLE(TexCoord2fColor4ubVertex3fvSUN) + #define glTexCoord2f MANGLE(TexCoord2f) + #define glTexCoord2fNormal3fVertex3fSUN MANGLE(TexCoord2fNormal3fVertex3fSUN) + #define glTexCoord2fNormal3fVertex3fvSUN MANGLE(TexCoord2fNormal3fVertex3fvSUN) + #define glTexCoord2fVertex3fSUN MANGLE(TexCoord2fVertex3fSUN) + #define glTexCoord2fVertex3fvSUN MANGLE(TexCoord2fVertex3fvSUN) + #define glTexCoord2fv MANGLE(TexCoord2fv) + #define glTexCoord2hNV MANGLE(TexCoord2hNV) + #define glTexCoord2hvNV MANGLE(TexCoord2hvNV) + #define glTexCoord2i MANGLE(TexCoord2i) + #define glTexCoord2iv MANGLE(TexCoord2iv) + #define glTexCoord2s MANGLE(TexCoord2s) + #define glTexCoord2sv MANGLE(TexCoord2sv) + #define glTexCoord3d MANGLE(TexCoord3d) + #define glTexCoord3dv MANGLE(TexCoord3dv) + #define glTexCoord3f MANGLE(TexCoord3f) + #define glTexCoord3fv MANGLE(TexCoord3fv) + #define glTexCoord3hNV MANGLE(TexCoord3hNV) + #define glTexCoord3hvNV MANGLE(TexCoord3hvNV) + #define glTexCoord3i MANGLE(TexCoord3i) + #define glTexCoord3iv MANGLE(TexCoord3iv) + #define glTexCoord3s MANGLE(TexCoord3s) + #define glTexCoord3sv MANGLE(TexCoord3sv) + #define glTexCoord4d MANGLE(TexCoord4d) + #define glTexCoord4dv MANGLE(TexCoord4dv) + #define glTexCoord4fColor4fNormal3fVertex4fSUN MANGLE(TexCoord4fColor4fNormal3fVertex4fSUN) + #define glTexCoord4fColor4fNormal3fVertex4fvSUN MANGLE(TexCoord4fColor4fNormal3fVertex4fvSUN) + #define glTexCoord4f MANGLE(TexCoord4f) + #define glTexCoord4fVertex4fSUN MANGLE(TexCoord4fVertex4fSUN) + #define glTexCoord4fVertex4fvSUN MANGLE(TexCoord4fVertex4fvSUN) + #define glTexCoord4fv MANGLE(TexCoord4fv) + #define glTexCoord4hNV MANGLE(TexCoord4hNV) + #define glTexCoord4hvNV MANGLE(TexCoord4hvNV) + #define glTexCoord4i MANGLE(TexCoord4i) + #define glTexCoord4iv MANGLE(TexCoord4iv) + #define glTexCoord4s MANGLE(TexCoord4s) + #define glTexCoord4sv MANGLE(TexCoord4sv) + #define glTexCoordPointerEXT MANGLE(TexCoordPointerEXT) + #define glTexCoordPointerListIBM MANGLE(TexCoordPointerListIBM) + #define glTexCoordPointer MANGLE(TexCoordPointer) + #define glTexCoordPointervINTEL MANGLE(TexCoordPointervINTEL) + #define glTexEnvf MANGLE(TexEnvf) + #define glTexEnvfv MANGLE(TexEnvfv) + #define glTexEnvi MANGLE(TexEnvi) + #define glTexEnviv MANGLE(TexEnviv) + #define glTexFilterFuncSGIS MANGLE(TexFilterFuncSGIS) + #define glTexGend MANGLE(TexGend) + #define glTexGendv MANGLE(TexGendv) + #define glTexGenf MANGLE(TexGenf) + #define glTexGenfv MANGLE(TexGenfv) + #define glTexGeni MANGLE(TexGeni) + #define glTexGeniv MANGLE(TexGeniv) + #define glTexImage1D MANGLE(TexImage1D) + #define glTexImage2D MANGLE(TexImage2D) + #define glTexImage3DEXT MANGLE(TexImage3DEXT) + #define glTexImage3D MANGLE(TexImage3D) + #define glTexImage4DSGIS MANGLE(TexImage4DSGIS) + #define glTexParameterf MANGLE(TexParameterf) + #define glTexParameterfv MANGLE(TexParameterfv) + #define glTexParameteri MANGLE(TexParameteri) + #define glTexParameteriv MANGLE(TexParameteriv) + #define glTexSubImage1DEXT MANGLE(TexSubImage1DEXT) + #define glTexSubImage1D MANGLE(TexSubImage1D) + #define glTexSubImage2DEXT MANGLE(TexSubImage2DEXT) + #define glTexSubImage2D MANGLE(TexSubImage2D) + #define glTexSubImage3DEXT MANGLE(TexSubImage3DEXT) + #define glTexSubImage3D MANGLE(TexSubImage3D) + #define glTexSubImage4DSGIS MANGLE(TexSubImage4DSGIS) + #define glTextureColorMaskSGIS MANGLE(TextureColorMaskSGIS) + #define glTextureLightEXT MANGLE(TextureLightEXT) + #define glTextureMaterialEXT MANGLE(TextureMaterialEXT) + #define glTextureNormalEXT MANGLE(TextureNormalEXT) + #define glTrackMatrixNV MANGLE(TrackMatrixNV) + #define glTranslated MANGLE(Translated) + #define glTranslatef MANGLE(Translatef) + #define glUniform1fARB MANGLE(Uniform1fARB) + #define glUniform1f MANGLE(Uniform1f) + #define glUniform1fvARB MANGLE(Uniform1fvARB) + #define glUniform1fv MANGLE(Uniform1fv) + #define glUniform1iARB MANGLE(Uniform1iARB) + #define glUniform1i MANGLE(Uniform1i) + #define glUniform1ivARB MANGLE(Uniform1ivARB) + #define glUniform1iv MANGLE(Uniform1iv) + #define glUniform2fARB MANGLE(Uniform2fARB) + #define glUniform2f MANGLE(Uniform2f) + #define glUniform2fvARB MANGLE(Uniform2fvARB) + #define glUniform2fv MANGLE(Uniform2fv) + #define glUniform2iARB MANGLE(Uniform2iARB) + #define glUniform2i MANGLE(Uniform2i) + #define glUniform2ivARB MANGLE(Uniform2ivARB) + #define glUniform2iv MANGLE(Uniform2iv) + #define glUniform3fARB MANGLE(Uniform3fARB) + #define glUniform3f MANGLE(Uniform3f) + #define glUniform3fvARB MANGLE(Uniform3fvARB) + #define glUniform3fv MANGLE(Uniform3fv) + #define glUniform3iARB MANGLE(Uniform3iARB) + #define glUniform3i MANGLE(Uniform3i) + #define glUniform3ivARB MANGLE(Uniform3ivARB) + #define glUniform3iv MANGLE(Uniform3iv) + #define glUniform4fARB MANGLE(Uniform4fARB) + #define glUniform4f MANGLE(Uniform4f) + #define glUniform4fvARB MANGLE(Uniform4fvARB) + #define glUniform4fv MANGLE(Uniform4fv) + #define glUniform4iARB MANGLE(Uniform4iARB) + #define glUniform4i MANGLE(Uniform4i) + #define glUniform4ivARB MANGLE(Uniform4ivARB) + #define glUniform4iv MANGLE(Uniform4iv) + #define glUniformMatrix2fvARB MANGLE(UniformMatrix2fvARB) + #define glUniformMatrix2fv MANGLE(UniformMatrix2fv) + #define glUniformMatrix2x3fv MANGLE(UniformMatrix2x3fv) + #define glUniformMatrix2x4fv MANGLE(UniformMatrix2x4fv) + #define glUniformMatrix3fvARB MANGLE(UniformMatrix3fvARB) + #define glUniformMatrix3fv MANGLE(UniformMatrix3fv) + #define glUniformMatrix3x2fv MANGLE(UniformMatrix3x2fv) + #define glUniformMatrix3x4fv MANGLE(UniformMatrix3x4fv) + #define glUniformMatrix4fvARB MANGLE(UniformMatrix4fvARB) + #define glUniformMatrix4fv MANGLE(UniformMatrix4fv) + #define glUniformMatrix4x2fv MANGLE(UniformMatrix4x2fv) + #define glUniformMatrix4x3fv MANGLE(UniformMatrix4x3fv) + #define glUnlockArraysEXT MANGLE(UnlockArraysEXT) + #define glUnmapBufferARB MANGLE(UnmapBufferARB) + #define glUnmapBuffer MANGLE(UnmapBuffer) + #define glUnmapObjectBufferATI MANGLE(UnmapObjectBufferATI) + #define glUpdateObjectBufferATI MANGLE(UpdateObjectBufferATI) + #define glUseProgram MANGLE(UseProgram) + #define glUseProgramObjectARB MANGLE(UseProgramObjectARB) + #define glValidateProgramARB MANGLE(ValidateProgramARB) + #define glValidateProgram MANGLE(ValidateProgram) + #define glVariantArrayObjectATI MANGLE(VariantArrayObjectATI) + #define glVariantbvEXT MANGLE(VariantbvEXT) + #define glVariantdvEXT MANGLE(VariantdvEXT) + #define glVariantfvEXT MANGLE(VariantfvEXT) + #define glVariantivEXT MANGLE(VariantivEXT) + #define glVariantPointerEXT MANGLE(VariantPointerEXT) + #define glVariantsvEXT MANGLE(VariantsvEXT) + #define glVariantubvEXT MANGLE(VariantubvEXT) + #define glVariantuivEXT MANGLE(VariantuivEXT) + #define glVariantusvEXT MANGLE(VariantusvEXT) + #define glVertex2d MANGLE(Vertex2d) + #define glVertex2dv MANGLE(Vertex2dv) + #define glVertex2f MANGLE(Vertex2f) + #define glVertex2fv MANGLE(Vertex2fv) + #define glVertex2hNV MANGLE(Vertex2hNV) + #define glVertex2hvNV MANGLE(Vertex2hvNV) + #define glVertex2i MANGLE(Vertex2i) + #define glVertex2iv MANGLE(Vertex2iv) + #define glVertex2s MANGLE(Vertex2s) + #define glVertex2sv MANGLE(Vertex2sv) + #define glVertex3d MANGLE(Vertex3d) + #define glVertex3dv MANGLE(Vertex3dv) + #define glVertex3f MANGLE(Vertex3f) + #define glVertex3fv MANGLE(Vertex3fv) + #define glVertex3hNV MANGLE(Vertex3hNV) + #define glVertex3hvNV MANGLE(Vertex3hvNV) + #define glVertex3i MANGLE(Vertex3i) + #define glVertex3iv MANGLE(Vertex3iv) + #define glVertex3s MANGLE(Vertex3s) + #define glVertex3sv MANGLE(Vertex3sv) + #define glVertex4d MANGLE(Vertex4d) + #define glVertex4dv MANGLE(Vertex4dv) + #define glVertex4f MANGLE(Vertex4f) + #define glVertex4fv MANGLE(Vertex4fv) + #define glVertex4hNV MANGLE(Vertex4hNV) + #define glVertex4hvNV MANGLE(Vertex4hvNV) + #define glVertex4i MANGLE(Vertex4i) + #define glVertex4iv MANGLE(Vertex4iv) + #define glVertex4s MANGLE(Vertex4s) + #define glVertex4sv MANGLE(Vertex4sv) + #define glVertexArrayParameteriAPPLE MANGLE(VertexArrayParameteriAPPLE) + #define glVertexArrayRangeAPPLE MANGLE(VertexArrayRangeAPPLE) + #define glVertexArrayRangeNV MANGLE(VertexArrayRangeNV) + #define glVertexAttrib1dARB MANGLE(VertexAttrib1dARB) + #define glVertexAttrib1d MANGLE(VertexAttrib1d) + #define glVertexAttrib1dNV MANGLE(VertexAttrib1dNV) + #define glVertexAttrib1dvARB MANGLE(VertexAttrib1dvARB) + #define glVertexAttrib1dv MANGLE(VertexAttrib1dv) + #define glVertexAttrib1dvNV MANGLE(VertexAttrib1dvNV) + #define glVertexAttrib1fARB MANGLE(VertexAttrib1fARB) + #define glVertexAttrib1f MANGLE(VertexAttrib1f) + #define glVertexAttrib1fNV MANGLE(VertexAttrib1fNV) + #define glVertexAttrib1fvARB MANGLE(VertexAttrib1fvARB) + #define glVertexAttrib1fv MANGLE(VertexAttrib1fv) + #define glVertexAttrib1fvNV MANGLE(VertexAttrib1fvNV) + #define glVertexAttrib1hNV MANGLE(VertexAttrib1hNV) + #define glVertexAttrib1hvNV MANGLE(VertexAttrib1hvNV) + #define glVertexAttrib1sARB MANGLE(VertexAttrib1sARB) + #define glVertexAttrib1s MANGLE(VertexAttrib1s) + #define glVertexAttrib1sNV MANGLE(VertexAttrib1sNV) + #define glVertexAttrib1svARB MANGLE(VertexAttrib1svARB) + #define glVertexAttrib1sv MANGLE(VertexAttrib1sv) + #define glVertexAttrib1svNV MANGLE(VertexAttrib1svNV) + #define glVertexAttrib2dARB MANGLE(VertexAttrib2dARB) + #define glVertexAttrib2d MANGLE(VertexAttrib2d) + #define glVertexAttrib2dNV MANGLE(VertexAttrib2dNV) + #define glVertexAttrib2dvARB MANGLE(VertexAttrib2dvARB) + #define glVertexAttrib2dv MANGLE(VertexAttrib2dv) + #define glVertexAttrib2dvNV MANGLE(VertexAttrib2dvNV) + #define glVertexAttrib2fARB MANGLE(VertexAttrib2fARB) + #define glVertexAttrib2f MANGLE(VertexAttrib2f) + #define glVertexAttrib2fNV MANGLE(VertexAttrib2fNV) + #define glVertexAttrib2fvARB MANGLE(VertexAttrib2fvARB) + #define glVertexAttrib2fv MANGLE(VertexAttrib2fv) + #define glVertexAttrib2fvNV MANGLE(VertexAttrib2fvNV) + #define glVertexAttrib2hNV MANGLE(VertexAttrib2hNV) + #define glVertexAttrib2hvNV MANGLE(VertexAttrib2hvNV) + #define glVertexAttrib2sARB MANGLE(VertexAttrib2sARB) + #define glVertexAttrib2s MANGLE(VertexAttrib2s) + #define glVertexAttrib2sNV MANGLE(VertexAttrib2sNV) + #define glVertexAttrib2svARB MANGLE(VertexAttrib2svARB) + #define glVertexAttrib2sv MANGLE(VertexAttrib2sv) + #define glVertexAttrib2svNV MANGLE(VertexAttrib2svNV) + #define glVertexAttrib3dARB MANGLE(VertexAttrib3dARB) + #define glVertexAttrib3d MANGLE(VertexAttrib3d) + #define glVertexAttrib3dNV MANGLE(VertexAttrib3dNV) + #define glVertexAttrib3dvARB MANGLE(VertexAttrib3dvARB) + #define glVertexAttrib3dv MANGLE(VertexAttrib3dv) + #define glVertexAttrib3dvNV MANGLE(VertexAttrib3dvNV) + #define glVertexAttrib3fARB MANGLE(VertexAttrib3fARB) + #define glVertexAttrib3f MANGLE(VertexAttrib3f) + #define glVertexAttrib3fNV MANGLE(VertexAttrib3fNV) + #define glVertexAttrib3fvARB MANGLE(VertexAttrib3fvARB) + #define glVertexAttrib3fv MANGLE(VertexAttrib3fv) + #define glVertexAttrib3fvNV MANGLE(VertexAttrib3fvNV) + #define glVertexAttrib3hNV MANGLE(VertexAttrib3hNV) + #define glVertexAttrib3hvNV MANGLE(VertexAttrib3hvNV) + #define glVertexAttrib3sARB MANGLE(VertexAttrib3sARB) + #define glVertexAttrib3s MANGLE(VertexAttrib3s) + #define glVertexAttrib3sNV MANGLE(VertexAttrib3sNV) + #define glVertexAttrib3svARB MANGLE(VertexAttrib3svARB) + #define glVertexAttrib3sv MANGLE(VertexAttrib3sv) + #define glVertexAttrib3svNV MANGLE(VertexAttrib3svNV) + #define glVertexAttrib4bvARB MANGLE(VertexAttrib4bvARB) + #define glVertexAttrib4bv MANGLE(VertexAttrib4bv) + #define glVertexAttrib4dARB MANGLE(VertexAttrib4dARB) + #define glVertexAttrib4d MANGLE(VertexAttrib4d) + #define glVertexAttrib4dNV MANGLE(VertexAttrib4dNV) + #define glVertexAttrib4dvARB MANGLE(VertexAttrib4dvARB) + #define glVertexAttrib4dv MANGLE(VertexAttrib4dv) + #define glVertexAttrib4dvNV MANGLE(VertexAttrib4dvNV) + #define glVertexAttrib4fARB MANGLE(VertexAttrib4fARB) + #define glVertexAttrib4f MANGLE(VertexAttrib4f) + #define glVertexAttrib4fNV MANGLE(VertexAttrib4fNV) + #define glVertexAttrib4fvARB MANGLE(VertexAttrib4fvARB) + #define glVertexAttrib4fv MANGLE(VertexAttrib4fv) + #define glVertexAttrib4fvNV MANGLE(VertexAttrib4fvNV) + #define glVertexAttrib4hNV MANGLE(VertexAttrib4hNV) + #define glVertexAttrib4hvNV MANGLE(VertexAttrib4hvNV) + #define glVertexAttrib4ivARB MANGLE(VertexAttrib4ivARB) + #define glVertexAttrib4iv MANGLE(VertexAttrib4iv) + #define glVertexAttrib4NbvARB MANGLE(VertexAttrib4NbvARB) + #define glVertexAttrib4Nbv MANGLE(VertexAttrib4Nbv) + #define glVertexAttrib4NivARB MANGLE(VertexAttrib4NivARB) + #define glVertexAttrib4Niv MANGLE(VertexAttrib4Niv) + #define glVertexAttrib4NsvARB MANGLE(VertexAttrib4NsvARB) + #define glVertexAttrib4Nsv MANGLE(VertexAttrib4Nsv) + #define glVertexAttrib4NubARB MANGLE(VertexAttrib4NubARB) + #define glVertexAttrib4Nub MANGLE(VertexAttrib4Nub) + #define glVertexAttrib4NubvARB MANGLE(VertexAttrib4NubvARB) + #define glVertexAttrib4Nubv MANGLE(VertexAttrib4Nubv) + #define glVertexAttrib4NuivARB MANGLE(VertexAttrib4NuivARB) + #define glVertexAttrib4Nuiv MANGLE(VertexAttrib4Nuiv) + #define glVertexAttrib4NusvARB MANGLE(VertexAttrib4NusvARB) + #define glVertexAttrib4Nusv MANGLE(VertexAttrib4Nusv) + #define glVertexAttrib4sARB MANGLE(VertexAttrib4sARB) + #define glVertexAttrib4s MANGLE(VertexAttrib4s) + #define glVertexAttrib4sNV MANGLE(VertexAttrib4sNV) + #define glVertexAttrib4svARB MANGLE(VertexAttrib4svARB) + #define glVertexAttrib4sv MANGLE(VertexAttrib4sv) + #define glVertexAttrib4svNV MANGLE(VertexAttrib4svNV) + #define glVertexAttrib4ubNV MANGLE(VertexAttrib4ubNV) + #define glVertexAttrib4ubvARB MANGLE(VertexAttrib4ubvARB) + #define glVertexAttrib4ubv MANGLE(VertexAttrib4ubv) + #define glVertexAttrib4ubvNV MANGLE(VertexAttrib4ubvNV) + #define glVertexAttrib4uivARB MANGLE(VertexAttrib4uivARB) + #define glVertexAttrib4uiv MANGLE(VertexAttrib4uiv) + #define glVertexAttrib4usvARB MANGLE(VertexAttrib4usvARB) + #define glVertexAttrib4usv MANGLE(VertexAttrib4usv) + #define glVertexAttribArrayObjectATI MANGLE(VertexAttribArrayObjectATI) + #define glVertexAttribPointerARB MANGLE(VertexAttribPointerARB) + #define glVertexAttribPointer MANGLE(VertexAttribPointer) + #define glVertexAttribPointerNV MANGLE(VertexAttribPointerNV) + #define glVertexAttribs1dvNV MANGLE(VertexAttribs1dvNV) + #define glVertexAttribs1fvNV MANGLE(VertexAttribs1fvNV) + #define glVertexAttribs1hvNV MANGLE(VertexAttribs1hvNV) + #define glVertexAttribs1svNV MANGLE(VertexAttribs1svNV) + #define glVertexAttribs2dvNV MANGLE(VertexAttribs2dvNV) + #define glVertexAttribs2fvNV MANGLE(VertexAttribs2fvNV) + #define glVertexAttribs2hvNV MANGLE(VertexAttribs2hvNV) + #define glVertexAttribs2svNV MANGLE(VertexAttribs2svNV) + #define glVertexAttribs3dvNV MANGLE(VertexAttribs3dvNV) + #define glVertexAttribs3fvNV MANGLE(VertexAttribs3fvNV) + #define glVertexAttribs3hvNV MANGLE(VertexAttribs3hvNV) + #define glVertexAttribs3svNV MANGLE(VertexAttribs3svNV) + #define glVertexAttribs4dvNV MANGLE(VertexAttribs4dvNV) + #define glVertexAttribs4fvNV MANGLE(VertexAttribs4fvNV) + #define glVertexAttribs4hvNV MANGLE(VertexAttribs4hvNV) + #define glVertexAttribs4svNV MANGLE(VertexAttribs4svNV) + #define glVertexAttribs4ubvNV MANGLE(VertexAttribs4ubvNV) + #define glVertexBlendARB MANGLE(VertexBlendARB) + #define glVertexBlendEnvfATI MANGLE(VertexBlendEnvfATI) + #define glVertexBlendEnviATI MANGLE(VertexBlendEnviATI) + #define glVertexPointerEXT MANGLE(VertexPointerEXT) + #define glVertexPointerListIBM MANGLE(VertexPointerListIBM) + #define glVertexPointer MANGLE(VertexPointer) + #define glVertexPointervINTEL MANGLE(VertexPointervINTEL) + #define glVertexStream1dATI MANGLE(VertexStream1dATI) + #define glVertexStream1dvATI MANGLE(VertexStream1dvATI) + #define glVertexStream1fATI MANGLE(VertexStream1fATI) + #define glVertexStream1fvATI MANGLE(VertexStream1fvATI) + #define glVertexStream1iATI MANGLE(VertexStream1iATI) + #define glVertexStream1ivATI MANGLE(VertexStream1ivATI) + #define glVertexStream1sATI MANGLE(VertexStream1sATI) + #define glVertexStream1svATI MANGLE(VertexStream1svATI) + #define glVertexStream2dATI MANGLE(VertexStream2dATI) + #define glVertexStream2dvATI MANGLE(VertexStream2dvATI) + #define glVertexStream2fATI MANGLE(VertexStream2fATI) + #define glVertexStream2fvATI MANGLE(VertexStream2fvATI) + #define glVertexStream2iATI MANGLE(VertexStream2iATI) + #define glVertexStream2ivATI MANGLE(VertexStream2ivATI) + #define glVertexStream2sATI MANGLE(VertexStream2sATI) + #define glVertexStream2svATI MANGLE(VertexStream2svATI) + #define glVertexStream3dATI MANGLE(VertexStream3dATI) + #define glVertexStream3dvATI MANGLE(VertexStream3dvATI) + #define glVertexStream3fATI MANGLE(VertexStream3fATI) + #define glVertexStream3fvATI MANGLE(VertexStream3fvATI) + #define glVertexStream3iATI MANGLE(VertexStream3iATI) + #define glVertexStream3ivATI MANGLE(VertexStream3ivATI) + #define glVertexStream3sATI MANGLE(VertexStream3sATI) + #define glVertexStream3svATI MANGLE(VertexStream3svATI) + #define glVertexStream4dATI MANGLE(VertexStream4dATI) + #define glVertexStream4dvATI MANGLE(VertexStream4dvATI) + #define glVertexStream4fATI MANGLE(VertexStream4fATI) + #define glVertexStream4fvATI MANGLE(VertexStream4fvATI) + #define glVertexStream4iATI MANGLE(VertexStream4iATI) + #define glVertexStream4ivATI MANGLE(VertexStream4ivATI) + #define glVertexStream4sATI MANGLE(VertexStream4sATI) + #define glVertexStream4svATI MANGLE(VertexStream4svATI) + #define glVertexWeightfEXT MANGLE(VertexWeightfEXT) + #define glVertexWeightfvEXT MANGLE(VertexWeightfvEXT) + #define glVertexWeighthNV MANGLE(VertexWeighthNV) + #define glVertexWeighthvNV MANGLE(VertexWeighthvNV) + #define glVertexWeightPointerEXT MANGLE(VertexWeightPointerEXT) + #define glViewport MANGLE(Viewport) + #define glWeightbvARB MANGLE(WeightbvARB) + #define glWeightdvARB MANGLE(WeightdvARB) + #define glWeightfvARB MANGLE(WeightfvARB) + #define glWeightivARB MANGLE(WeightivARB) + #define glWeightPointerARB MANGLE(WeightPointerARB) + #define glWeightsvARB MANGLE(WeightsvARB) + #define glWeightubvARB MANGLE(WeightubvARB) + #define glWeightuivARB MANGLE(WeightuivARB) + #define glWeightusvARB MANGLE(WeightusvARB) + #define glWindowPos2dARB MANGLE(WindowPos2dARB) + #define glWindowPos2d MANGLE(WindowPos2d) + #define glWindowPos2dMESA MANGLE(WindowPos2dMESA) + #define glWindowPos2dvARB MANGLE(WindowPos2dvARB) + #define glWindowPos2dv MANGLE(WindowPos2dv) + #define glWindowPos2dvMESA MANGLE(WindowPos2dvMESA) + #define glWindowPos2fARB MANGLE(WindowPos2fARB) + #define glWindowPos2f MANGLE(WindowPos2f) + #define glWindowPos2fMESA MANGLE(WindowPos2fMESA) + #define glWindowPos2fvARB MANGLE(WindowPos2fvARB) + #define glWindowPos2fv MANGLE(WindowPos2fv) + #define glWindowPos2fvMESA MANGLE(WindowPos2fvMESA) + #define glWindowPos2iARB MANGLE(WindowPos2iARB) + #define glWindowPos2i MANGLE(WindowPos2i) + #define glWindowPos2iMESA MANGLE(WindowPos2iMESA) + #define glWindowPos2ivARB MANGLE(WindowPos2ivARB) + #define glWindowPos2iv MANGLE(WindowPos2iv) + #define glWindowPos2ivMESA MANGLE(WindowPos2ivMESA) + #define glWindowPos2sARB MANGLE(WindowPos2sARB) + #define glWindowPos2s MANGLE(WindowPos2s) + #define glWindowPos2sMESA MANGLE(WindowPos2sMESA) + #define glWindowPos2svARB MANGLE(WindowPos2svARB) + #define glWindowPos2sv MANGLE(WindowPos2sv) + #define glWindowPos2svMESA MANGLE(WindowPos2svMESA) + #define glWindowPos3dARB MANGLE(WindowPos3dARB) + #define glWindowPos3d MANGLE(WindowPos3d) + #define glWindowPos3dMESA MANGLE(WindowPos3dMESA) + #define glWindowPos3dvARB MANGLE(WindowPos3dvARB) + #define glWindowPos3dv MANGLE(WindowPos3dv) + #define glWindowPos3dvMESA MANGLE(WindowPos3dvMESA) + #define glWindowPos3fARB MANGLE(WindowPos3fARB) + #define glWindowPos3f MANGLE(WindowPos3f) + #define glWindowPos3fMESA MANGLE(WindowPos3fMESA) + #define glWindowPos3fvARB MANGLE(WindowPos3fvARB) + #define glWindowPos3fv MANGLE(WindowPos3fv) + #define glWindowPos3fvMESA MANGLE(WindowPos3fvMESA) + #define glWindowPos3iARB MANGLE(WindowPos3iARB) + #define glWindowPos3i MANGLE(WindowPos3i) + #define glWindowPos3iMESA MANGLE(WindowPos3iMESA) + #define glWindowPos3ivARB MANGLE(WindowPos3ivARB) + #define glWindowPos3iv MANGLE(WindowPos3iv) + #define glWindowPos3ivMESA MANGLE(WindowPos3ivMESA) + #define glWindowPos3sARB MANGLE(WindowPos3sARB) + #define glWindowPos3s MANGLE(WindowPos3s) + #define glWindowPos3sMESA MANGLE(WindowPos3sMESA) + #define glWindowPos3svARB MANGLE(WindowPos3svARB) + #define glWindowPos3sv MANGLE(WindowPos3sv) + #define glWindowPos3svMESA MANGLE(WindowPos3svMESA) + #define glWindowPos4dMESA MANGLE(WindowPos4dMESA) + #define glWindowPos4dvMESA MANGLE(WindowPos4dvMESA) + #define glWindowPos4fMESA MANGLE(WindowPos4fMESA) + #define glWindowPos4fvMESA MANGLE(WindowPos4fvMESA) + #define glWindowPos4iMESA MANGLE(WindowPos4iMESA) + #define glWindowPos4ivMESA MANGLE(WindowPos4ivMESA) + #define glWindowPos4sMESA MANGLE(WindowPos4sMESA) + #define glWindowPos4svMESA MANGLE(WindowPos4svMESA) + #define glWriteMaskEXT MANGLE(WriteMaskEXT) #endif /* MANGLE */ #else /* GET_GLFUNC */ /*************************************************************** - * - * Used recursively for prototyping and function assignment - * - * Credits: taken from sdl_glfuncs.h - * - ***************************************************************/ + * + * Used recursively for prototyping and function assignment + * + * Credits: taken from sdl_glfuncs.h + * + ***************************************************************/ OSD_GL_UNUSED(void,glAccum,(GLenum,GLfloat)) OSD_GL_UNUSED(void,glAlphaFunc,(GLenum,GLclampf)) diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h index f709aa40c6a..dd44627b488 100644 --- a/src/osd/sdl/osdsdl.h +++ b/src/osd/sdl/osdsdl.h @@ -12,120 +12,120 @@ // Process events in worker thread #if defined(SDLMAME_WIN32) || (SDLMAME_SDL2) -#define SDLMAME_EVENTS_IN_WORKER_THREAD (1) +#define SDLMAME_EVENTS_IN_WORKER_THREAD (1) #else -#define SDLMAME_EVENTS_IN_WORKER_THREAD (0) +#define SDLMAME_EVENTS_IN_WORKER_THREAD (0) #endif #if defined(SDLMAME_WIN32) #if (SDLMAME_SDL2) - #define SDLMAME_INIT_IN_WORKER_THREAD (0) //FIXME: breaks mt + #define SDLMAME_INIT_IN_WORKER_THREAD (0) //FIXME: breaks mt #define SDL13_COMBINE_RESIZE (1) #else - #define SDLMAME_INIT_IN_WORKER_THREAD (1) + #define SDLMAME_INIT_IN_WORKER_THREAD (1) #define SDL13_COMBINE_RESIZE (0) #endif #else #define SDL13_COMBINE_RESIZE (0) - #define SDLMAME_INIT_IN_WORKER_THREAD (0) + #define SDLMAME_INIT_IN_WORKER_THREAD (0) #endif #if defined(NO_DEBUGGER) -#define SDLMAME_HAS_DEBUGGER (0) +#define SDLMAME_HAS_DEBUGGER (0) #else -#define SDLMAME_HAS_DEBUGGER (1) +#define SDLMAME_HAS_DEBUGGER (1) #endif //============================================================ // Defines //============================================================ -#define SDLOPTION_INIPATH "inipath" -#define SDLOPTION_AUDIO_LATENCY "audio_latency" -#define SDLOPTION_SCREEN "screen" -#define SDLOPTION_ASPECT "aspect" -#define SDLOPTION_RESOLUTION "resolution" -#define SDLOPTION_VIEW "view" -#define SDLOPTION_SDLVIDEOFPS "sdlvideofps" -#define SDLOPTION_KEEPASPECT "keepaspect" -#define SDLOPTION_WINDOW "window" -#define SDLOPTION_NUMSCREENS "numscreens" -#define SDLOPTION_UNEVENSTRETCH "unevenstretch" -#define SDLOPTION_USEALLHEADS "useallheads" -#define SDLOPTION_MAXIMIZE "maximize" -#define SDLOPTION_VIDEO "video" -#define SDLOPTION_SWITCHRES "switchres" -#define SDLOPTION_FILTER "filter" -#define SDLOPTION_CENTERH "centerh" -#define SDLOPTION_CENTERV "centerv" -#define SDLOPTION_PRESCALE "prescale" - -#define SDLOPTION_SCALEMODE "scalemode" - -#define SDLOPTION_MULTITHREADING "multithreading" -#define SDLOPTION_BENCH "bench" -#define SDLOPTION_NUMPROCESSORS "numprocessors" - -#define SDLOPTION_WAITVSYNC "waitvsync" -#define SDLOPTION_SYNCREFRESH "syncrefresh" -#define SDLOPTION_KEYMAP "keymap" -#define SDLOPTION_KEYMAP_FILE "keymap_file" -#define SDLOPTION_UIMODEKEY "uimodekey" -#define SDLOPTION_OSLOG "oslog" -#define SDLOPTION_WATCHDOG "watchdog" - -#define SDLOPTION_SIXAXIS "sixaxis" -#define SDLOPTION_JOYINDEX "joy_idx" -#define SDLOPTION_KEYBINDEX "keyb_idx" -#define SDLOPTION_MOUSEINDEX "mouse_index" +#define SDLOPTION_INIPATH "inipath" +#define SDLOPTION_AUDIO_LATENCY "audio_latency" +#define SDLOPTION_SCREEN "screen" +#define SDLOPTION_ASPECT "aspect" +#define SDLOPTION_RESOLUTION "resolution" +#define SDLOPTION_VIEW "view" +#define SDLOPTION_SDLVIDEOFPS "sdlvideofps" +#define SDLOPTION_KEEPASPECT "keepaspect" +#define SDLOPTION_WINDOW "window" +#define SDLOPTION_NUMSCREENS "numscreens" +#define SDLOPTION_UNEVENSTRETCH "unevenstretch" +#define SDLOPTION_USEALLHEADS "useallheads" +#define SDLOPTION_MAXIMIZE "maximize" +#define SDLOPTION_VIDEO "video" +#define SDLOPTION_SWITCHRES "switchres" +#define SDLOPTION_FILTER "filter" +#define SDLOPTION_CENTERH "centerh" +#define SDLOPTION_CENTERV "centerv" +#define SDLOPTION_PRESCALE "prescale" + +#define SDLOPTION_SCALEMODE "scalemode" + +#define SDLOPTION_MULTITHREADING "multithreading" +#define SDLOPTION_BENCH "bench" +#define SDLOPTION_NUMPROCESSORS "numprocessors" + +#define SDLOPTION_WAITVSYNC "waitvsync" +#define SDLOPTION_SYNCREFRESH "syncrefresh" +#define SDLOPTION_KEYMAP "keymap" +#define SDLOPTION_KEYMAP_FILE "keymap_file" +#define SDLOPTION_UIMODEKEY "uimodekey" +#define SDLOPTION_OSLOG "oslog" +#define SDLOPTION_WATCHDOG "watchdog" + +#define SDLOPTION_SIXAXIS "sixaxis" +#define SDLOPTION_JOYINDEX "joy_idx" +#define SDLOPTION_KEYBINDEX "keyb_idx" +#define SDLOPTION_MOUSEINDEX "mouse_index" #if (USE_XINPUT) -#define SDLOPTION_LIGHTGUNINDEX "lightgun_index" +#define SDLOPTION_LIGHTGUNINDEX "lightgun_index" #endif -#define SDLOPTION_SHADER_MAME "glsl_shader_mame" -#define SDLOPTION_SHADER_SCREEN "glsl_shader_screen" -#define SDLOPTION_GLSL_FILTER "gl_glsl_filter" -#define SDLOPTION_GL_GLSL "gl_glsl" -#define SDLOPTION_GL_PBO "gl_pbo" -#define SDLOPTION_GL_VBO "gl_vbo" -#define SDLOPTION_GL_NOTEXTURERECT "gl_notexturerect" -#define SDLOPTION_GL_FORCEPOW2TEXTURE "gl_forcepow2texture" -#define SDLOPTION_GL_GLSL_VID_ATTR "gl_glsl_vid_attr" +#define SDLOPTION_SHADER_MAME "glsl_shader_mame" +#define SDLOPTION_SHADER_SCREEN "glsl_shader_screen" +#define SDLOPTION_GLSL_FILTER "gl_glsl_filter" +#define SDLOPTION_GL_GLSL "gl_glsl" +#define SDLOPTION_GL_PBO "gl_pbo" +#define SDLOPTION_GL_VBO "gl_vbo" +#define SDLOPTION_GL_NOTEXTURERECT "gl_notexturerect" +#define SDLOPTION_GL_FORCEPOW2TEXTURE "gl_forcepow2texture" +#define SDLOPTION_GL_GLSL_VID_ATTR "gl_glsl_vid_attr" -#define SDLOPTION_AUDIODRIVER "audiodriver" -#define SDLOPTION_VIDEODRIVER "videodriver" -#define SDLOPTION_RENDERDRIVER "renderdriver" -#define SDLOPTION_GL_LIB "gl_lib" +#define SDLOPTION_AUDIODRIVER "audiodriver" +#define SDLOPTION_VIDEODRIVER "videodriver" +#define SDLOPTION_RENDERDRIVER "renderdriver" +#define SDLOPTION_GL_LIB "gl_lib" -#define SDLOPTVAL_NONE "none" -#define SDLOPTVAL_AUTO "auto" +#define SDLOPTVAL_NONE "none" +#define SDLOPTVAL_AUTO "auto" -#define SDLOPTVAL_OPENGL "opengl" -#define SDLOPTVAL_OPENGL16 "opengl16" -#define SDLOPTVAL_SOFT "soft" -#define SDLOPTVAL_SDL13 "sdl13" +#define SDLOPTVAL_OPENGL "opengl" +#define SDLOPTVAL_OPENGL16 "opengl16" +#define SDLOPTVAL_SOFT "soft" +#define SDLOPTVAL_SDL13 "sdl13" -#define SDLMAME_LED(x) "led" #x +#define SDLMAME_LED(x) "led" #x // read by sdlmame -#define SDLENV_DESKTOPDIM "SDLMAME_DESKTOPDIM" -#define SDLENV_VMWARE "SDLMAME_VMWARE" +#define SDLENV_DESKTOPDIM "SDLMAME_DESKTOPDIM" +#define SDLENV_VMWARE "SDLMAME_VMWARE" // set by sdlmame -#define SDLENV_VISUALID "SDL_VIDEO_X11_VISUALID" -#define SDLENV_VIDEODRIVER "SDL_VIDEODRIVER" -#define SDLENV_AUDIODRIVER "SDL_AUDIODRIVER" -#define SDLENV_RENDERDRIVER "SDL_VIDEO_RENDERER" +#define SDLENV_VISUALID "SDL_VIDEO_X11_VISUALID" +#define SDLENV_VIDEODRIVER "SDL_VIDEODRIVER" +#define SDLENV_AUDIODRIVER "SDL_AUDIODRIVER" +#define SDLENV_RENDERDRIVER "SDL_VIDEO_RENDERER" -#define SDLMAME_SOUND_LOG "sound.log" +#define SDLMAME_SOUND_LOG "sound.log" #ifdef SDLMAME_MACOSX /* Vas Crabb: Default GL-lib for MACOSX */ -#define SDLOPTVAL_GLLIB "/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib" +#define SDLOPTVAL_GLLIB "/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib" #else -#define SDLOPTVAL_GLLIB SDLOPTVAL_AUTO +#define SDLOPTVAL_GLLIB SDLOPTVAL_AUTO #endif diff --git a/src/osd/sdl/output.c b/src/osd/sdl/output.c index 61f46f1069e..8ce46cbabfb 100644 --- a/src/osd/sdl/output.c +++ b/src/osd/sdl/output.c @@ -25,7 +25,7 @@ // CONSTANTS //============================================================ -#define SDLMAME_OUTPUT "/tmp/sdlmame_out" +#define SDLMAME_OUTPUT "/tmp/sdlmame_out" /* * Using long/int should be sufficient on all diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 02faa903b51..fa163bd5be5 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -261,7 +261,7 @@ NO_USE_XINPUT = 1 ifdef BIGENDIAN ifdef SYMBOLS CCOMFLAGS += -mlong-branch -endif # SYMBOLS +endif # SYMBOLS ifeq ($(PTR64),1) CCOMFLAGS += -arch ppc64 LDFLAGS += -arch ppc64 @@ -270,7 +270,7 @@ CCOMFLAGS += -arch ppc LDFLAGS += -arch ppc endif $(OBJ)/emu/cpu/tms57002/tms57002.o : CCOMFLAGS += -O0 -else # BIGENDIAN +else # BIGENDIAN ifeq ($(PTR64),1) CCOMFLAGS += -arch x86_64 LDFLAGS += -arch x86_64 @@ -278,7 +278,7 @@ else CCOMFLAGS += -m32 -arch i386 LDFLAGS += -m32 -arch i386 endif -endif # BIGENDIAN +endif # BIGENDIAN endif @@ -369,13 +369,13 @@ OBJDIRS += $(SDLOBJ) #------------------------------------------------- OSDCOREOBJS = \ - $(SDLOBJ)/strconv.o \ - $(SDLOBJ)/sdldir.o \ - $(SDLOBJ)/sdlfile.o \ - $(SDLOBJ)/sdlptty_$(BASE_TARGETOS).o \ - $(SDLOBJ)/sdlsocket.o \ - $(SDLOBJ)/sdlmisc_$(BASE_TARGETOS).o \ - $(SDLOBJ)/sdlos_$(SDLOS_TARGETOS).o \ + $(SDLOBJ)/strconv.o \ + $(SDLOBJ)/sdldir.o \ + $(SDLOBJ)/sdlfile.o \ + $(SDLOBJ)/sdlptty_$(BASE_TARGETOS).o \ + $(SDLOBJ)/sdlsocket.o \ + $(SDLOBJ)/sdlmisc_$(BASE_TARGETOS).o \ + $(SDLOBJ)/sdlos_$(SDLOS_TARGETOS).o \ $(SDLOBJ)/sdlsync_$(SYNC_IMPLEMENTATION).o \ $(SDLOBJ)/sdlwork.o @@ -444,7 +444,7 @@ endif ifeq ($(findstring 4.7.2-2ubuntu1,$(TEST_GCC)),4.7.2-2ubuntu1) GCC46TST = $(shell which g++-4.6 2>/dev/null) ifeq '$(GCC46TST)' '' - $(error Ubuntu 12.10 detected. Please install the gcc-4.6 and g++-4.6 packages) + $(error Ubuntu 12.10 detected. Please install the gcc-4.6 and g++-4.6 packages) endif CC = @gcc-4.6 LD = @g++-4.6 @@ -604,7 +604,7 @@ endif LIBS += -lSDL.dll LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi -endif # Win32 +endif # Win32 #------------------------------------------------- # OS/2 diff --git a/src/osd/sdl/sdldir.c b/src/osd/sdl/sdldir.c index 988cde22bab..183e82557b4 100644 --- a/src/osd/sdl/sdldir.c +++ b/src/osd/sdl/sdldir.c @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <fcntl.h> #ifndef __USE_BSD -#define __USE_BSD // to get DT_xxx on Linux +#define __USE_BSD // to get DT_xxx on Linux #endif #undef _POSIX_C_SOURCE // to get DT_xxx on OS X #include <dirent.h> @@ -213,4 +213,3 @@ void osd_closedir(osd_directory *dir) osd_free(dir->path); osd_free(dir); } - diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c index 652b14e023c..cb46900cf08 100644 --- a/src/osd/sdl/sdlfile.c +++ b/src/osd/sdl/sdlfile.c @@ -52,7 +52,7 @@ extern const char *sdlfile_ptty_identifier; #define INVPATHSEPCH '\\' #endif -#define NO_ERROR (0) +#define NO_ERROR (0) //============================================================ // Prototypes @@ -276,41 +276,41 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 count, U { ssize_t result; - switch (file->type) - { - case SDLFILE_FILE: + switch (file->type) + { + case SDLFILE_FILE: #if defined(SDLMAME_DARWIN) || defined(SDLMAME_BSD) - result = pread(file->handle, buffer, count, offset); - if (result < 0) + result = pread(file->handle, buffer, count, offset); + if (result < 0) #elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2) - lseek(file->handle, (UINT32)offset&0xffffffff, SEEK_SET); - result = read(file->handle, buffer, count); - if (result < 0) + lseek(file->handle, (UINT32)offset&0xffffffff, SEEK_SET); + result = read(file->handle, buffer, count); + if (result < 0) #elif defined(SDLMAME_UNIX) - result = pread64(file->handle, buffer, count, offset); - if (result < 0) + result = pread64(file->handle, buffer, count, offset); + if (result < 0) #else #error Unknown SDL SUBARCH! #endif - return error_to_file_error(errno); + return error_to_file_error(errno); - if (actual != NULL) - *actual = result; + if (actual != NULL) + *actual = result; - return FILERR_NONE; - break; + return FILERR_NONE; + break; - case SDLFILE_SOCKET: - return sdl_read_socket(file, buffer, offset, count, actual); - break; + case SDLFILE_SOCKET: + return sdl_read_socket(file, buffer, offset, count, actual); + break; - case SDLFILE_PTTY: - return sdl_read_ptty(file, buffer, offset, count, actual); - break; + case SDLFILE_PTTY: + return sdl_read_ptty(file, buffer, offset, count, actual); + break; - default: - return FILERR_FAILURE; - } + default: + return FILERR_FAILURE; + } } @@ -322,40 +322,40 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 c { UINT32 result; - switch (file->type) - { - case SDLFILE_FILE: + switch (file->type) + { + case SDLFILE_FILE: #if defined(SDLMAME_DARWIN) || defined(SDLMAME_BSD) - result = pwrite(file->handle, buffer, count, offset); - if (!result) + result = pwrite(file->handle, buffer, count, offset); + if (!result) #elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2) - lseek(file->handle, (UINT32)offset&0xffffffff, SEEK_SET); - result = write(file->handle, buffer, count); - if (!result) + lseek(file->handle, (UINT32)offset&0xffffffff, SEEK_SET); + result = write(file->handle, buffer, count); + if (!result) #elif defined(SDLMAME_UNIX) - result = pwrite64(file->handle, buffer, count, offset); - if (!result) + result = pwrite64(file->handle, buffer, count, offset); + if (!result) #else #error Unknown SDL SUBARCH! #endif return error_to_file_error(errno); - if (actual != NULL) - *actual = result; - return FILERR_NONE; - break; + if (actual != NULL) + *actual = result; + return FILERR_NONE; + break; - case SDLFILE_SOCKET: - return sdl_write_socket(file, buffer, offset, count, actual); - break; + case SDLFILE_SOCKET: + return sdl_write_socket(file, buffer, offset, count, actual); + break; - case SDLFILE_PTTY: - return sdl_write_ptty(file, buffer, offset, count, actual); - break; + case SDLFILE_PTTY: + return sdl_write_ptty(file, buffer, offset, count, actual); + break; - default: - return FILERR_FAILURE; - } + default: + return FILERR_FAILURE; + } } @@ -366,25 +366,25 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 c file_error osd_close(osd_file *file) { // close the file handle and free the file structure - switch (file->type) - { - case SDLFILE_FILE: - close(file->handle); - osd_free(file); - return FILERR_NONE; - break; - - case SDLFILE_SOCKET: - return sdl_close_socket(file); - break; - - case SDLFILE_PTTY: - return sdl_close_ptty(file); - break; - - default: - return FILERR_FAILURE; - } + switch (file->type) + { + case SDLFILE_FILE: + close(file->handle); + osd_free(file); + return FILERR_NONE; + break; + + case SDLFILE_SOCKET: + return sdl_close_socket(file); + break; + + case SDLFILE_PTTY: + return sdl_close_ptty(file); + break; + + default: + return FILERR_FAILURE; + } } //============================================================ @@ -441,7 +441,7 @@ static UINT32 create_path_recursive(char *path) int osd_get_physical_drive_geometry(const char *filename, UINT32 *cylinders, UINT32 *heads, UINT32 *sectors, UINT32 *bps) { - return FALSE; // no, no way, huh-uh, forget it + return FALSE; // no, no way, huh-uh, forget it } //============================================================ diff --git a/src/osd/sdl/sdlfile.h b/src/osd/sdl/sdlfile.h index 16a8eec66ad..0787a3719f2 100644 --- a/src/osd/sdl/sdlfile.h +++ b/src/osd/sdl/sdlfile.h @@ -28,9 +28,9 @@ enum struct osd_file { - int handle; - int type; - char filename[1]; + int handle; + int type; + char filename[1]; }; //============================================================ diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c index a42089a4217..b0a53d451f8 100644 --- a/src/osd/sdl/sdlmain.c +++ b/src/osd/sdl/sdlmain.c @@ -95,7 +95,7 @@ const options_entry sdl_options::s_option_entries[] = // performance options { NULL, NULL, OPTION_HEADER, "PERFORMANCE OPTIONS" }, { SDLOPTION_MULTITHREADING ";mt", "0", OPTION_BOOLEAN, "enable multithreading; this enables rendering and blitting on a separate thread" }, - { SDLOPTION_NUMPROCESSORS ";np", "auto", OPTION_STRING, "number of processors; this overrides the number the system reports" }, + { SDLOPTION_NUMPROCESSORS ";np", "auto", OPTION_STRING, "number of processors; this overrides the number the system reports" }, { SDLOPTION_SDLVIDEOFPS, "0", OPTION_BOOLEAN, "show sdl video performance" }, { SDLOPTION_BENCH, "0", OPTION_INTEGER, "benchmark for the given number of emulated seconds; implies -video none -nosound -nothrottle" }, // video options @@ -132,7 +132,7 @@ const options_entry sdl_options::s_option_entries[] = { SDLOPTION_GL_VBO, "1", OPTION_BOOLEAN, "enable OpenGL VBO, if available (default on)" }, { SDLOPTION_GL_PBO, "1", OPTION_BOOLEAN, "enable OpenGL PBO, if available (default on)" }, { SDLOPTION_GL_GLSL, "0", OPTION_BOOLEAN, "enable OpenGL GLSL, if available (default off)" }, - { SDLOPTION_GLSL_FILTER, "1", OPTION_STRING, "enable OpenGL GLSL filtering instead of FF filtering 0-plain, 1-bilinear (default)" }, + { SDLOPTION_GLSL_FILTER, "1", OPTION_STRING, "enable OpenGL GLSL filtering instead of FF filtering 0-plain, 1-bilinear (default)" }, { SDLOPTION_SHADER_MAME "0", SDLOPTVAL_NONE, OPTION_STRING, "custom OpenGL GLSL shader set mame bitmap 0" }, { SDLOPTION_SHADER_MAME "1", SDLOPTVAL_NONE, OPTION_STRING, "custom OpenGL GLSL shader set mame bitmap 1" }, { SDLOPTION_SHADER_MAME "2", SDLOPTVAL_NONE, OPTION_STRING, "custom OpenGL GLSL shader set mame bitmap 2" }, @@ -153,7 +153,7 @@ const options_entry sdl_options::s_option_entries[] = { SDLOPTION_SHADER_SCREEN "7", SDLOPTVAL_NONE, OPTION_STRING, "custom OpenGL GLSL shader screen bitmap 7" }, { SDLOPTION_SHADER_SCREEN "8", SDLOPTVAL_NONE, OPTION_STRING, "custom OpenGL GLSL shader screen bitmap 8" }, { SDLOPTION_SHADER_SCREEN "9", SDLOPTVAL_NONE, OPTION_STRING, "custom OpenGL GLSL shader screen bitmap 9" }, - { SDLOPTION_GL_GLSL_VID_ATTR, "1", OPTION_BOOLEAN, "enable OpenGL GLSL handling of brightness and contrast. Better RGB game performance for free. (default)" }, + { SDLOPTION_GL_GLSL_VID_ATTR, "1", OPTION_BOOLEAN, "enable OpenGL GLSL handling of brightness and contrast. Better RGB game performance for free. (default)" }, #endif // per-window options @@ -187,7 +187,7 @@ const options_entry sdl_options::s_option_entries[] = { NULL, NULL, OPTION_HEADER, "FULL SCREEN OPTIONS" }, { SDLOPTION_SWITCHRES, "0", OPTION_BOOLEAN, "enable resolution switching" }, #ifdef SDLMAME_X11 - { SDLOPTION_USEALLHEADS, "0", OPTION_BOOLEAN, "split full screen image across monitors" }, + { SDLOPTION_USEALLHEADS, "0", OPTION_BOOLEAN, "split full screen image across monitors" }, #endif // sound options @@ -195,17 +195,17 @@ const options_entry sdl_options::s_option_entries[] = { SDLOPTION_AUDIO_LATENCY, "2", OPTION_INTEGER, "set audio latency (increase to reduce glitches, decrease for responsiveness)" }, // keyboard mapping - { NULL, NULL, OPTION_HEADER, "SDL KEYBOARD MAPPING" }, + { NULL, NULL, OPTION_HEADER, "SDL KEYBOARD MAPPING" }, { SDLOPTION_KEYMAP, "0", OPTION_BOOLEAN, "enable keymap" }, { SDLOPTION_KEYMAP_FILE, "keymap.dat", OPTION_STRING, "keymap filename" }, #ifdef SDLMAME_MACOSX - { SDLOPTION_UIMODEKEY, "DEL", OPTION_STRING, "Key to toggle keyboard mode" }, + { SDLOPTION_UIMODEKEY, "DEL", OPTION_STRING, "Key to toggle keyboard mode" }, #else - { SDLOPTION_UIMODEKEY, "SCRLOCK", OPTION_STRING, "Key to toggle keyboard mode" }, -#endif // SDLMAME_MACOSX + { SDLOPTION_UIMODEKEY, "SCRLOCK", OPTION_STRING, "Key to toggle keyboard mode" }, +#endif // SDLMAME_MACOSX // joystick mapping - { NULL, NULL, OPTION_HEADER, "SDL JOYSTICK MAPPING" }, + { NULL, NULL, OPTION_HEADER, "SDL JOYSTICK MAPPING" }, { SDLOPTION_JOYINDEX "1", SDLOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #1" }, { SDLOPTION_JOYINDEX "2", SDLOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #2" }, { SDLOPTION_JOYINDEX "3", SDLOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #3" }, @@ -214,7 +214,7 @@ const options_entry sdl_options::s_option_entries[] = { SDLOPTION_JOYINDEX "6", SDLOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #6" }, { SDLOPTION_JOYINDEX "7", SDLOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #7" }, { SDLOPTION_JOYINDEX "8", SDLOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #8" }, - { SDLOPTION_SIXAXIS, "0", OPTION_BOOLEAN, "Use special handling for PS3 Sixaxis controllers" }, + { SDLOPTION_SIXAXIS, "0", OPTION_BOOLEAN, "Use special handling for PS3 Sixaxis controllers" }, #if (USE_XINPUT) // lightgun mapping @@ -230,7 +230,7 @@ const options_entry sdl_options::s_option_entries[] = #endif #if (SDLMAME_SDL2) - { NULL, NULL, OPTION_HEADER, "SDL MOUSE MAPPING" }, + { NULL, NULL, OPTION_HEADER, "SDL MOUSE MAPPING" }, { SDLOPTION_MOUSEINDEX "1", SDLOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #1" }, { SDLOPTION_MOUSEINDEX "2", SDLOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #2" }, { SDLOPTION_MOUSEINDEX "3", SDLOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #3" }, @@ -240,7 +240,7 @@ const options_entry sdl_options::s_option_entries[] = { SDLOPTION_MOUSEINDEX "7", SDLOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #7" }, { SDLOPTION_MOUSEINDEX "8", SDLOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #8" }, - { NULL, NULL, OPTION_HEADER, "SDL KEYBOARD MAPPING" }, + { NULL, NULL, OPTION_HEADER, "SDL KEYBOARD MAPPING" }, { SDLOPTION_KEYBINDEX "1", SDLOPTVAL_AUTO, OPTION_STRING, "name of keyboard mapped to keyboard #1" }, { SDLOPTION_KEYBINDEX "2", SDLOPTVAL_AUTO, OPTION_STRING, "name of keyboard mapped to keyboard #2" }, { SDLOPTION_KEYBINDEX "3", SDLOPTVAL_AUTO, OPTION_STRING, "name of keyboard mapped to keyboard #3" }, @@ -251,7 +251,7 @@ const options_entry sdl_options::s_option_entries[] = { SDLOPTION_KEYBINDEX "8", SDLOPTVAL_AUTO, OPTION_STRING, "name of keyboard mapped to keyboard #8" }, #endif // SDL low level driver options - { NULL, NULL, OPTION_HEADER, "SDL LOWLEVEL DRIVER OPTIONS" }, + { NULL, NULL, OPTION_HEADER, "SDL LOWLEVEL DRIVER OPTIONS" }, { SDLOPTION_VIDEODRIVER ";vd", SDLOPTVAL_AUTO, OPTION_STRING, "sdl video driver to use ('x11', 'directfb', ... or 'auto' for SDL default" }, #if (SDLMAME_SDL2) { SDLOPTION_RENDERDRIVER ";rd", SDLOPTVAL_AUTO, OPTION_STRING, "sdl render driver to use ('software', 'opengl', 'directfb' ... or 'auto' for SDL default" }, @@ -272,13 +272,13 @@ const options_entry sdl_options::s_option_entries[] = #ifdef SDLMAME_OS2 void MorphToPM() { - PPIB pib; - PTIB tib; + PPIB pib; + PTIB tib; - DosGetInfoBlocks(&tib, &pib); + DosGetInfoBlocks(&tib, &pib); - // Change flag from VIO to PM: - if (pib->pib_ultype==2) pib->pib_ultype = 3; + // Change flag from VIO to PM: + if (pib->pib_ultype==2) pib->pib_ultype = 3; } #endif @@ -316,7 +316,7 @@ int main(int argc, char *argv[]) { int res = 0; -#if !(SDLMAME_SDL2) +#if !(SDLMAME_SDL2) /* Load SDL dynamic link library */ if ( SDL_Init(SDL_INIT_NOPARACHUTE) < 0 ) { fprintf(stderr, "WinMain() error: %s", SDL_GetError()); @@ -362,7 +362,7 @@ int main(int argc, char *argv[]) } #endif - osd_init_midi(); // this is a blues riff in B, watch me for the changes and try to keep up... + osd_init_midi(); // this is a blues riff in B, watch me for the changes and try to keep up... { sdl_osd_interface osd; @@ -612,8 +612,8 @@ void sdl_osd_interface::init(running_machine &machine) #endif /* Set the SDL environment variable for drivers wanting to load the - * lib at startup. - */ + * lib at startup. + */ #if USE_OPENGL /* FIXME: move lib loading code from drawogl.c here */ @@ -628,7 +628,7 @@ void sdl_osd_interface::init(running_machine &machine) /* get number of processors */ stemp = options.numprocessors(); - osd_num_processors = 0; + osd_num_processors = 0; if (strcmp(stemp, "auto") != 0) { @@ -742,37 +742,37 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height) if( font_name != NULL ) { - font_descriptor = CTFontDescriptorCreateWithNameAndSize( font_name, POINT_SIZE ); + font_descriptor = CTFontDescriptorCreateWithNameAndSize( font_name, POINT_SIZE ); - if( font_descriptor != NULL ) - { - ct_font = CTFontCreateWithFontDescriptor( font_descriptor, POINT_SIZE, &affine_transform ); + if( font_descriptor != NULL ) + { + ct_font = CTFontCreateWithFontDescriptor( font_descriptor, POINT_SIZE, &affine_transform ); - CFRelease( font_descriptor ); - } - } + CFRelease( font_descriptor ); + } + } - CFRelease( font_name ); + CFRelease( font_name ); - if (!ct_font) + if (!ct_font) { printf("WARNING: Couldn't find/open font %s, using MAME default\n", name.cstr()); return NULL; } - CFStringRef real_name = CTFontCopyPostScriptName( ct_font ); - char real_name_c_string[255]; - CFStringGetCString ( real_name, real_name_c_string, 255, kCFStringEncodingUTF8 ); - mame_printf_verbose("Matching font: %s\n", real_name_c_string); - CFRelease( real_name ); + CFStringRef real_name = CTFontCopyPostScriptName( ct_font ); + char real_name_c_string[255]; + CFStringGetCString ( real_name, real_name_c_string, 255, kCFStringEncodingUTF8 ); + mame_printf_verbose("Matching font: %s\n", real_name_c_string); + CFRelease( real_name ); - CGFloat line_height = 0.0; - line_height += CTFontGetAscent(ct_font); - line_height += CTFontGetDescent(ct_font); - line_height += CTFontGetLeading(ct_font); - height = ceilf(line_height * EXTRA_HEIGHT); + CGFloat line_height = 0.0; + line_height += CTFontGetAscent(ct_font); + line_height += CTFontGetDescent(ct_font); + line_height += CTFontGetLeading(ct_font); + height = ceilf(line_height * EXTRA_HEIGHT); - return (osd_font)ct_font; + return (osd_font)ct_font; } //------------------------------------------------- @@ -782,12 +782,12 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height) void sdl_osd_interface::font_close(osd_font font) { - CTFontRef ct_font = (CTFontRef)font; + CTFontRef ct_font = (CTFontRef)font; - if( ct_font != NULL ) - { - CFRelease( ct_font ); - } + if( ct_font != NULL ) + { + CFRelease( ct_font ); + } } //------------------------------------------------- @@ -800,69 +800,69 @@ void sdl_osd_interface::font_close(osd_font font) bool sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs) { - UniChar uni_char; - CGGlyph glyph; - CTFontRef ct_font = (CTFontRef)font; - const CFIndex count = 1; - CGRect bounding_rect, success_rect; - CGContextRef context_ref; - - if( chnum == ' ' ) - { - uni_char = 'n'; - CTFontGetGlyphsForCharacters( ct_font, &uni_char, &glyph, count ); - success_rect = CTFontGetBoundingRectsForGlyphs( ct_font, kCTFontDefaultOrientation, &glyph, &bounding_rect, count ); - uni_char = chnum; - CTFontGetGlyphsForCharacters( ct_font, &uni_char, &glyph, count ); - } - else - { - uni_char = chnum; - CTFontGetGlyphsForCharacters( ct_font, &uni_char, &glyph, count ); - success_rect = CTFontGetBoundingRectsForGlyphs( ct_font, kCTFontDefaultOrientation, &glyph, &bounding_rect, count ); - } - - if( CGRectEqualToRect( success_rect, CGRectNull ) == false ) - { - size_t bitmap_width; - size_t bitmap_height; - - bitmap_width = ceilf(bounding_rect.size.width * EXTRA_WIDTH); - bitmap_width = bitmap_width == 0 ? 1 : bitmap_width; - - bitmap_height = ceilf( (CTFontGetAscent(ct_font) + CTFontGetDescent(ct_font) + CTFontGetLeading(ct_font)) * EXTRA_HEIGHT); - - xoffs = yoffs = 0; - width = bitmap_width; - - size_t bits_per_component; - CGColorSpaceRef color_space; - CGBitmapInfo bitmap_info = kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst; - - color_space = CGColorSpaceCreateDeviceRGB(); - bits_per_component = 8; - - bitmap.allocate(bitmap_width, bitmap_height); - - context_ref = CGBitmapContextCreate( bitmap.raw_pixptr(0), bitmap_width, bitmap_height, bits_per_component, bitmap.rowpixels()*4, color_space, bitmap_info ); - - if( context_ref != NULL ) - { - CGFontRef font_ref; - font_ref = CTFontCopyGraphicsFont( ct_font, NULL ); - CGContextSetTextPosition(context_ref, -bounding_rect.origin.x*EXTRA_WIDTH, CTFontGetDescent(ct_font)+CTFontGetLeading(ct_font) ); - CGContextSetRGBFillColor(context_ref, 1.0, 1.0, 1.0, 1.0); - CGContextSetFont( context_ref, font_ref ); - CGContextSetFontSize( context_ref, POINT_SIZE ); - CGContextShowGlyphs( context_ref, &glyph, count ); - CGFontRelease( font_ref ); - CGContextRelease( context_ref ); - } - - CGColorSpaceRelease( color_space ); - } - - return bitmap.valid(); + UniChar uni_char; + CGGlyph glyph; + CTFontRef ct_font = (CTFontRef)font; + const CFIndex count = 1; + CGRect bounding_rect, success_rect; + CGContextRef context_ref; + + if( chnum == ' ' ) + { + uni_char = 'n'; + CTFontGetGlyphsForCharacters( ct_font, &uni_char, &glyph, count ); + success_rect = CTFontGetBoundingRectsForGlyphs( ct_font, kCTFontDefaultOrientation, &glyph, &bounding_rect, count ); + uni_char = chnum; + CTFontGetGlyphsForCharacters( ct_font, &uni_char, &glyph, count ); + } + else + { + uni_char = chnum; + CTFontGetGlyphsForCharacters( ct_font, &uni_char, &glyph, count ); + success_rect = CTFontGetBoundingRectsForGlyphs( ct_font, kCTFontDefaultOrientation, &glyph, &bounding_rect, count ); + } + + if( CGRectEqualToRect( success_rect, CGRectNull ) == false ) + { + size_t bitmap_width; + size_t bitmap_height; + + bitmap_width = ceilf(bounding_rect.size.width * EXTRA_WIDTH); + bitmap_width = bitmap_width == 0 ? 1 : bitmap_width; + + bitmap_height = ceilf( (CTFontGetAscent(ct_font) + CTFontGetDescent(ct_font) + CTFontGetLeading(ct_font)) * EXTRA_HEIGHT); + + xoffs = yoffs = 0; + width = bitmap_width; + + size_t bits_per_component; + CGColorSpaceRef color_space; + CGBitmapInfo bitmap_info = kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst; + + color_space = CGColorSpaceCreateDeviceRGB(); + bits_per_component = 8; + + bitmap.allocate(bitmap_width, bitmap_height); + + context_ref = CGBitmapContextCreate( bitmap.raw_pixptr(0), bitmap_width, bitmap_height, bits_per_component, bitmap.rowpixels()*4, color_space, bitmap_info ); + + if( context_ref != NULL ) + { + CGFontRef font_ref; + font_ref = CTFontCopyGraphicsFont( ct_font, NULL ); + CGContextSetTextPosition(context_ref, -bounding_rect.origin.x*EXTRA_WIDTH, CTFontGetDescent(ct_font)+CTFontGetLeading(ct_font) ); + CGContextSetRGBFillColor(context_ref, 1.0, 1.0, 1.0, 1.0); + CGContextSetFont( context_ref, font_ref ); + CGContextSetFontSize( context_ref, POINT_SIZE ); + CGContextShowGlyphs( context_ref, &glyph, count ); + CGFontRelease( font_ref ); + CGContextRelease( context_ref ); + } + + CGColorSpaceRelease( color_space ); + } + + return bitmap.valid(); } #else // UNIX but not OSX @@ -882,18 +882,18 @@ static TTF_Font * TTF_OpenFont_Magic(astring name, int fsize) static bool BDF_Check_Magic(astring name) { - emu_file file(OPEN_FLAG_READ); - if (file.open(name) == FILERR_NONE) - { + emu_file file(OPEN_FLAG_READ); + if (file.open(name) == FILERR_NONE) + { unsigned char buffer[9]; unsigned char magic[9] = { 'S', 'T', 'A', 'R', 'T', 'F', 'O', 'N', 'T' }; file.read(buffer, 9); - file.close(); + file.close(); if (!memcmp(buffer, magic, 9)) return true; - } + } - return false; + return false; } #ifndef SDLMAME_HAIKU @@ -1058,10 +1058,10 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height) if (!font) { - if (!BDF_Check_Magic(name)) - { - printf("WARNING: font %s, is not TrueType or BDF, using MAME default\n", name.cstr()); - } + if (!BDF_Check_Magic(name)) + { + printf("WARNING: font %s, is not TrueType or BDF, using MAME default\n", name.cstr()); + } return NULL; } @@ -1150,8 +1150,8 @@ bool sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum, bitma return bitmap.valid(); } -#endif // not OSX -#else // not UNIX +#endif // not OSX +#else // not UNIX //------------------------------------------------- // font_open - attempt to "open" a handle to the // font with the given name diff --git a/src/osd/sdl/sdlmisc_os2.c b/src/osd/sdl/sdlmisc_os2.c index f1b862e4c2a..f26b511624d 100644 --- a/src/osd/sdl/sdlmisc_os2.c +++ b/src/osd/sdl/sdlmisc_os2.c @@ -57,4 +57,3 @@ void osd_break_into_debugger(const char *message) { printf("Ignoring MAME exception: %s\n", message); } - diff --git a/src/osd/sdl/sdlmisc_win32.c b/src/osd/sdl/sdlmisc_win32.c index e71da9e4f9e..2086633a061 100644 --- a/src/osd/sdl/sdlmisc_win32.c +++ b/src/osd/sdl/sdlmisc_win32.c @@ -54,4 +54,3 @@ void osd_break_into_debugger(const char *message) DebugBreak(); } } - diff --git a/src/osd/sdl/sdlos.h b/src/osd/sdl/sdlos.h index 673935d6bab..a1f60b9565c 100644 --- a/src/osd/sdl/sdlos.h +++ b/src/osd/sdl/sdlos.h @@ -55,4 +55,4 @@ char *osd_getenv(const char *name); int osd_setenv(const char *name, const char *value, int overwrite); -#endif /* __SDLOS__ */ +#endif /* __SDLOS__ */ diff --git a/src/osd/sdl/sdlos_macosx.c b/src/osd/sdl/sdlos_macosx.c index f06b8bcbf03..4f6683f5858 100644 --- a/src/osd/sdl/sdlos_macosx.c +++ b/src/osd/sdl/sdlos_macosx.c @@ -33,9 +33,9 @@ static osd_ticks_t mach_cycle_counter(void); // STATIC VARIABLES //============================================================ -static osd_ticks_t (*cycle_counter)(void) = init_cycle_counter; -static osd_ticks_t (*ticks_counter)(void) = init_cycle_counter; -static osd_ticks_t ticks_per_second; +static osd_ticks_t (*cycle_counter)(void) = init_cycle_counter; +static osd_ticks_t (*ticks_counter)(void) = init_cycle_counter; +static osd_ticks_t ticks_per_second; //============================================================ // init_cycle_counter @@ -107,7 +107,7 @@ osd_ticks_t osd_ticks_per_second(void) { if (ticks_per_second == 0) { - return 1; // this isn't correct, but it prevents the crash + return 1; // this isn't correct, but it prevents the crash } return ticks_per_second; } @@ -238,7 +238,7 @@ char *osd_get_clipboard_text(void) CFIndex flavor_index; ItemCount item_count; UInt32 item_index; - Boolean success = false; + Boolean success = false; err = PasteboardCreate(kPasteboardClipboard, &pasteboard_ref); diff --git a/src/osd/sdl/sdlos_os2.c b/src/osd/sdl/sdlos_os2.c index d21fe73545f..02fd9852538 100644 --- a/src/osd/sdl/sdlos_os2.c +++ b/src/osd/sdl/sdlos_os2.c @@ -38,9 +38,9 @@ static osd_ticks_t performance_cycle_counter(void); //============================================================ // global cycle_counter function and divider -static osd_ticks_t (*cycle_counter)(void) = init_cycle_counter; -static osd_ticks_t (*ticks_counter)(void) = init_cycle_counter; -static osd_ticks_t ticks_per_second; +static osd_ticks_t (*cycle_counter)(void) = init_cycle_counter; +static osd_ticks_t (*ticks_counter)(void) = init_cycle_counter; +static osd_ticks_t ticks_per_second; //============================================================ // init_cycle_counter @@ -117,10 +117,10 @@ static osd_ticks_t init_cycle_counter(void) static osd_ticks_t performance_cycle_counter(void) { - QWORD qwTime; + QWORD qwTime; - DosTmrQueryTime( &qwTime ); - return (osd_ticks_t)qwTime.ulLo; + DosTmrQueryTime( &qwTime ); + return (osd_ticks_t)qwTime.ulLo; } //============================================================ @@ -141,7 +141,7 @@ osd_ticks_t osd_ticks_per_second(void) { if (ticks_per_second == 0) { - return 1; // this isn't correct, but it prevents the crash + return 1; // this isn't correct, but it prevents the crash } return ticks_per_second; } @@ -177,11 +177,11 @@ void osd_sleep(osd_ticks_t duration) int osd_get_num_processors(void) { - ULONG numprocs = 1; + ULONG numprocs = 1; - DosQuerySysInfo(QSV_NUMPROCESSORS, QSV_NUMPROCESSORS, &numprocs, sizeof(numprocs)); + DosQuerySysInfo(QSV_NUMPROCESSORS, QSV_NUMPROCESSORS, &numprocs, sizeof(numprocs)); - return numprocs; + return numprocs; } //============================================================ diff --git a/src/osd/sdl/sdlos_unix.c b/src/osd/sdl/sdlos_unix.c index dd5e4bee50c..ff612f3e420 100644 --- a/src/osd/sdl/sdlos_unix.c +++ b/src/osd/sdl/sdlos_unix.c @@ -220,8 +220,8 @@ char *osd_get_clipboard_text(void) /* get property & check its type */ if ( XGetWindowProperty( display, our_win, types[i], 0, 65536, False, types[i], - &data_type, &data_format, &nitems, &bytes_remaining, &prop ) - != Success ) + &data_type, &data_format, &nitems, &bytes_remaining, &prop ) + != Success ) continue; if ( ! prop ) continue; diff --git a/src/osd/sdl/sdlos_win32.c b/src/osd/sdl/sdlos_win32.c index ea0c6c3a823..69f9a52b52a 100644 --- a/src/osd/sdl/sdlos_win32.c +++ b/src/osd/sdl/sdlos_win32.c @@ -32,9 +32,9 @@ static osd_ticks_t performance_cycle_counter(void); //============================================================ // global cycle_counter function and divider -static osd_ticks_t (*cycle_counter)(void) = init_cycle_counter; -static osd_ticks_t (*ticks_counter)(void) = init_cycle_counter; -static osd_ticks_t ticks_per_second; +static osd_ticks_t (*cycle_counter)(void) = init_cycle_counter; +static osd_ticks_t (*ticks_counter)(void) = init_cycle_counter; +static osd_ticks_t ticks_per_second; //============================================================ // init_cycle_counter @@ -127,7 +127,7 @@ osd_ticks_t osd_ticks_per_second(void) { if (ticks_per_second == 0) { - return 1; // this isn't correct, but it prevents the crash + return 1; // this isn't correct, but it prevents the crash } return ticks_per_second; } @@ -280,8 +280,8 @@ int osd_setenv(const char *name, const char *value, int overwrite) result = putenv(buf); /* will be referenced by environment - * Therefore it is not freed here - */ + * Therefore it is not freed here + */ return result; } diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h index e43b0a44b03..c578d4f8d84 100644 --- a/src/osd/sdl/sdlprefix.h +++ b/src/osd/sdl/sdlprefix.h @@ -77,12 +77,11 @@ void *__cdecl _alloca(size_t); #endif #ifdef __GNUC__ -#define alloca __builtin_alloca +#define alloca __builtin_alloca #endif //============================================================ // misc. //============================================================ -#define PATH_SEPARATOR "/" - +#define PATH_SEPARATOR "/" diff --git a/src/osd/sdl/sdlsync.h b/src/osd/sdl/sdlsync.h index d7b273313ec..8f27f649816 100644 --- a/src/osd/sdl/sdlsync.h +++ b/src/osd/sdl/sdlsync.h @@ -201,4 +201,4 @@ void osd_scalable_lock_release(osd_scalable_lock *lock, INT32 myslot); void osd_scalable_lock_free(osd_scalable_lock *lock); -#endif /* __SDLSYNC__ */ +#endif /* __SDLSYNC__ */ diff --git a/src/osd/sdl/sdlsync_ntc.c b/src/osd/sdl/sdlsync_ntc.c index 4afd5cacdf6..1c7158198ed 100644 --- a/src/osd/sdl/sdlsync_ntc.c +++ b/src/osd/sdl/sdlsync_ntc.c @@ -10,7 +10,7 @@ //============================================================ #ifndef _GNU_SOURCE -#define _GNU_SOURCE // for PTHREAD_MUTEX_RECURSIVE; needs to be here before other glibc headers are included +#define _GNU_SOURCE // for PTHREAD_MUTEX_RECURSIVE; needs to be here before other glibc headers are included #endif #include "sdlinc.h" @@ -41,24 +41,24 @@ #include <sys/time.h> struct osd_lock { - volatile pthread_t holder; - INT32 count; + volatile pthread_t holder; + INT32 count; #ifdef PTR64 - INT8 padding[52]; // Fill a 64-byte cache line + INT8 padding[52]; // Fill a 64-byte cache line #else - INT8 padding[56]; // A bit more padding + INT8 padding[56]; // A bit more padding #endif }; struct osd_event { - pthread_mutex_t mutex; - pthread_cond_t cond; - volatile INT32 autoreset; - volatile INT32 signalled; + pthread_mutex_t mutex; + pthread_cond_t cond; + volatile INT32 autoreset; + volatile INT32 signalled; #ifdef PTR64 - INT8 padding[40]; // Fill a 64-byte cache line + INT8 padding[40]; // Fill a 64-byte cache line #else - INT8 padding[48]; // A bit more padding + INT8 padding[48]; // A bit more padding #endif }; @@ -68,17 +68,17 @@ struct osd_event { //============================================================ struct osd_thread { - pthread_t thread; + pthread_t thread; }; struct osd_scalable_lock { struct { - volatile INT32 haslock; // do we have the lock? - INT32 filler[64/4-1]; // assumes a 64-byte cache line - } slot[WORK_MAX_THREADS]; // one slot per thread - volatile INT32 nextindex; // index of next slot to use + volatile INT32 haslock; // do we have the lock? + INT32 filler[64/4-1]; // assumes a 64-byte cache line + } slot[WORK_MAX_THREADS]; // one slot per thread + volatile INT32 nextindex; // index of next slot to use }; @@ -271,9 +271,9 @@ void osd_lock_acquire(osd_lock *lock) #endif #if 0 /* If you mean to use locks as a blocking mechanism for extended - * periods of time, you should do something like this. However, - * it kills the performance of gaelco3d. - */ + * periods of time, you should do something like this. However, + * it kills the performance of gaelco3d. + */ if (spin == 0) { struct timespec sleep = { 0, 100000 }, remaining; @@ -466,7 +466,7 @@ int osd_event_wait(osd_event *event, osd_ticks_t timeout) osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam) { osd_thread *thread; - pthread_attr_t attr; + pthread_attr_t attr; thread = (osd_thread *)calloc(1, sizeof(osd_thread)); pthread_attr_init(&attr); @@ -487,8 +487,8 @@ osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam) int osd_thread_adjust_priority(osd_thread *thread, int adjust) { - struct sched_param sched; - int policy; + struct sched_param sched; + int policy; if ( pthread_getschedparam( thread->thread, &policy, &sched ) == 0 ) { diff --git a/src/osd/sdl/sdlsync_os2.c b/src/osd/sdl/sdlsync_os2.c index de23ea104b2..32d07cc59fe 100644 --- a/src/osd/sdl/sdlsync_os2.c +++ b/src/osd/sdl/sdlsync_os2.c @@ -10,7 +10,7 @@ //============================================================ #ifndef _GNU_SOURCE -#define _GNU_SOURCE // for PTHREAD_MUTEX_RECURSIVE; needs to be here before other glibc headers are included +#define _GNU_SOURCE // for PTHREAD_MUTEX_RECURSIVE; needs to be here before other glibc headers are included #endif #include "sdlinc.h" @@ -34,20 +34,20 @@ #define pthread_self _gettid struct osd_lock { - volatile pthread_t holder; - INT32 count; + volatile pthread_t holder; + INT32 count; #ifdef PTR64 - INT8 padding[52]; // Fill a 64-byte cache line + INT8 padding[52]; // Fill a 64-byte cache line #else - INT8 padding[56]; // A bit more padding + INT8 padding[56]; // A bit more padding #endif }; struct osd_event { - HMTX hmtx; - HEV hev; - volatile INT32 autoreset; - INT8 padding[52]; // Fill a 64-byte cache line + HMTX hmtx; + HEV hev; + volatile INT32 autoreset; + INT8 padding[52]; // Fill a 64-byte cache line }; //============================================================ @@ -55,7 +55,7 @@ struct osd_event { //============================================================ struct osd_thread { - pthread_t thread; + pthread_t thread; osd_thread_callback callback; void *param; }; @@ -64,10 +64,10 @@ struct osd_scalable_lock { struct { - volatile INT32 haslock; // do we have the lock? - INT32 filler[64/4-1]; // assumes a 64-byte cache line - } slot[WORK_MAX_THREADS]; // one slot per thread - volatile INT32 nextindex; // index of next slot to use + volatile INT32 haslock; // do we have the lock? + INT32 filler[64/4-1]; // assumes a 64-byte cache line + } slot[WORK_MAX_THREADS]; // one slot per thread + volatile INT32 nextindex; // index of next slot to use }; @@ -260,9 +260,9 @@ void osd_lock_acquire(osd_lock *lock) #endif #if 0 /* If you mean to use locks as a blocking mechanism for extended - * periods of time, you should do something like this. However, - * it kills the performance of gaelco3d. - */ + * periods of time, you should do something like this. However, + * it kills the performance of gaelco3d. + */ if (spin == 0) { struct timespec sleep = { 0, 100000 }, remaining; @@ -332,15 +332,15 @@ void osd_lock_free(osd_lock *lock) osd_event *osd_event_alloc(int manualreset, int initialstate) { - osd_event *ev; + osd_event *ev; - ev = (osd_event *)calloc(1, sizeof(osd_event)); + ev = (osd_event *)calloc(1, sizeof(osd_event)); - DosCreateMutexSem(NULL, &ev->hmtx, 0, FALSE); - DosCreateEventSem(NULL, &ev->hev, 0, initialstate); - ev->autoreset = !manualreset; + DosCreateMutexSem(NULL, &ev->hmtx, 0, FALSE); + DosCreateEventSem(NULL, &ev->hev, 0, initialstate); + ev->autoreset = !manualreset; - return ev; + return ev; } //============================================================ @@ -349,9 +349,9 @@ osd_event *osd_event_alloc(int manualreset, int initialstate) void osd_event_free(osd_event *event) { - DosCloseMutexSem(event->hmtx); - DosCloseEventSem(event->hev); - free(event); + DosCloseMutexSem(event->hmtx); + DosCloseEventSem(event->hev); + free(event); } //============================================================ @@ -360,7 +360,7 @@ void osd_event_free(osd_event *event) void osd_event_set(osd_event *event) { - DosPostEventSem(event->hev); + DosPostEventSem(event->hev); } //============================================================ @@ -369,9 +369,9 @@ void osd_event_set(osd_event *event) void osd_event_reset(osd_event *event) { - ULONG ulCount; + ULONG ulCount; - DosResetEventSem(event->hev, &ulCount); + DosResetEventSem(event->hev, &ulCount); } //============================================================ @@ -380,24 +380,24 @@ void osd_event_reset(osd_event *event) int osd_event_wait(osd_event *event, osd_ticks_t timeout) { - ULONG rc; + ULONG rc; - if(event->autoreset) - DosRequestMutexSem(event->hmtx, -1); + if(event->autoreset) + DosRequestMutexSem(event->hmtx, -1); - rc = DosWaitEventSem(event->hev, timeout * 1000 / osd_ticks_per_second()); + rc = DosWaitEventSem(event->hev, timeout * 1000 / osd_ticks_per_second()); - if(event->autoreset) - { - ULONG ulCount; + if(event->autoreset) + { + ULONG ulCount; - if(rc == 0) - DosResetEventSem(event->hev, &ulCount); + if(rc == 0) + DosResetEventSem(event->hev, &ulCount); - DosReleaseMutexSem(event->hmtx); - } + DosReleaseMutexSem(event->hmtx); + } - return (rc == 0); + return (rc == 0); } //============================================================ @@ -406,25 +406,25 @@ int osd_event_wait(osd_event *event, osd_ticks_t timeout) static void worker_thread_entry(void *param) { - osd_thread *thread = (osd_thread *) param; + osd_thread *thread = (osd_thread *) param; - thread->callback(thread->param); + thread->callback(thread->param); } osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam) { - osd_thread *thread; - - thread = (osd_thread *)calloc(1, sizeof(osd_thread)); - thread->callback = callback; - thread->param = cbparam; - thread->thread = _beginthread(worker_thread_entry, NULL, 65535, thread); - if ( thread->thread == -1 ) - { - free(thread); - return NULL; - } - return thread; + osd_thread *thread; + + thread = (osd_thread *)calloc(1, sizeof(osd_thread)); + thread->callback = callback; + thread->param = cbparam; + thread->thread = _beginthread(worker_thread_entry, NULL, 65535, thread); + if ( thread->thread == -1 ) + { + free(thread); + return NULL; + } + return thread; } //============================================================ @@ -433,16 +433,16 @@ osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam) int osd_thread_adjust_priority(osd_thread *thread, int adjust) { - PTIB ptib; + PTIB ptib; - DosGetInfoBlocks(&ptib, NULL); + DosGetInfoBlocks(&ptib, NULL); - if ( DosSetPriority(PRTYS_THREAD, PRTYC_NOCHANGE, - ((BYTE)ptib->tib_ptib2->tib2_ulpri) + adjust, thread->thread )) - return FALSE; + if ( DosSetPriority(PRTYS_THREAD, PRTYC_NOCHANGE, + ((BYTE)ptib->tib_ptib2->tib2_ulpri) + adjust, thread->thread )) + return FALSE; - return TRUE; + return TRUE; } //============================================================ @@ -451,7 +451,7 @@ int osd_thread_adjust_priority(osd_thread *thread, int adjust) int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask) { - return TRUE; + return TRUE; } //============================================================ @@ -460,10 +460,10 @@ int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask) void osd_thread_wait_free(osd_thread *thread) { - TID tid = thread->thread; + TID tid = thread->thread; - DosWaitThread(&tid, 0); - free(thread); + DosWaitThread(&tid, 0); + free(thread); } //============================================================ @@ -472,8 +472,8 @@ void osd_thread_wait_free(osd_thread *thread) void osd_process_kill(void) { - PPIB ppib; + PPIB ppib; - DosGetInfoBlocks(NULL, &ppib); - DosKillProcess(DKP_PROCESSTREE, ppib->pib_ulpid); + DosGetInfoBlocks(NULL, &ppib); + DosKillProcess(DKP_PROCESSTREE, ppib->pib_ulpid); } diff --git a/src/osd/sdl/sdlsync_sdl.c b/src/osd/sdl/sdlsync_sdl.c index 3ee7cc41060..80bb4607c0a 100644 --- a/src/osd/sdl/sdlsync_sdl.c +++ b/src/osd/sdl/sdlsync_sdl.c @@ -21,7 +21,7 @@ #include "eminline.h" -#define VERBOSE (0) +#define VERBOSE (0) #if VERBOSE #define LOG( x ) do { printf x; printf("\n"); } while (0) @@ -29,16 +29,16 @@ #define LOG( x ) #endif struct hidden_mutex_t { - SDL_mutex * id; - volatile INT32 locked; - volatile INT32 threadid; + SDL_mutex * id; + volatile INT32 locked; + volatile INT32 threadid; }; struct osd_event { - SDL_mutex * mutex; - SDL_cond * cond; - volatile INT32 autoreset; - volatile INT32 signalled; + SDL_mutex * mutex; + SDL_cond * cond; + volatile INT32 autoreset; + volatile INT32 signalled; }; //============================================================ @@ -46,14 +46,14 @@ struct osd_event { //============================================================ struct osd_thread { - SDL_Thread * thread; + SDL_Thread * thread; osd_thread_callback callback; void *param; }; struct osd_scalable_lock { - SDL_mutex * mutex; + SDL_mutex * mutex; }; //============================================================ @@ -350,4 +350,3 @@ void osd_thread_wait_free(osd_thread *thread) SDL_WaitThread(thread->thread, &status); free(thread); } - diff --git a/src/osd/sdl/sdlsync_tc.c b/src/osd/sdl/sdlsync_tc.c index 7d8cb7d5682..363eb16d86a 100644 --- a/src/osd/sdl/sdlsync_tc.c +++ b/src/osd/sdl/sdlsync_tc.c @@ -10,7 +10,7 @@ //============================================================ #ifndef _GNU_SOURCE -#define _GNU_SOURCE // for PTHREAD_MUTEX_RECURSIVE; needs to be here before other glibc headers are included +#define _GNU_SOURCE // for PTHREAD_MUTEX_RECURSIVE; needs to be here before other glibc headers are included #endif #include "sdlinc.h" @@ -39,14 +39,14 @@ struct hidden_mutex_t { }; struct osd_event { - pthread_mutex_t mutex; - pthread_cond_t cond; - volatile INT32 autoreset; - volatile INT32 signalled; + pthread_mutex_t mutex; + pthread_cond_t cond; + volatile INT32 autoreset; + volatile INT32 signalled; #ifdef PTR64 - INT8 padding[40]; // Fill a 64-byte cache line + INT8 padding[40]; // Fill a 64-byte cache line #else - INT8 padding[48]; // A bit more padding + INT8 padding[48]; // A bit more padding #endif }; @@ -55,12 +55,12 @@ struct osd_event { //============================================================ struct osd_thread { - pthread_t thread; + pthread_t thread; }; struct osd_scalable_lock { - osd_lock *lock; + osd_lock *lock; }; //============================================================ @@ -124,7 +124,7 @@ void osd_lock_acquire(osd_lock *lock) hidden_mutex_t *mutex = (hidden_mutex_t *) lock; int r; - r = pthread_mutex_lock(&mutex->id); + r = pthread_mutex_lock(&mutex->id); if (r==0) return; //mame_printf_error("Error on lock: %d: %s\n", r, strerror(r)); @@ -143,7 +143,7 @@ int osd_lock_try(osd_lock *lock) if (r==0) return 1; //if (r!=EBUSY) - // mame_printf_error("Error on trylock: %d: %s\n", r, strerror(r)); + // mame_printf_error("Error on trylock: %d: %s\n", r, strerror(r)); return 0; } @@ -300,7 +300,7 @@ int osd_event_wait(osd_event *event, osd_ticks_t timeout) osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam) { osd_thread *thread; - pthread_attr_t attr; + pthread_attr_t attr; thread = (osd_thread *)calloc(1, sizeof(osd_thread)); pthread_attr_init(&attr); @@ -319,8 +319,8 @@ osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam) int osd_thread_adjust_priority(osd_thread *thread, int adjust) { - struct sched_param sched; - int policy; + struct sched_param sched; + int policy; if ( pthread_getschedparam( thread->thread, &policy, &sched ) == 0 ) { @@ -341,9 +341,9 @@ int osd_thread_adjust_priority(osd_thread *thread, int adjust) int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask) { #if !defined(NO_AFFINITY_NP) - cpu_set_t cmask; - pthread_t lthread; - int bitnum; + cpu_set_t cmask; + pthread_t lthread; + int bitnum; CPU_ZERO(&cmask); for (bitnum=0; bitnum<32; bitnum++) diff --git a/src/osd/sdl/sdlsync_win32.c b/src/osd/sdl/sdlsync_win32.c index 91f8c6b97e5..7e006f16828 100644 --- a/src/osd/sdl/sdlsync_win32.c +++ b/src/osd/sdl/sdlsync_win32.c @@ -30,11 +30,11 @@ // DEBUGGING //============================================================ -#define USE_SCALABLE_LOCKS (0) +#define USE_SCALABLE_LOCKS (0) struct osd_event { - void * ptr; + void * ptr; }; struct osd_thread { @@ -96,14 +96,14 @@ int osd_event_wait(osd_event *event, osd_ticks_t timeout) struct osd_scalable_lock { #if USE_SCALABLE_LOCKS - struct - { - volatile INT32 haslock; // do we have the lock? - INT32 filler[64/4-1]; // assumes a 64-byte cache line - } slot[WORK_MAX_THREADS]; // one slot per thread - volatile INT32 nextindex; // index of next slot to use + struct + { + volatile INT32 haslock; // do we have the lock? + INT32 filler[64/4-1]; // assumes a 64-byte cache line + } slot[WORK_MAX_THREADS]; // one slot per thread + volatile INT32 nextindex; // index of next slot to use #else - CRITICAL_SECTION section; + CRITICAL_SECTION section; #endif }; diff --git a/src/osd/sdl/sdlwork.c b/src/osd/sdl/sdlwork.c index fca2a0272c0..dca494720ab 100644 --- a/src/osd/sdl/sdlwork.c +++ b/src/osd/sdl/sdlwork.c @@ -38,17 +38,17 @@ int osd_num_processors = 0; // DEBUGGING //============================================================ -#define KEEP_STATISTICS (0) +#define KEEP_STATISTICS (0) //============================================================ // PARAMETERS //============================================================ -#define SDLENV_PROCESSORS "OSDPROCESSORS" -#define SDLENV_CPUMASKS "OSDCPUMASKS" +#define SDLENV_PROCESSORS "OSDPROCESSORS" +#define SDLENV_CPUMASKS "OSDCPUMASKS" -#define INFINITE (osd_ticks_per_second() * (osd_ticks_t) 10000) -#define SPIN_LOOP_TIME (osd_ticks_per_second() / 10000) +#define INFINITE (osd_ticks_per_second() * (osd_ticks_t) 10000) +#define SPIN_LOOP_TIME (osd_ticks_per_second() / 10000) //============================================================ @@ -56,13 +56,13 @@ int osd_num_processors = 0; //============================================================ #if KEEP_STATISTICS -#define add_to_stat(v,x) do { atomic_add32((v), (x)); } while (0) -#define begin_timing(v) do { (v) -= get_profile_ticks(); } while (0) -#define end_timing(v) do { (v) += get_profile_ticks(); } while (0) +#define add_to_stat(v,x) do { atomic_add32((v), (x)); } while (0) +#define begin_timing(v) do { (v) -= get_profile_ticks(); } while (0) +#define end_timing(v) do { (v) += get_profile_ticks(); } while (0) #else -#define add_to_stat(v,x) do { } while (0) -#define begin_timing(v) do { } while (0) -#define end_timing(v) do { } while (0) +#define add_to_stat(v,x) do { } while (0) +#define begin_timing(v) do { } while (0) +#define end_timing(v) do { } while (0) #endif @@ -73,55 +73,55 @@ int osd_num_processors = 0; struct work_thread_info { - osd_work_queue * queue; // pointer back to the queue - osd_thread * handle; // handle to the thread - osd_event * wakeevent; // wake event for the thread - volatile INT32 active; // are we actively processing work? + osd_work_queue * queue; // pointer back to the queue + osd_thread * handle; // handle to the thread + osd_event * wakeevent; // wake event for the thread + volatile INT32 active; // are we actively processing work? #if KEEP_STATISTICS - INT32 itemsdone; - osd_ticks_t actruntime; - osd_ticks_t runtime; - osd_ticks_t spintime; - osd_ticks_t waittime; + INT32 itemsdone; + osd_ticks_t actruntime; + osd_ticks_t runtime; + osd_ticks_t spintime; + osd_ticks_t waittime; #endif }; struct osd_work_queue { - osd_scalable_lock * lock; // lock for protecting the queue - osd_work_item * volatile list; // list of items in the queue - osd_work_item ** volatile tailptr; // pointer to the tail pointer of work items in the queue - osd_work_item * volatile free; // free list of work items - volatile INT32 items; // items in the queue - volatile INT32 livethreads; // number of live threads - volatile INT32 waiting; // is someone waiting on the queue to complete? - volatile UINT8 exiting; // should the threads exit on their next opportunity? - UINT32 threads; // number of threads in this queue - UINT32 flags; // creation flags - work_thread_info * thread; // array of thread information - osd_event * doneevent; // event signalled when work is complete + osd_scalable_lock * lock; // lock for protecting the queue + osd_work_item * volatile list; // list of items in the queue + osd_work_item ** volatile tailptr; // pointer to the tail pointer of work items in the queue + osd_work_item * volatile free; // free list of work items + volatile INT32 items; // items in the queue + volatile INT32 livethreads; // number of live threads + volatile INT32 waiting; // is someone waiting on the queue to complete? + volatile UINT8 exiting; // should the threads exit on their next opportunity? + UINT32 threads; // number of threads in this queue + UINT32 flags; // creation flags + work_thread_info * thread; // array of thread information + osd_event * doneevent; // event signalled when work is complete #if KEEP_STATISTICS - volatile INT32 itemsqueued; // total items queued - volatile INT32 setevents; // number of times we called SetEvent - volatile INT32 extraitems; // how many extra items we got after the first in the queue loop - volatile INT32 spinloops; // how many times spinning bought us more items + volatile INT32 itemsqueued; // total items queued + volatile INT32 setevents; // number of times we called SetEvent + volatile INT32 extraitems; // how many extra items we got after the first in the queue loop + volatile INT32 spinloops; // how many times spinning bought us more items #endif }; struct osd_work_item { - osd_work_item * next; // pointer to next item - osd_work_queue * queue; // pointer back to the owning queue - osd_work_callback callback; // callback function - void * param; // callback parameter - void * result; // callback result - osd_event * event; // event signalled when complete - UINT32 flags; // creation flags - volatile INT32 done; // is the item done? + osd_work_item * next; // pointer to next item + osd_work_queue * queue; // pointer back to the owning queue + osd_work_callback callback; // callback function + void * param; // callback parameter + void * result; // callback result + osd_event * event; // event signalled when complete + UINT32 flags; // creation flags + volatile INT32 done; // is the item done? }; typedef void *PVOID; @@ -163,7 +163,7 @@ osd_work_queue *osd_work_queue_alloc(int flags) queue->flags = flags; // allocate events for the queue - queue->doneevent = osd_event_alloc(TRUE, TRUE); // manual reset, signalled + queue->doneevent = osd_event_alloc(TRUE, TRUE); // manual reset, signalled if (queue->doneevent == NULL) goto error; @@ -199,7 +199,7 @@ osd_work_queue *osd_work_queue_alloc(int flags) thread->queue = queue; // create the per-thread wake event - thread->wakeevent = osd_event_alloc(FALSE, FALSE); // auto-reset, not signalled + thread->wakeevent = osd_event_alloc(FALSE, FALSE); // auto-reset, not signalled if (thread->wakeevent == NULL) goto error; @@ -504,9 +504,9 @@ int osd_work_item_wait(osd_work_item *item, osd_ticks_t timeout) // if we don't have an event, create one if (item->event == NULL) - item->event = osd_event_alloc(TRUE, FALSE); // manual reset, not signalled + item->event = osd_event_alloc(TRUE, FALSE); // manual reset, not signalled else - osd_event_reset(item->event); + osd_event_reset(item->event); // if we don't have an event, we need to spin (shouldn't ever really happen) if (item->event == NULL) @@ -568,7 +568,7 @@ static int effective_num_processors(void) int numprocs = 0; int physprocs = osd_get_num_processors(); - // osd_num_processors == 0 for 'auto' + // osd_num_processors == 0 for 'auto' if (osd_num_processors > 0) return MIN(4 * physprocs, osd_num_processors); else @@ -589,9 +589,9 @@ static int effective_num_processors(void) static UINT32 effective_cpu_mask(int index) { - char *s; - char buf[5]; - UINT32 mask = 0xFFFF; + char *s; + char buf[5]; + UINT32 mask = 0xFFFF; s = osd_getenv(SDLENV_CPUMASKS); if (s != NULL && strcmp(s,"none")) diff --git a/src/osd/sdl/shader/glsl_bilinear_idx16_lut.fsh.c b/src/osd/sdl/shader/glsl_bilinear_idx16_lut.fsh.c index 0ccede6fd99..62844692cbe 100644 --- a/src/osd/sdl/shader/glsl_bilinear_idx16_lut.fsh.c +++ b/src/osd/sdl/shader/glsl_bilinear_idx16_lut.fsh.c @@ -11,47 +11,47 @@ const char glsl_bilinear_idx16_lut_fsh_src[] = "\n" "vec4 lutTex2D(in vec2 texcoord)\n" "{\n" -" vec4 color_tex;\n" -" vec2 color_map_coord;\n" +" vec4 color_tex;\n" +" vec2 color_map_coord;\n" "\n" -" // normalized texture coordinates ..\n" -" color_tex = texture2D(color_texture, texcoord);\n" +" // normalized texture coordinates ..\n" +" color_tex = texture2D(color_texture, texcoord);\n" "\n" -" // GL_UNSIGNED_SHORT GL_ALPHA in ALPHA16 conversion:\n" -" // general: f = c / ((2*N)-1), c color bitfield, N number of bits\n" -" // ushort: c = ((2**16)-1)*f;\n" -" color_map_coord.x = floor( 65535.0 * color_tex.a + 0.5 );\n" +" // GL_UNSIGNED_SHORT GL_ALPHA in ALPHA16 conversion:\n" +" // general: f = c / ((2*N)-1), c color bitfield, N number of bits\n" +" // ushort: c = ((2**16)-1)*f;\n" +" color_map_coord.x = floor( 65535.0 * color_tex.a + 0.5 );\n" "\n" -" // map it to the 2D lut table\n" -" color_map_coord.y = floor(color_map_coord.x/colortable_sz.x);\n" -" color_map_coord.x = mod(color_map_coord.x,colortable_sz.x);\n" +" // map it to the 2D lut table\n" +" color_map_coord.y = floor(color_map_coord.x/colortable_sz.x);\n" +" color_map_coord.x = mod(color_map_coord.x,colortable_sz.x);\n" "\n" -" return texture2D(colortable_texture, (color_map_coord+vec2(0.5)) / colortable_pow2_sz);\n" +" return texture2D(colortable_texture, (color_map_coord+vec2(0.5)) / colortable_pow2_sz);\n" "}\n" "\n" "void main()\n" "{\n" -" vec2 xy = gl_TexCoord[0].st;\n" -"\n" -" // mix(x,y,a): x*(1-a) + y*a\n" -" //\n" -" // bilinear filtering includes 2 mix:\n" -" //\n" -" // pix1 = tex[x0][y0] * ( 1 - u_ratio ) + tex[x1][y0] * u_ratio\n" -" // pix2 = tex[x0][y1] * ( 1 - u_ratio ) + tex[x1][y1] * u_ratio\n" -" // fin = pix1 * ( 1 - v_ratio ) + pix2 * v_ratio\n" -" //\n" -" // so we can use the build in mix function for these 2 computations ;-)\n" -" //\n" -" vec2 uv_ratio = fract(xy*color_texture_pow2_sz); // xy*color_texture_pow2_sz - floor(xy*color_texture_pow2_sz);\n" -" vec2 one = 1.0/color_texture_pow2_sz;\n" -"\n" -" vec4 col1, col2;\n" -"\n" -" col1 = mix( lutTex2D(xy ), lutTex2D(xy + vec2(one.x, 0.0)), uv_ratio.x);\n" -" col2 = mix( lutTex2D(xy + vec2(0.0, one.y)), lutTex2D(xy + one ), uv_ratio.x);\n" -"\n" -" gl_FragColor = mix ( col1, col2, uv_ratio.y );\n" +" vec2 xy = gl_TexCoord[0].st;\n" +"\n" +" // mix(x,y,a): x*(1-a) + y*a\n" +" //\n" +" // bilinear filtering includes 2 mix:\n" +" //\n" +" // pix1 = tex[x0][y0] * ( 1 - u_ratio ) + tex[x1][y0] * u_ratio\n" +" // pix2 = tex[x0][y1] * ( 1 - u_ratio ) + tex[x1][y1] * u_ratio\n" +" // fin = pix1 * ( 1 - v_ratio ) + pix2 * v_ratio\n" +" //\n" +" // so we can use the build in mix function for these 2 computations ;-)\n" +" //\n" +" vec2 uv_ratio = fract(xy*color_texture_pow2_sz); // xy*color_texture_pow2_sz - floor(xy*color_texture_pow2_sz);\n" +" vec2 one = 1.0/color_texture_pow2_sz;\n" +"\n" +" vec4 col1, col2;\n" +"\n" +" col1 = mix( lutTex2D(xy ), lutTex2D(xy + vec2(one.x, 0.0)), uv_ratio.x);\n" +" col2 = mix( lutTex2D(xy + vec2(0.0, one.y)), lutTex2D(xy + one ), uv_ratio.x);\n" +"\n" +" gl_FragColor = mix ( col1, col2, uv_ratio.y );\n" "}\n" "\n" ; diff --git a/src/osd/sdl/shader/glsl_bilinear_rgb32_dir.fsh.c b/src/osd/sdl/shader/glsl_bilinear_rgb32_dir.fsh.c index 786d4ca9497..d6265b8905b 100644 --- a/src/osd/sdl/shader/glsl_bilinear_rgb32_dir.fsh.c +++ b/src/osd/sdl/shader/glsl_bilinear_rgb32_dir.fsh.c @@ -13,43 +13,43 @@ const char glsl_bilinear_rgb32_dir_fsh_src[] = "\n" "void main()\n" "{\n" -" vec2 xy = gl_TexCoord[0].st;\n" -"\n" -" // mix(x,y,a): x*(1-a) + y*a\n" -" //\n" -" // bilinear filtering includes 2 mix:\n" -" //\n" -" // pix1 = tex[x0][y0] * ( 1 - u_ratio ) + tex[x1][y0] * u_ratio\n" -" // pix2 = tex[x0][y1] * ( 1 - u_ratio ) + tex[x1][y1] * u_ratio\n" -" // fin = pix1 * ( 1 - v_ratio ) + pix2 * v_ratio\n" -" //\n" -" // so we can use the build in mix function for these 2 computations ;-)\n" -" //\n" -" vec2 uv_ratio = fract(xy*color_texture_pow2_sz); // xy*color_texture_pow2_sz - floor(xy*color_texture_pow2_sz);\n" -" vec2 one = 1.0/color_texture_pow2_sz;\n" +" vec2 xy = gl_TexCoord[0].st;\n" +"\n" +" // mix(x,y,a): x*(1-a) + y*a\n" +" //\n" +" // bilinear filtering includes 2 mix:\n" +" //\n" +" // pix1 = tex[x0][y0] * ( 1 - u_ratio ) + tex[x1][y0] * u_ratio\n" +" // pix2 = tex[x0][y1] * ( 1 - u_ratio ) + tex[x1][y1] * u_ratio\n" +" // fin = pix1 * ( 1 - v_ratio ) + pix2 * v_ratio\n" +" //\n" +" // so we can use the build in mix function for these 2 computations ;-)\n" +" //\n" +" vec2 uv_ratio = fract(xy*color_texture_pow2_sz); // xy*color_texture_pow2_sz - floor(xy*color_texture_pow2_sz);\n" +" vec2 one = 1.0/color_texture_pow2_sz;\n" "\n" "#if 1\n" -" vec4 col, col2;\n" +" vec4 col, col2;\n" "\n" -" col = mix( TEX2D(xy ), TEX2D(xy + vec2(one.x, 0.0)), uv_ratio.x);\n" -" col2 = mix( TEX2D(xy + vec2(0.0, one.y)), TEX2D(xy + one ), uv_ratio.x);\n" -" col = mix ( col, col2, uv_ratio.y );\n" +" col = mix( TEX2D(xy ), TEX2D(xy + vec2(one.x, 0.0)), uv_ratio.x);\n" +" col2 = mix( TEX2D(xy + vec2(0.0, one.y)), TEX2D(xy + one ), uv_ratio.x);\n" +" col = mix ( col, col2, uv_ratio.y );\n" "#else\n" -" // doesn't work on MacOSX GLSL engine ..\n" -" //\n" -" vec4 col = mix ( mix( TEX2D(xy ), TEX2D(xy + vec2(one.x, 0.0)), uv_ratio.x),\n" -" mix( TEX2D(xy + vec2(0.0, one.y)), TEX2D(xy + one ), uv_ratio.x), uv_ratio.y );\n" +" // doesn't work on MacOSX GLSL engine ..\n" +" //\n" +" vec4 col = mix ( mix( TEX2D(xy ), TEX2D(xy + vec2(one.x, 0.0)), uv_ratio.x),\n" +" mix( TEX2D(xy + vec2(0.0, one.y)), TEX2D(xy + one ), uv_ratio.x), uv_ratio.y );\n" "#endif\n" "\n" -" // gamma, contrast, brightness equation from: rendutil.h / apply_brightness_contrast_gamma_fp\n" +" // gamma, contrast, brightness equation from: rendutil.h / apply_brightness_contrast_gamma_fp\n" "\n" "#ifdef DO_GAMMA\n" -" // gamma/contrast/brightness\n" -" vec4 gamma = vec4(1.0 / vid_attributes.r, 1.0 / vid_attributes.r, 1.0 / vid_attributes.r, 0.0);\n" -" gl_FragColor = ( pow ( col, gamma ) * vid_attributes.g) + vid_attributes.b - 1.0;\n" +" // gamma/contrast/brightness\n" +" vec4 gamma = vec4(1.0 / vid_attributes.r, 1.0 / vid_attributes.r, 1.0 / vid_attributes.r, 0.0);\n" +" gl_FragColor = ( pow ( col, gamma ) * vid_attributes.g) + vid_attributes.b - 1.0;\n" "#else\n" -" // contrast/brightness\n" -" gl_FragColor = ( col * vid_attributes.g) + vid_attributes.b - 1.0;\n" +" // contrast/brightness\n" +" gl_FragColor = ( col * vid_attributes.g) + vid_attributes.b - 1.0;\n" "#endif\n" "}\n" "\n" diff --git a/src/osd/sdl/shader/glsl_bilinear_rgb32_lut.fsh.c b/src/osd/sdl/shader/glsl_bilinear_rgb32_lut.fsh.c index 2bb50213f11..a5a67bdbf94 100644 --- a/src/osd/sdl/shader/glsl_bilinear_rgb32_lut.fsh.c +++ b/src/osd/sdl/shader/glsl_bilinear_rgb32_lut.fsh.c @@ -11,49 +11,49 @@ const char glsl_bilinear_rgb32_lut_fsh_src[] = "\n" "vec4 lutTex2D(in vec2 texcoord)\n" "{\n" -" vec4 color_tex;\n" -" vec2 color_map_coord;\n" -" vec4 color0;\n" -" float colortable_scale = (colortable_sz.x/3.0) / colortable_pow2_sz.x;\n" +" vec4 color_tex;\n" +" vec2 color_map_coord;\n" +" vec4 color0;\n" +" float colortable_scale = (colortable_sz.x/3.0) / colortable_pow2_sz.x;\n" "\n" -" // normalized texture coordinates ..\n" -" color_tex = texture2D(color_texture, texcoord) * ((colortable_sz.x/3.0)-1.0)/colortable_pow2_sz.x;// lookup space \n" +" // normalized texture coordinates ..\n" +" color_tex = texture2D(color_texture, texcoord) * ((colortable_sz.x/3.0)-1.0)/colortable_pow2_sz.x;// lookup space \n" "\n" -" color_map_coord.x = color_tex.b;\n" -" color0.b = texture2D(colortable_texture, color_map_coord).b;\n" +" color_map_coord.x = color_tex.b;\n" +" color0.b = texture2D(colortable_texture, color_map_coord).b;\n" "\n" -" color_map_coord.x = color_tex.g + colortable_scale;\n" -" color0.g = texture2D(colortable_texture, color_map_coord).g;\n" +" color_map_coord.x = color_tex.g + colortable_scale;\n" +" color0.g = texture2D(colortable_texture, color_map_coord).g;\n" "\n" -" color_map_coord.x = color_tex.r + 2.0 * colortable_scale;\n" -" color0.r = texture2D(colortable_texture, color_map_coord).r;\n" +" color_map_coord.x = color_tex.r + 2.0 * colortable_scale;\n" +" color0.r = texture2D(colortable_texture, color_map_coord).r;\n" "\n" -" return color0;\n" +" return color0;\n" "}\n" "\n" "void main()\n" "{\n" -" vec2 xy = gl_TexCoord[0].st;\n" -"\n" -" // mix(x,y,a): x*(1-a) + y*a\n" -" //\n" -" // bilinear filtering includes 2 mix:\n" -" //\n" -" // pix1 = tex[x0][y0] * ( 1 - u_ratio ) + tex[x1][y0] * u_ratio\n" -" // pix2 = tex[x0][y1] * ( 1 - u_ratio ) + tex[x1][y1] * u_ratio\n" -" // fin = pix1 * ( 1 - v_ratio ) + pix2 * v_ratio\n" -" //\n" -" // so we can use the build in mix function for these 2 computations ;-)\n" -" //\n" -" vec2 uv_ratio = fract(xy*color_texture_pow2_sz); // xy*color_texture_pow2_sz - floor(xy*color_texture_pow2_sz);\n" -" vec2 one = 1.0/color_texture_pow2_sz;\n" -"\n" -" vec4 col1, col2;\n" -"\n" -" col1 = mix( lutTex2D(xy ), lutTex2D(xy + vec2(one.x, 0.0)), uv_ratio.x);\n" -" col2 = mix( lutTex2D(xy + vec2(0.0, one.y)), lutTex2D(xy + one ), uv_ratio.x);\n" -"\n" -" gl_FragColor = mix ( col1, col2, uv_ratio.y );\n" +" vec2 xy = gl_TexCoord[0].st;\n" +"\n" +" // mix(x,y,a): x*(1-a) + y*a\n" +" //\n" +" // bilinear filtering includes 2 mix:\n" +" //\n" +" // pix1 = tex[x0][y0] * ( 1 - u_ratio ) + tex[x1][y0] * u_ratio\n" +" // pix2 = tex[x0][y1] * ( 1 - u_ratio ) + tex[x1][y1] * u_ratio\n" +" // fin = pix1 * ( 1 - v_ratio ) + pix2 * v_ratio\n" +" //\n" +" // so we can use the build in mix function for these 2 computations ;-)\n" +" //\n" +" vec2 uv_ratio = fract(xy*color_texture_pow2_sz); // xy*color_texture_pow2_sz - floor(xy*color_texture_pow2_sz);\n" +" vec2 one = 1.0/color_texture_pow2_sz;\n" +"\n" +" vec4 col1, col2;\n" +"\n" +" col1 = mix( lutTex2D(xy ), lutTex2D(xy + vec2(one.x, 0.0)), uv_ratio.x);\n" +" col2 = mix( lutTex2D(xy + vec2(0.0, one.y)), lutTex2D(xy + one ), uv_ratio.x);\n" +"\n" +" gl_FragColor = mix ( col1, col2, uv_ratio.y );\n" "}\n" "\n" "\n" diff --git a/src/osd/sdl/shader/glsl_general.vsh.c b/src/osd/sdl/shader/glsl_general.vsh.c index 319a25d18d0..d0bf6eb8a68 100644 --- a/src/osd/sdl/shader/glsl_general.vsh.c +++ b/src/osd/sdl/shader/glsl_general.vsh.c @@ -2,8 +2,8 @@ const char glsl_general_vsh_src[] = "\n" "void main()\n" "{\n" -" gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;\n" -" gl_Position = ftransform();\n" +" gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;\n" +" gl_Position = ftransform();\n" "}\n" "\n" ; diff --git a/src/osd/sdl/shader/glsl_plain_idx16_lut.fsh.c b/src/osd/sdl/shader/glsl_plain_idx16_lut.fsh.c index 88059cbf3df..f9f18b615e6 100644 --- a/src/osd/sdl/shader/glsl_plain_idx16_lut.fsh.c +++ b/src/osd/sdl/shader/glsl_plain_idx16_lut.fsh.c @@ -10,22 +10,22 @@ const char glsl_plain_idx16_lut_fsh_src[] = "\n" "void main()\n" "{\n" -" vec4 color_tex;\n" -" vec2 color_map_coord;\n" +" vec4 color_tex;\n" +" vec2 color_map_coord;\n" "\n" -" // normalized texture coordinates ..\n" -" color_tex = texture2D(color_texture, gl_TexCoord[0].st);\n" +" // normalized texture coordinates ..\n" +" color_tex = texture2D(color_texture, gl_TexCoord[0].st);\n" "\n" -" // GL_UNSIGNED_SHORT GL_ALPHA in ALPHA16 conversion:\n" -" // general: f = c / ((2*N)-1), c color bitfield, N number of bits\n" -" // ushort: c = ((2**16)-1)*f;\n" -" color_map_coord.x = floor( 65535.0 * color_tex.a + 0.5 );\n" +" // GL_UNSIGNED_SHORT GL_ALPHA in ALPHA16 conversion:\n" +" // general: f = c / ((2*N)-1), c color bitfield, N number of bits\n" +" // ushort: c = ((2**16)-1)*f;\n" +" color_map_coord.x = floor( 65535.0 * color_tex.a + 0.5 );\n" "\n" -" // map it to the 2D lut table\n" -" color_map_coord.y = floor(color_map_coord.x/colortable_sz.x);\n" -" color_map_coord.x = mod(color_map_coord.x,colortable_sz.x);\n" +" // map it to the 2D lut table\n" +" color_map_coord.y = floor(color_map_coord.x/colortable_sz.x);\n" +" color_map_coord.x = mod(color_map_coord.x,colortable_sz.x);\n" "\n" -" gl_FragColor = texture2D(colortable_texture, (color_map_coord+vec2(0.5)) / colortable_pow2_sz);\n" +" gl_FragColor = texture2D(colortable_texture, (color_map_coord+vec2(0.5)) / colortable_pow2_sz);\n" "}\n" "\n" "\n" diff --git a/src/osd/sdl/shader/glsl_plain_rgb32_dir.fsh.c b/src/osd/sdl/shader/glsl_plain_rgb32_dir.fsh.c index 371ad27026f..1e206d671cd 100644 --- a/src/osd/sdl/shader/glsl_plain_rgb32_dir.fsh.c +++ b/src/osd/sdl/shader/glsl_plain_rgb32_dir.fsh.c @@ -11,16 +11,16 @@ const char glsl_plain_rgb32_dir_fsh_src[] = "void main()\n" "{\n" "#ifdef DO_GAMMA\n" -" vec4 gamma = vec4( 1.0 / vid_attributes.r, 1.0 / vid_attributes.r, 1.0 / vid_attributes.r, 0.0);\n" +" vec4 gamma = vec4( 1.0 / vid_attributes.r, 1.0 / vid_attributes.r, 1.0 / vid_attributes.r, 0.0);\n" "\n" -" // gamma, contrast, brightness equation from: rendutil.h / apply_brightness_contrast_gamma_fp\n" -" vec4 color = pow( texture2D(color_texture, gl_TexCoord[0].st) , gamma);\n" +" // gamma, contrast, brightness equation from: rendutil.h / apply_brightness_contrast_gamma_fp\n" +" vec4 color = pow( texture2D(color_texture, gl_TexCoord[0].st) , gamma);\n" "#else\n" -" vec4 color = texture2D(color_texture, gl_TexCoord[0].st);\n" +" vec4 color = texture2D(color_texture, gl_TexCoord[0].st);\n" "#endif\n" "\n" -" // contrast/brightness\n" -" gl_FragColor = (color * vid_attributes.g) + vid_attributes.b - 1.0;\n" +" // contrast/brightness\n" +" gl_FragColor = (color * vid_attributes.g) + vid_attributes.b - 1.0;\n" "}\n" "\n" ; diff --git a/src/osd/sdl/shader/glsl_plain_rgb32_lut.fsh.c b/src/osd/sdl/shader/glsl_plain_rgb32_lut.fsh.c index 8a1303f4b62..d1263ea6864 100644 --- a/src/osd/sdl/shader/glsl_plain_rgb32_lut.fsh.c +++ b/src/osd/sdl/shader/glsl_plain_rgb32_lut.fsh.c @@ -10,21 +10,21 @@ const char glsl_plain_rgb32_lut_fsh_src[] = "\n" "void main()\n" "{\n" -" vec4 color_tex;\n" -" vec2 color_map_coord;\n" -" float colortable_scale = (colortable_sz.x/3.0) / colortable_pow2_sz.x;\n" +" vec4 color_tex;\n" +" vec2 color_map_coord;\n" +" float colortable_scale = (colortable_sz.x/3.0) / colortable_pow2_sz.x;\n" "\n" -" // normalized texture coordinates ..\n" -" color_tex = texture2D(color_texture, gl_TexCoord[0].st) * ((colortable_sz.x/3.0)-1.0)/colortable_pow2_sz.x;// lookup space \n" +" // normalized texture coordinates ..\n" +" color_tex = texture2D(color_texture, gl_TexCoord[0].st) * ((colortable_sz.x/3.0)-1.0)/colortable_pow2_sz.x;// lookup space \n" "\n" -" color_map_coord.x = color_tex.b;\n" -" gl_FragColor.b = texture2D(colortable_texture, color_map_coord).b;\n" +" color_map_coord.x = color_tex.b;\n" +" gl_FragColor.b = texture2D(colortable_texture, color_map_coord).b;\n" "\n" -" color_map_coord.x = color_tex.g + colortable_scale;\n" -" gl_FragColor.g = texture2D(colortable_texture, color_map_coord).g;\n" +" color_map_coord.x = color_tex.g + colortable_scale;\n" +" gl_FragColor.g = texture2D(colortable_texture, color_map_coord).g;\n" "\n" -" color_map_coord.x = color_tex.r + 2.0 * colortable_scale;\n" -" gl_FragColor.r = texture2D(colortable_texture, color_map_coord).r;\n" +" color_map_coord.x = color_tex.r + 2.0 * colortable_scale;\n" +" gl_FragColor.r = texture2D(colortable_texture, color_map_coord).r;\n" "}\n" "\n" ; diff --git a/src/osd/sdl/sound.c b/src/osd/sdl/sound.c index 594677b6c4f..d9905d5bff3 100644 --- a/src/osd/sdl/sound.c +++ b/src/osd/sdl/sound.c @@ -23,40 +23,40 @@ // DEBUGGING //============================================================ -#define LOG_SOUND 0 +#define LOG_SOUND 0 //============================================================ // PARAMETERS //============================================================ // number of samples per SDL callback -#define SDL_XFER_SAMPLES (512) +#define SDL_XFER_SAMPLES (512) static int sdl_xfer_samples = SDL_XFER_SAMPLES; static int stream_in_initialized = 0; static int stream_loop = 0; // maximum audio latency -#define MAX_AUDIO_LATENCY 5 +#define MAX_AUDIO_LATENCY 5 //============================================================ // LOCAL VARIABLES //============================================================ -static int attenuation = 0; +static int attenuation = 0; -static int initialized_audio = 0; -static int buf_locked; +static int initialized_audio = 0; +static int buf_locked; -static INT8 *stream_buffer; -static volatile INT32 stream_playpos; +static INT8 *stream_buffer; +static volatile INT32 stream_playpos; -static UINT32 stream_buffer_size; -static UINT32 stream_buffer_in; +static UINT32 stream_buffer_size; +static UINT32 stream_buffer_in; // buffer over/underflow counts -static int buffer_underflows; -static int buffer_overflows; +static int buffer_underflows; +static int buffer_overflows; // debugging static FILE *sound_log; @@ -69,12 +69,12 @@ static int snd_enabled; // PROTOTYPES //============================================================ -static int sdl_init(running_machine &machine); -static void sdl_kill(running_machine &machine); -static int sdl_create_buffers(void); -static void sdl_destroy_buffers(void); -static void sdl_cleanup_audio(running_machine &machine); -static void SDLCALL sdl_callback(void *userdata, Uint8 *stream, int len); +static int sdl_init(running_machine &machine); +static void sdl_kill(running_machine &machine); +static int sdl_create_buffers(void); +static void sdl_destroy_buffers(void); +static void sdl_cleanup_audio(running_machine &machine); +static void SDLCALL sdl_callback(void *userdata, Uint8 *stream, int len); @@ -143,7 +143,7 @@ static int lock_buffer(running_machine &machine, long offset, long size, void ** lstart = offset; lend = lstart+size; while (((pstart >= lstart) && (pstart <= lend)) || - ((pend >= lstart) && (pend <= lend))) + ((pend >= lstart) && (pend <= lend))) { pstart = stream_playpos; pend = pstart + sdl_xfer_samples; @@ -174,7 +174,7 @@ static int lock_buffer(running_machine &machine, long offset, long size, void ** if (LOG_SOUND) fprintf(sound_log, "locking %ld bytes at offset %ld (total %d, playpos %d): len1 %ld len2 %ld\n", - size, offset, stream_buffer_size, stream_playpos, *length1, *length2); + size, offset, stream_buffer_size, stream_playpos, *length1, *length2); return 0; } @@ -421,9 +421,9 @@ static void sdl_callback(void *userdata, Uint8 *stream, int len) //============================================================ static int sdl_init(running_machine &machine) { - int n_channels = 2; - int audio_latency; - SDL_AudioSpec aspec, obtained; + int n_channels = 2; + int audio_latency; + SDL_AudioSpec aspec, obtained; char audio_driver[16] = ""; if (initialized_audio) @@ -447,7 +447,7 @@ static int sdl_init(running_machine &machine) // set up the audio specs aspec.freq = machine.sample_rate(); - aspec.format = AUDIO_S16SYS; // keep endian independent + aspec.format = AUDIO_S16SYS; // keep endian independent aspec.channels = n_channels; aspec.samples = sdl_xfer_samples; aspec.callback = sdl_callback; @@ -460,7 +460,7 @@ static int sdl_init(running_machine &machine) snd_enabled = 1; mame_printf_verbose("Audio: frequency: %d, channels: %d, samples: %d\n", - obtained.freq, obtained.channels, obtained.samples); + obtained.freq, obtained.channels, obtained.samples); sdl_xfer_samples = obtained.samples; @@ -542,4 +542,3 @@ static void sdl_destroy_buffers(void) global_free(stream_buffer); stream_buffer = NULL; } - diff --git a/src/osd/sdl/strconv.c b/src/osd/sdl/strconv.c index 771a302fa92..ffc73dc68d2 100644 --- a/src/osd/sdl/strconv.c +++ b/src/osd/sdl/strconv.c @@ -80,4 +80,3 @@ int osd_uchar_from_osdchar(unicode_char *uchar, const char *osdchar, size_t coun return count; } - diff --git a/src/osd/sdl/strconv.h b/src/osd/sdl/strconv.h index 2143cba2b1c..f5671b6dc0d 100644 --- a/src/osd/sdl/strconv.h +++ b/src/osd/sdl/strconv.h @@ -29,14 +29,13 @@ WCHAR *wstring_from_utf8(const char *s); char *utf8_from_wstring(const WCHAR *s); #ifdef UNICODE -#define tstring_from_utf8 wstring_from_utf8 -#define utf8_from_tstring utf8_from_wstring +#define tstring_from_utf8 wstring_from_utf8 +#define utf8_from_tstring utf8_from_wstring #else // !UNICODE -#define tstring_from_utf8 astring_from_utf8 -#define utf8_from_tstring utf8_from_astring +#define tstring_from_utf8 astring_from_utf8 +#define utf8_from_tstring utf8_from_astring #endif // UNICODE #endif //SDLMAME_WIN32 #endif // __SDLSTRCONV__ - diff --git a/src/osd/sdl/testkeys.c b/src/osd/sdl/testkeys.c index 2530948dfe7..a422f654202 100644 --- a/src/osd/sdl/testkeys.c +++ b/src/osd/sdl/testkeys.c @@ -35,22 +35,22 @@ struct key_lookup_table static key_lookup_table sdl_lookup[] = { - KE7(UNKNOWN, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE ) + KE7(UNKNOWN, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE ) KE(SPACE) - KE5(COMMA, MINUS, PERIOD, SLASH, 0 ) - KE8(1, 2, 3, 4, 5, 6, 7, 8 ) - KE5(9, SEMICOLON, EQUALS, PRINTSCREEN, AC_REFRESH) - KE5(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, A, B ) - KE8(C, D, E, F, G, H, I, J ) - KE8(K, L, M, N, O, P, Q, R ) - KE8(S, T, U, V, W, X, Y, Z ) - KE8(DELETE, KP_0, KP_1, KP_2, KP_3, KP_4, KP_5, KP_6 ) - KE8(KP_7, KP_8, KP_9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS ) - KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME ) - KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 ) - KE8(F6, F7, F8, F9, F10, F11, F12, F13 ) - KE8(F14, F15, NUMLOCKCLEAR, CAPSLOCK, SCROLLLOCK, RSHIFT, LSHIFT, RCTRL ) - KE7(LCTRL, RALT, LALT, LGUI, RGUI, KP_DECIMAL, APPLICATION) + KE5(COMMA, MINUS, PERIOD, SLASH, 0 ) + KE8(1, 2, 3, 4, 5, 6, 7, 8 ) + KE5(9, SEMICOLON, EQUALS, PRINTSCREEN, AC_REFRESH) + KE5(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, A, B ) + KE8(C, D, E, F, G, H, I, J ) + KE8(K, L, M, N, O, P, Q, R ) + KE8(S, T, U, V, W, X, Y, Z ) + KE8(DELETE, KP_0, KP_1, KP_2, KP_3, KP_4, KP_5, KP_6 ) + KE8(KP_7, KP_8, KP_9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS ) + KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME ) + KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 ) + KE8(F6, F7, F8, F9, F10, F11, F12, F13 ) + KE8(F14, F15, NUMLOCKCLEAR, CAPSLOCK, SCROLLLOCK, RSHIFT, LSHIFT, RCTRL ) + KE7(LCTRL, RALT, LALT, LGUI, RGUI, KP_DECIMAL, APPLICATION) KE5(MENU, NONUSBACKSLASH, UNDO, APOSTROPHE, GRAVE ) {-1, ""} }; @@ -60,35 +60,35 @@ static key_lookup_table sdl_lookup[] = static key_lookup_table sdl_lookup[] = { - KE8(UNKNOWN, FIRST, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE ) - KE8(SPACE, EXCLAIM, QUOTEDBL, HASH, DOLLAR, AMPERSAND, QUOTE, LEFTPAREN ) - KE8(RIGHTPAREN, ASTERISK, PLUS, COMMA, MINUS, PERIOD, SLASH, 0 ) - KE8(1, 2, 3, 4, 5, 6, 7, 8 ) - KE8(9, COLON, SEMICOLON, LESS, EQUALS, GREATER, QUESTION, AT ) - KE8(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, CARET, UNDERSCORE, BACKQUOTE, a, b ) - KE8(c, d, e, f, g, h, i, j ) - KE8(k, l, m, n, o, p, q, r ) - KE8(s, t, u, v, w, x, y, z ) - KE8(DELETE, WORLD_0, WORLD_1, WORLD_2, WORLD_3, WORLD_4, WORLD_5, WORLD_6 ) - KE8(WORLD_7, WORLD_8, WORLD_9, WORLD_10, WORLD_11, WORLD_12, WORLD_13, WORLD_14 ) - KE8(WORLD_15, WORLD_16, WORLD_17, WORLD_18, WORLD_19, WORLD_20, WORLD_21, WORLD_22 ) - KE8(WORLD_23, WORLD_24, WORLD_25, WORLD_26, WORLD_27, WORLD_28, WORLD_29, WORLD_30 ) - KE8(WORLD_31, WORLD_32, WORLD_33, WORLD_34, WORLD_35, WORLD_36, WORLD_37, WORLD_38 ) - KE8(WORLD_39, WORLD_40, WORLD_41, WORLD_42, WORLD_43, WORLD_44, WORLD_45, WORLD_46 ) - KE8(WORLD_47, WORLD_48, WORLD_49, WORLD_50, WORLD_51, WORLD_52, WORLD_53, WORLD_54 ) - KE8(WORLD_55, WORLD_56, WORLD_57, WORLD_58, WORLD_59, WORLD_60, WORLD_61, WORLD_62 ) - KE8(WORLD_63, WORLD_64, WORLD_65, WORLD_66, WORLD_67, WORLD_68, WORLD_69, WORLD_70 ) - KE8(WORLD_71, WORLD_72, WORLD_73, WORLD_74, WORLD_75, WORLD_76, WORLD_77, WORLD_78 ) - KE8(WORLD_79, WORLD_80, WORLD_81, WORLD_82, WORLD_83, WORLD_84, WORLD_85, WORLD_86 ) - KE8(WORLD_87, WORLD_88, WORLD_89, WORLD_90, WORLD_91, WORLD_92, WORLD_93, WORLD_94 ) - KE8(WORLD_95, KP0, KP1, KP2, KP3, KP4, KP5, KP6 ) - KE8(KP7, KP8, KP9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS ) - KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME ) - KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 ) - KE8(F6, F7, F8, F9, F10, F11, F12, F13 ) - KE8(F14, F15, NUMLOCK, CAPSLOCK, SCROLLOCK, RSHIFT, LSHIFT, RCTRL ) - KE8(LCTRL, RALT, LALT, RMETA, LMETA, LSUPER, RSUPER, MODE ) - KE8(COMPOSE, HELP, PRINT, SYSREQ, BREAK, MENU, POWER, EURO ) + KE8(UNKNOWN, FIRST, BACKSPACE, TAB, CLEAR, RETURN, PAUSE, ESCAPE ) + KE8(SPACE, EXCLAIM, QUOTEDBL, HASH, DOLLAR, AMPERSAND, QUOTE, LEFTPAREN ) + KE8(RIGHTPAREN, ASTERISK, PLUS, COMMA, MINUS, PERIOD, SLASH, 0 ) + KE8(1, 2, 3, 4, 5, 6, 7, 8 ) + KE8(9, COLON, SEMICOLON, LESS, EQUALS, GREATER, QUESTION, AT ) + KE8(LEFTBRACKET,BACKSLASH, RIGHTBRACKET, CARET, UNDERSCORE, BACKQUOTE, a, b ) + KE8(c, d, e, f, g, h, i, j ) + KE8(k, l, m, n, o, p, q, r ) + KE8(s, t, u, v, w, x, y, z ) + KE8(DELETE, WORLD_0, WORLD_1, WORLD_2, WORLD_3, WORLD_4, WORLD_5, WORLD_6 ) + KE8(WORLD_7, WORLD_8, WORLD_9, WORLD_10, WORLD_11, WORLD_12, WORLD_13, WORLD_14 ) + KE8(WORLD_15, WORLD_16, WORLD_17, WORLD_18, WORLD_19, WORLD_20, WORLD_21, WORLD_22 ) + KE8(WORLD_23, WORLD_24, WORLD_25, WORLD_26, WORLD_27, WORLD_28, WORLD_29, WORLD_30 ) + KE8(WORLD_31, WORLD_32, WORLD_33, WORLD_34, WORLD_35, WORLD_36, WORLD_37, WORLD_38 ) + KE8(WORLD_39, WORLD_40, WORLD_41, WORLD_42, WORLD_43, WORLD_44, WORLD_45, WORLD_46 ) + KE8(WORLD_47, WORLD_48, WORLD_49, WORLD_50, WORLD_51, WORLD_52, WORLD_53, WORLD_54 ) + KE8(WORLD_55, WORLD_56, WORLD_57, WORLD_58, WORLD_59, WORLD_60, WORLD_61, WORLD_62 ) + KE8(WORLD_63, WORLD_64, WORLD_65, WORLD_66, WORLD_67, WORLD_68, WORLD_69, WORLD_70 ) + KE8(WORLD_71, WORLD_72, WORLD_73, WORLD_74, WORLD_75, WORLD_76, WORLD_77, WORLD_78 ) + KE8(WORLD_79, WORLD_80, WORLD_81, WORLD_82, WORLD_83, WORLD_84, WORLD_85, WORLD_86 ) + KE8(WORLD_87, WORLD_88, WORLD_89, WORLD_90, WORLD_91, WORLD_92, WORLD_93, WORLD_94 ) + KE8(WORLD_95, KP0, KP1, KP2, KP3, KP4, KP5, KP6 ) + KE8(KP7, KP8, KP9, KP_PERIOD, KP_DIVIDE, KP_MULTIPLY,KP_MINUS, KP_PLUS ) + KE8(KP_ENTER, KP_EQUALS, UP, DOWN, RIGHT, LEFT, INSERT, HOME ) + KE8(END, PAGEUP, PAGEDOWN, F1, F2, F3, F4, F5 ) + KE8(F6, F7, F8, F9, F10, F11, F12, F13 ) + KE8(F14, F15, NUMLOCK, CAPSLOCK, SCROLLOCK, RSHIFT, LSHIFT, RCTRL ) + KE8(LCTRL, RALT, LALT, RMETA, LMETA, LSUPER, RSUPER, MODE ) + KE8(COMPOSE, HELP, PRINT, SYSREQ, BREAK, MENU, POWER, EURO ) KE(UNDO) KE(LAST) {-1, ""} @@ -192,4 +192,3 @@ int main(int argc, char *argv[]) SDL_Quit(); return(0); } - diff --git a/src/osd/sdl/texcopy.c b/src/osd/sdl/texcopy.c index 8a730cad9ad..4330f4f1458 100644 --- a/src/osd/sdl/texcopy.c +++ b/src/osd/sdl/texcopy.c @@ -6,26 +6,26 @@ INLINE UINT32 ycc_to_rgb(unsigned y, unsigned cb, unsigned cr) { /* original equations: - C = Y - 16 - D = Cb - 128 - E = Cr - 128 - - R = clip(( 298 * C + 409 * E + 128) >> 8) - G = clip(( 298 * C - 100 * D - 208 * E + 128) >> 8) - B = clip(( 298 * C + 516 * D + 128) >> 8) - - R = clip(( 298 * (Y - 16) + 409 * (Cr - 128) + 128) >> 8) - G = clip(( 298 * (Y - 16) - 100 * (Cb - 128) - 208 * (Cr - 128) + 128) >> 8) - B = clip(( 298 * (Y - 16) + 516 * (Cb - 128) + 128) >> 8) - - R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8) - G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8) - B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8) - - R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8) - G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8) - B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8) - */ + C = Y - 16 + D = Cb - 128 + E = Cr - 128 + + R = clip(( 298 * C + 409 * E + 128) >> 8) + G = clip(( 298 * C - 100 * D - 208 * E + 128) >> 8) + B = clip(( 298 * C + 516 * D + 128) >> 8) + + R = clip(( 298 * (Y - 16) + 409 * (Cr - 128) + 128) >> 8) + G = clip(( 298 * (Y - 16) - 100 * (Cb - 128) - 208 * (Cr - 128) + 128) >> 8) + B = clip(( 298 * (Y - 16) + 516 * (Cb - 128) + 128) >> 8) + + R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8) + G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8) + B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8) + + R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8) + G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8) + B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8) + */ //int r, g, b, common; unsigned int r, g, b, common; @@ -68,7 +68,7 @@ static void init_clamp(void) } } -INLINE int clamp(int x) { return (const int) clamp_lu[(x >> 8) + 128] ; } +INLINE int clamp(int x) { return (const int) clamp_lu[(x >> 8) + 128] ; } INLINE UINT32 ycc_to_rgb(unsigned y, unsigned cb, unsigned cr) { diff --git a/src/osd/sdl/texsrc.h b/src/osd/sdl/texsrc.h index e4e18a84edb..7e31ea79a21 100644 --- a/src/osd/sdl/texsrc.h +++ b/src/osd/sdl/texsrc.h @@ -42,8 +42,8 @@ #define TEXSRC_TYPE UINT32 #define TEXSRC_TO_DEST(src) \ (texsource->palette[0x200 + RGB_RED(src)] | \ - texsource->palette[0x100 + RGB_GREEN(src)] | \ - texsource->palette[RGB_BLUE(src)] | 0xff000000) + texsource->palette[0x100 + RGB_GREEN(src)] | \ + texsource->palette[RGB_BLUE(src)] | 0xff000000) #define FUNC_NAME(name) name ## _rgb32_paletted #elif SDL_TEXFORMAT == SDL_TEXFORMAT_PALETTE16 #define DEST_TYPE UINT32 @@ -91,8 +91,8 @@ #define TEXSRC_TYPE UINT16 #define TEXSRC_TO_DEST(src) \ ((texsource->palette[src]&0xf80000) >> 9 | \ - (texsource->palette[src]&0x00f800) >> 6 | \ - (texsource->palette[src]&0x0000f8) >> 3 | 0x8000) + (texsource->palette[src]&0x00f800) >> 6 | \ + (texsource->palette[src]&0x0000f8) >> 3 | 0x8000) #define FUNC_NAME(name) name ## _palette16_argb1555 #elif SDL_TEXFORMAT == SDL_TEXFORMAT_RGB15_ARGB1555 #define DEST_TYPE UINT16 @@ -106,8 +106,8 @@ #define TEXSRC_TYPE UINT16 #define TEXSRC_TO_DEST(src) \ ((texsource->palette[(src) >> 10] & 0xf8) << 7 | \ - (texsource->palette[((src) >> 5) & 0x1f] & 0xf8) << 2 | \ - (texsource->palette[(src) & 0x1f] & 0xf8) >> 3 | 0x8000) + (texsource->palette[((src) >> 5) & 0x1f] & 0xf8) << 2 | \ + (texsource->palette[(src) & 0x1f] & 0xf8) >> 3 | 0x8000) #define FUNC_NAME(name) name ## _rgb15_paletted_argb1555 #else #error Unknown SRC_TEXFORMAT diff --git a/src/osd/sdl/video.c b/src/osd/sdl/video.c index cf655bef8a2..a3e00eab271 100644 --- a/src/osd/sdl/video.c +++ b/src/osd/sdl/video.c @@ -168,16 +168,16 @@ void sdlvideo_monitor_refresh(sdl_monitor_info *monitor) monitor->center_width = dmode.w; monitor->center_height = dmode.h; #else - #if defined(SDLMAME_WIN32) // Win32 version + #if defined(SDLMAME_WIN32) // Win32 version MONITORINFOEX info; info.cbSize = sizeof(info); - GetMonitorInfo((HMONITOR)monitor->handle, (LPMONITORINFO)&info); + GetMonitorInfo((HMONITOR)monitor->handle, (LPMONITORINFO)&info); monitor->center_width = monitor->monitor_width = info.rcMonitor.right - info.rcMonitor.left; monitor->center_height = monitor->monitor_height = info.rcMonitor.bottom - info.rcMonitor.top; char *temp = utf8_from_wstring(info.szDevice); strcpy(monitor->monitor_device, temp); osd_free(temp); - #elif defined(SDLMAME_MACOSX) // Mac OS X Core Imaging version + #elif defined(SDLMAME_MACOSX) // Mac OS X Core Imaging version CGDirectDisplayID primary; CGRect dbounds; @@ -188,7 +188,7 @@ void sdlvideo_monitor_refresh(sdl_monitor_info *monitor) monitor->center_width = monitor->monitor_width = dbounds.size.width - dbounds.origin.x; monitor->center_height = monitor->monitor_height = dbounds.size.height - dbounds.origin.y; strcpy(monitor->monitor_device, "Mac OS X display"); - #elif defined(SDLMAME_X11) || defined(SDLMAME_NO_X11) // X11 version + #elif defined(SDLMAME_X11) || defined(SDLMAME_NO_X11) // X11 version { #if defined(SDLMAME_X11) // X11 version @@ -208,7 +208,7 @@ void sdlvideo_monitor_refresh(sdl_monitor_info *monitor) XineramaScreenInfo *xineinfo; int numscreens; - xineinfo = XineramaQueryScreens(info.info.x11.display, &numscreens); + xineinfo = XineramaQueryScreens(info.info.x11.display, &numscreens); monitor->center_width = xineinfo[0].width; monitor->center_height = xineinfo[0].height; @@ -262,7 +262,7 @@ void sdlvideo_monitor_refresh(sdl_monitor_info *monitor) monitor->center_height = ch; } } - #elif defined(SDLMAME_OS2) // OS2 version + #elif defined(SDLMAME_OS2) // OS2 version monitor->center_width = monitor->monitor_width = WinQuerySysValue( HWND_DESKTOP, SV_CXSCREEN ); monitor->center_height = monitor->monitor_height = WinQuerySysValue( HWND_DESKTOP, SV_CYSCREEN ); strcpy(monitor->monitor_device, "OS/2 display"); @@ -401,9 +401,9 @@ static BOOL CALLBACK monitor_enum_callback(HMONITOR handle, HDC dc, LPRECT rect, // copy in the data #ifdef PTR64 - monitor->handle = (UINT64)handle; + monitor->handle = (UINT64)handle; #else - monitor->handle = (UINT32)handle; + monitor->handle = (UINT32)handle; #endif monitor->monitor_width = info.rcMonitor.right - info.rcMonitor.left; monitor->monitor_height = info.rcMonitor.bottom - info.rcMonitor.top; @@ -463,14 +463,14 @@ static void init_monitors(void) monitor->monitor_height = dmode.h; monitor->center_width = dmode.w; monitor->center_height = dmode.h; - monitor->handle = i; - // guess the aspect ratio assuming square pixels - monitor->aspect = (float)(dmode.w) / (float)(dmode.h); - mame_printf_verbose("Adding monitor %s (%d x %d)\n", monitor->monitor_device, dmode.w, dmode.h); + monitor->handle = i; + // guess the aspect ratio assuming square pixels + monitor->aspect = (float)(dmode.w) / (float)(dmode.h); + mame_printf_verbose("Adding monitor %s (%d x %d)\n", monitor->monitor_device, dmode.w, dmode.h); - // save the primary monitor handle - if (i == 0) - primary_monitor = monitor; + // save the primary monitor handle + if (i == 0) + primary_monitor = monitor; // hook us into the list *tailptr = monitor; @@ -515,7 +515,7 @@ static sdl_monitor_info *pick_monitor(sdl_options &options, int index) // didn't find it; alternate monitors until we hit the jackpot index %= moncount; - for (monitor = sdl_monitor_list; monitor != NULL; monitor = monitor->next) + for (monitor = sdl_monitor_list; monitor != NULL; monitor = monitor->next) if (index-- == 0) goto finishit; @@ -830,4 +830,3 @@ static void get_resolution(const char *defdata, const char *data, sdl_window_con if (sscanf(data, "%dx%dx%d@%d", &config->width, &config->height, &config->depth, &config->refresh) < 2 && report_error) mame_printf_error("Illegal resolution value = %s\n", data); } - diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h index 38648c68ee8..fbe998a1787 100644 --- a/src/osd/sdl/video.h +++ b/src/osd/sdl/video.h @@ -16,33 +16,33 @@ // CONSTANTS //============================================================ -#define MAX_VIDEO_WINDOWS (4) +#define MAX_VIDEO_WINDOWS (4) enum { - VIDEO_MODE_SOFT = 0, + VIDEO_MODE_SOFT = 0, VIDEO_MODE_OPENGL, VIDEO_MODE_SDL13 }; -#define VIDEO_SCALE_MODE_NONE (0) +#define VIDEO_SCALE_MODE_NONE (0) // texture formats // This used to be an enum, but these are now defines so we can use them as // preprocessor conditionals -#define SDL_TEXFORMAT_ARGB32 (0) // non-16-bit textures or specials -#define SDL_TEXFORMAT_RGB32 (1) -#define SDL_TEXFORMAT_RGB32_PALETTED (2) -#define SDL_TEXFORMAT_YUY16 (3) -#define SDL_TEXFORMAT_YUY16_PALETTED (4) -#define SDL_TEXFORMAT_PALETTE16 (5) -#define SDL_TEXFORMAT_RGB15 (6) -#define SDL_TEXFORMAT_RGB15_PALETTED (7) -#define SDL_TEXFORMAT_PALETTE16A (8) +#define SDL_TEXFORMAT_ARGB32 (0) // non-16-bit textures or specials +#define SDL_TEXFORMAT_RGB32 (1) +#define SDL_TEXFORMAT_RGB32_PALETTED (2) +#define SDL_TEXFORMAT_YUY16 (3) +#define SDL_TEXFORMAT_YUY16_PALETTED (4) +#define SDL_TEXFORMAT_PALETTE16 (5) +#define SDL_TEXFORMAT_RGB15 (6) +#define SDL_TEXFORMAT_RGB15_PALETTED (7) +#define SDL_TEXFORMAT_PALETTE16A (8) // special texture formats for 16bpp texture destination support, do not use // to address the tex properties / tex functions arrays! -#define SDL_TEXFORMAT_PALETTE16_ARGB1555 (16) -#define SDL_TEXFORMAT_RGB15_ARGB1555 (17) -#define SDL_TEXFORMAT_RGB15_PALETTED_ARGB1555 (18) +#define SDL_TEXFORMAT_PALETTE16_ARGB1555 (16) +#define SDL_TEXFORMAT_RGB15_ARGB1555 (17) +#define SDL_TEXFORMAT_RGB15_PALETTED_ARGB1555 (18) #define GLSL_SHADER_MAX 10 @@ -52,86 +52,86 @@ enum { struct sdl_mode { - int width; - int height; + int width; + int height; }; struct sdl_monitor_info { - sdl_monitor_info * next; // pointer to next monitor in list + sdl_monitor_info * next; // pointer to next monitor in list #ifdef PTR64 - UINT64 handle; // handle to the monitor + UINT64 handle; // handle to the monitor #else - UINT32 handle; // handle to the monitor + UINT32 handle; // handle to the monitor #endif - int monitor_width; - int monitor_height; - char monitor_device[64]; - float aspect; // computed/configured aspect ratio of the physical device - int center_width; // width of first physical screen for centering - int center_height; // height of first physical screen for centering + int monitor_width; + int monitor_height; + char monitor_device[64]; + float aspect; // computed/configured aspect ratio of the physical device + int center_width; // width of first physical screen for centering + int center_height; // height of first physical screen for centering }; struct sdl_window_config { - float aspect; // decoded aspect ratio - int width; // decoded width - int height; // decoded height - int depth; // decoded depth - int refresh; // decoded refresh + float aspect; // decoded aspect ratio + int width; // decoded width + int height; // decoded height + int depth; // decoded depth + int refresh; // decoded refresh - int totalColors; // total colors from machine + int totalColors; // total colors from machine }; struct sdl_video_config { // performance options - int novideo; // don't draw, for pure CPU benchmarking + int novideo; // don't draw, for pure CPU benchmarking // global configuration - int windowed; // start windowed? - int prescale; // prescale factor (not currently supported) - int keepaspect; // keep aspect ratio? - int numscreens; // number of screens - int centerh; - int centerv; + int windowed; // start windowed? + int prescale; // prescale factor (not currently supported) + int keepaspect; // keep aspect ratio? + int numscreens; // number of screens + int centerh; + int centerv; // hardware options - int mode; // output mode - int waitvsync; // spin until vsync - int syncrefresh; // sync only to refresh rate - int switchres; // switch resolutions + int mode; // output mode + int waitvsync; // spin until vsync + int syncrefresh; // sync only to refresh rate + int switchres; // switch resolutions - int fullstretch; + int fullstretch; // vector options - float beamwidth; // beam width + float beamwidth; // beam width // OpenGL options - int filter; // enable filtering, disabled if glsl_filter>0 - int prefer16bpp_tex; - int glsl; - int glsl_filter; // glsl filtering, >0 disables filter + int filter; // enable filtering, disabled if glsl_filter>0 + int prefer16bpp_tex; + int glsl; + int glsl_filter; // glsl filtering, >0 disables filter char * glsl_shader_mamebm[GLSL_SHADER_MAX]; // custom glsl shader set, mame bitmap - int glsl_shader_mamebm_num; // custom glsl shader set number, mame bitmap + int glsl_shader_mamebm_num; // custom glsl shader set number, mame bitmap char * glsl_shader_scrn[GLSL_SHADER_MAX]; // custom glsl shader set, screen bitmap - int glsl_shader_scrn_num; // custom glsl shader number, screen bitmap - int glsl_vid_attributes; // glsl brightness, contrast and gamma for RGB bitmaps - int pbo; - int vbo; - int allowtexturerect; // allow GL_ARB_texture_rectangle, default: no - int forcepow2texture; // force power of two textures, default: no + int glsl_shader_scrn_num; // custom glsl shader number, screen bitmap + int glsl_vid_attributes; // glsl brightness, contrast and gamma for RGB bitmaps + int pbo; + int vbo; + int allowtexturerect; // allow GL_ARB_texture_rectangle, default: no + int forcepow2texture; // force power of two textures, default: no // perftest - int perftest; // print out real video fps + int perftest; // print out real video fps // X11 options - int restrictonemonitor; // in fullscreen, confine to Xinerama monitor 0 + int restrictonemonitor; // in fullscreen, confine to Xinerama monitor 0 // YUV options - int scale_mode; + int scale_mode; }; //============================================================ diff --git a/src/osd/sdl/watchdog.h b/src/osd/sdl/watchdog.h index e1c762c7a8d..1d370ec4ac0 100644 --- a/src/osd/sdl/watchdog.h +++ b/src/osd/sdl/watchdog.h @@ -21,15 +21,15 @@ public: void reset() { osd_event_set(m_event); } - osd_event * event(void) { return m_event; } - INT32 do_exit(void) { return m_do_exit; } - osd_ticks_t getTimeout(void) { return m_timeout; } - void setTimeout(int timeout); + osd_event * event(void) { return m_event; } + INT32 do_exit(void) { return m_do_exit; } + osd_ticks_t getTimeout(void) { return m_timeout; } + void setTimeout(int timeout); private: - osd_event * m_event; - osd_thread * m_thread; - volatile INT32 m_do_exit; + osd_event * m_event; + osd_thread * m_thread; + volatile INT32 m_do_exit; - osd_ticks_t m_timeout; + osd_ticks_t m_timeout; }; #endif diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c index ada463b042d..7dc903aa414 100644 --- a/src/osd/sdl/window.c +++ b/src/osd/sdl/window.c @@ -40,35 +40,35 @@ //============================================================ // these are arbitrary values since AFAIK there's no way to make X/SDL tell you -#define WINDOW_DECORATION_WIDTH (8) // should be more than plenty -#define WINDOW_DECORATION_HEIGHT (48) // title bar + bottom drag region +#define WINDOW_DECORATION_WIDTH (8) // should be more than plenty +#define WINDOW_DECORATION_HEIGHT (48) // title bar + bottom drag region #ifdef MAME_DEBUG //#define ASSERT_USE(x) do { printf("%x %x\n", (int) SDL_ThreadID(), x); assert_always(SDL_ThreadID() == x, "Wrong Thread"); } while (0) -#define ASSERT_USE(x) do { SDL_threadID _thid = SDL_ThreadID(); assert_always( _thid == x, "Wrong Thread"); } while (0) +#define ASSERT_USE(x) do { SDL_threadID _thid = SDL_ThreadID(); assert_always( _thid == x, "Wrong Thread"); } while (0) #else -#define ASSERT_USE(x) do {} while (0) +#define ASSERT_USE(x) do {} while (0) //#define ASSERT_USE(x) assert(SDL_ThreadID() == x) #endif -#define ASSERT_REDRAW_THREAD() ASSERT_USE(window_threadid) -#define ASSERT_WINDOW_THREAD() ASSERT_USE(window_threadid) -#define ASSERT_MAIN_THREAD() ASSERT_USE(main_threadid) +#define ASSERT_REDRAW_THREAD() ASSERT_USE(window_threadid) +#define ASSERT_WINDOW_THREAD() ASSERT_USE(window_threadid) +#define ASSERT_MAIN_THREAD() ASSERT_USE(main_threadid) -#define OSDWORK_CALLBACK(name) void *name(void *param, ATTR_UNUSED int threadid) +#define OSDWORK_CALLBACK(name) void *name(void *param, ATTR_UNUSED int threadid) // minimum window dimension -#define MIN_WINDOW_DIM 200 +#define MIN_WINDOW_DIM 200 #ifndef SDLMAME_WIN32 -#define WMSZ_TOP (0) -#define WMSZ_BOTTOM (1) -#define WMSZ_BOTTOMLEFT (2) -#define WMSZ_BOTTOMRIGHT (3) -#define WMSZ_LEFT (4) -#define WMSZ_TOPLEFT (5) -#define WMSZ_TOPRIGHT (6) -#define WMSZ_RIGHT (7) +#define WMSZ_TOP (0) +#define WMSZ_BOTTOM (1) +#define WMSZ_BOTTOMLEFT (2) +#define WMSZ_BOTTOMRIGHT (3) +#define WMSZ_LEFT (4) +#define WMSZ_TOPLEFT (5) +#define WMSZ_TOPRIGHT (6) +#define WMSZ_RIGHT (7) #endif //============================================================ @@ -242,7 +242,7 @@ int sdlwindow_init(running_machine &machine) video_config.mode = VIDEO_MODE_SOFT; } #endif -#if SDLMAME_SDL2 +#if SDLMAME_SDL2 if (video_config.mode == VIDEO_MODE_SDL13) { if (draw13_init(machine, &draw)) @@ -362,8 +362,8 @@ void sdlwindow_blit_surface_size(sdl_window_info *window, int window_width, int desired_aspect = (float)target_width / (float)target_height; } - // non-integer scaling - often gives more pleasing results in full screen - if (!video_config.fullstretch) + // non-integer scaling - often gives more pleasing results in full screen + if (!video_config.fullstretch) { // compute maximum integral scaling to fit the window xscale = (target_width + 2) / newwidth; @@ -409,7 +409,7 @@ void sdlwindow_blit_surface_size(sdl_window_info *window, int window_width, int newheight = target_height; } - //FIXME: really necessary to distinguish for yuv_modes ? + //FIXME: really necessary to distinguish for yuv_modes ? if (window->target->zoom_to_screen() && (video_config.scale_mode == VIDEO_SCALE_MODE_NONE )) newwidth = window_width; @@ -429,8 +429,8 @@ void sdlwindow_blit_surface_size(sdl_window_info *window, int window_width, int static OSDWORK_CALLBACK( sdlwindow_resize_wt ) { - worker_param * wp = (worker_param *) param; - sdl_window_info * window = wp->window; + worker_param * wp = (worker_param *) param; + sdl_window_info * window = wp->window; ASSERT_WINDOW_THREAD(); @@ -753,8 +753,8 @@ error: static OSDWORK_CALLBACK( sdlwindow_video_window_destroy_wt ) { - worker_param * wp = (worker_param *) param; - sdl_window_info * window = wp->window; + worker_param * wp = (worker_param *) param; + sdl_window_info * window = wp->window; ASSERT_WINDOW_THREAD(); @@ -901,10 +901,10 @@ static void pick_best_mode(sdl_window_info *window, int *fswidth, int *fsheight) #if 1 // defined(SDLMAME_WIN32) /* - * We need to do this here. If SDL_ListModes is - * called in init_monitors, the call will crash - * on win32 - */ + * We need to do this here. If SDL_ListModes is + * called in init_monitors, the call will crash + * on win32 + */ modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_DOUBLEBUF); #else modes = window->monitor->modes; @@ -915,7 +915,7 @@ static void pick_best_mode(sdl_window_info *window, int *fswidth, int *fsheight) mame_printf_error("SDL: No modes available?!\n"); exit(-1); } - else if (modes == (SDL_Rect **)-1) // all modes are possible + else if (modes == (SDL_Rect **)-1) // all modes are possible { *fswidth = window->maxwidth; *fsheight = window->maxheight; @@ -962,7 +962,7 @@ static void pick_best_mode(sdl_window_info *window, int *fswidth, int *fsheight) void sdlwindow_video_window_update(running_machine &machine, sdl_window_info *window) { - osd_ticks_t event_wait_ticks; + osd_ticks_t event_wait_ticks; ASSERT_MAIN_THREAD(); // adjust the cursor state @@ -1049,8 +1049,8 @@ static void set_starting_view(running_machine &machine, int index, sdl_window_in static OSDWORK_CALLBACK( complete_create_wt ) { - worker_param * wp = (worker_param *) param; - sdl_window_info * window = wp->window; + worker_param * wp = (worker_param *) param; + sdl_window_info * window = wp->window; int tempwidth, tempheight; static int result[2] = {0,1}; @@ -1084,9 +1084,9 @@ static OSDWORK_CALLBACK( complete_create_wt ) else { /* Create the window directly with the correct aspect - instead of letting sdlwindow_blit_surface_size() resize it - this stops the window from "flashing" from the wrong aspect - size to the right one at startup. */ + instead of letting sdlwindow_blit_surface_size() resize it + this stops the window from "flashing" from the wrong aspect + size to the right one at startup. */ tempwidth = (window->maxwidth != 0) ? window->maxwidth : 640; tempheight = (window->maxheight != 0) ? window->maxheight : 480; @@ -1138,16 +1138,16 @@ static void measure_fps(sdl_window_info *window, UINT32 dc, int update) { dt = (double) (currentTime-startTime) / tps; // in decimale sec. mame_printf_info("%6.2lfs, %4lu F, " - "avrg game: %5.2lf FPS %.2lf ms/f, " - "avrg video: %5.2lf FPS %.2lf ms/f, " - "last video: %5.2lf FPS %.2lf ms/f\n", - dt, frames-frames_skip4fps, - (double)(frames-frames_skip4fps)/dt, // avrg game fps - ( (currentTime-startTime) / ((frames-frames_skip4fps)) ) * 1000.0 / osd_ticks_per_second(), - (double)(frames-frames_skip4fps)/((double)(sumdt) / tps), // avrg vid fps - ( sumdt / ((frames-frames_skip4fps)) ) * 1000.0 / tps, - 1.0/((currentTime-t0) / osd_ticks_per_second()), // this vid fps - (currentTime-t0) * 1000.0 / tps + "avrg game: %5.2lf FPS %.2lf ms/f, " + "avrg video: %5.2lf FPS %.2lf ms/f, " + "last video: %5.2lf FPS %.2lf ms/f\n", + dt, frames-frames_skip4fps, + (double)(frames-frames_skip4fps)/dt, // avrg game fps + ( (currentTime-startTime) / ((frames-frames_skip4fps)) ) * 1000.0 / osd_ticks_per_second(), + (double)(frames-frames_skip4fps)/((double)(sumdt) / tps), // avrg vid fps + ( sumdt / ((frames-frames_skip4fps)) ) * 1000.0 / tps, + 1.0/((currentTime-t0) / osd_ticks_per_second()), // this vid fps + (currentTime-t0) * 1000.0 / tps ); lastTime = currentTime; } @@ -1155,8 +1155,8 @@ static void measure_fps(sdl_window_info *window, UINT32 dc, int update) static OSDWORK_CALLBACK( draw_video_contents_wt ) { - UINT32 dc = 0; - int update = 1; + UINT32 dc = 0; + int update = 1; worker_param *wp = (worker_param *) param; sdl_window_info *window = wp->window; @@ -1361,4 +1361,3 @@ static void get_max_bounds(sdl_window_info *window, int *window_width, int *wind *window_height = maxheight; } } - diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h index 352ed0d17e4..b5f9e07d2ab 100644 --- a/src/osd/sdl/window.h +++ b/src/osd/sdl/window.h @@ -35,11 +35,11 @@ typedef UINT32 HashT; struct sdl_window_info { // Pointer to next window - sdl_window_info * next; + sdl_window_info * next; // Pointer to machine running_machine &machine() const { assert(m_machine != NULL); return *m_machine; } - running_machine * m_machine; + running_machine * m_machine; // Draw Callbacks int (*create)(sdl_window_info *window, int width, int height); @@ -52,51 +52,51 @@ struct sdl_window_info void (*clear)(sdl_window_info *window); // window handle and info - char title[256]; + char title[256]; // monitor info - sdl_monitor_info * monitor; - int fullscreen; - int index; + sdl_monitor_info * monitor; + int fullscreen; + int index; // diverse flags - int minwidth, minheight; - int maxwidth, maxheight; - int depth; - int refresh; - int windowed_width; - int windowed_height; - int startmaximized; + int minwidth, minheight; + int maxwidth, maxheight; + int depth; + int refresh; + int windowed_width; + int windowed_height; + int startmaximized; // rendering info - osd_event * rendered_event; - render_target * target; + osd_event * rendered_event; + render_target * target; render_primitive_list *primlist; // drawing data - void * dxdata; + void * dxdata; // cache of physical width and height - int width; - int height; + int width; + int height; // current blitwidth and height - int blitwidth; - int blitheight; + int blitwidth; + int blitheight; - int totalColors; // total colors from machine/sdl_window_config - int start_viewscreen; + int totalColors; // total colors from machine/sdl_window_config + int start_viewscreen; // GL specific - int prescale; + int prescale; #if (SDLMAME_SDL2) // Needs to be here as well so we can identify window - SDL_Window *sdl_window; + SDL_Window *sdl_window; // These are used in combine resizing events ... #if SDL13_COMBINE_RESIZE - int resize_width; - int resize_height; - osd_ticks_t last_resize; + int resize_width; + int resize_height; + osd_ticks_t last_resize; #endif }; diff --git a/src/osd/windows/d3d8intf.c b/src/osd/windows/d3d8intf.c index 3352141d838..fa408d8cf65 100644 --- a/src/osd/windows/d3d8intf.c +++ b/src/osd/windows/d3d8intf.c @@ -238,20 +238,20 @@ static HRESULT d3d_get_caps_dword(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE dev HRESULT result = IDirect3D8_GetDeviceCaps(d3d8, adapter, devtype, &caps); switch (which) { - case CAPS_PRESENTATION_INTERVALS: *value = caps.PresentationIntervals; break; - case CAPS_CAPS2: *value = caps.DevCaps; break; - case CAPS_DEV_CAPS: *value = caps.DevCaps; break; - case CAPS_SRCBLEND_CAPS: *value = caps.SrcBlendCaps; break; - case CAPS_DSTBLEND_CAPS: *value = caps.DestBlendCaps; break; - case CAPS_TEXTURE_CAPS: *value = caps.TextureCaps; break; - case CAPS_TEXTURE_FILTER_CAPS: *value = caps.TextureFilterCaps; break; - case CAPS_TEXTURE_ADDRESS_CAPS: *value = caps.TextureAddressCaps; break; - case CAPS_TEXTURE_OP_CAPS: *value = caps.TextureOpCaps; break; - case CAPS_MAX_TEXTURE_ASPECT: *value = caps.MaxTextureAspectRatio; break; - case CAPS_MAX_TEXTURE_WIDTH: *value = caps.MaxTextureWidth; break; - case CAPS_MAX_TEXTURE_HEIGHT: *value = caps.MaxTextureHeight; break; - case CAPS_STRETCH_RECT_FILTER: *value = 0; break; - case CAPS_MAX_PS30_INSN_SLOTS: *value = 0; break; + case CAPS_PRESENTATION_INTERVALS: *value = caps.PresentationIntervals; break; + case CAPS_CAPS2: *value = caps.DevCaps; break; + case CAPS_DEV_CAPS: *value = caps.DevCaps; break; + case CAPS_SRCBLEND_CAPS: *value = caps.SrcBlendCaps; break; + case CAPS_DSTBLEND_CAPS: *value = caps.DestBlendCaps; break; + case CAPS_TEXTURE_CAPS: *value = caps.TextureCaps; break; + case CAPS_TEXTURE_FILTER_CAPS: *value = caps.TextureFilterCaps; break; + case CAPS_TEXTURE_ADDRESS_CAPS: *value = caps.TextureAddressCaps; break; + case CAPS_TEXTURE_OP_CAPS: *value = caps.TextureOpCaps; break; + case CAPS_MAX_TEXTURE_ASPECT: *value = caps.MaxTextureAspectRatio; break; + case CAPS_MAX_TEXTURE_WIDTH: *value = caps.MaxTextureWidth; break; + case CAPS_MAX_TEXTURE_HEIGHT: *value = caps.MaxTextureHeight; break; + case CAPS_STRETCH_RECT_FILTER: *value = 0; break; + case CAPS_MAX_PS30_INSN_SLOTS: *value = 0; break; } return result; } diff --git a/src/osd/windows/d3d9intf.c b/src/osd/windows/d3d9intf.c index a4975f7e5c0..dc15f8f4d29 100644 --- a/src/osd/windows/d3d9intf.c +++ b/src/osd/windows/d3d9intf.c @@ -263,20 +263,20 @@ static HRESULT d3d_get_caps_dword(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE dev HRESULT result = IDirect3D9_GetDeviceCaps(d3d9, adapter, devtype, &caps); switch (which) { - case CAPS_PRESENTATION_INTERVALS: *value = caps.PresentationIntervals; break; - case CAPS_CAPS2: *value = caps.Caps2; break; - case CAPS_DEV_CAPS: *value = caps.DevCaps; break; - case CAPS_SRCBLEND_CAPS: *value = caps.SrcBlendCaps; break; - case CAPS_DSTBLEND_CAPS: *value = caps.DestBlendCaps; break; - case CAPS_TEXTURE_CAPS: *value = caps.TextureCaps; break; - case CAPS_TEXTURE_FILTER_CAPS: *value = caps.TextureFilterCaps; break; - case CAPS_TEXTURE_ADDRESS_CAPS: *value = caps.TextureAddressCaps; break; - case CAPS_TEXTURE_OP_CAPS: *value = caps.TextureOpCaps; break; - case CAPS_MAX_TEXTURE_ASPECT: *value = caps.MaxTextureAspectRatio; break; - case CAPS_MAX_TEXTURE_WIDTH: *value = caps.MaxTextureWidth; break; - case CAPS_MAX_TEXTURE_HEIGHT: *value = caps.MaxTextureHeight; break; - case CAPS_STRETCH_RECT_FILTER: *value = caps.StretchRectFilterCaps; break; - case CAPS_MAX_PS30_INSN_SLOTS: *value = caps.MaxPixelShader30InstructionSlots; break; + case CAPS_PRESENTATION_INTERVALS: *value = caps.PresentationIntervals; break; + case CAPS_CAPS2: *value = caps.Caps2; break; + case CAPS_DEV_CAPS: *value = caps.DevCaps; break; + case CAPS_SRCBLEND_CAPS: *value = caps.SrcBlendCaps; break; + case CAPS_DSTBLEND_CAPS: *value = caps.DestBlendCaps; break; + case CAPS_TEXTURE_CAPS: *value = caps.TextureCaps; break; + case CAPS_TEXTURE_FILTER_CAPS: *value = caps.TextureFilterCaps; break; + case CAPS_TEXTURE_ADDRESS_CAPS: *value = caps.TextureAddressCaps; break; + case CAPS_TEXTURE_OP_CAPS: *value = caps.TextureOpCaps; break; + case CAPS_MAX_TEXTURE_ASPECT: *value = caps.MaxTextureAspectRatio; break; + case CAPS_MAX_TEXTURE_WIDTH: *value = caps.MaxTextureWidth; break; + case CAPS_MAX_TEXTURE_HEIGHT: *value = caps.MaxTextureHeight; break; + case CAPS_STRETCH_RECT_FILTER: *value = caps.StretchRectFilterCaps; break; + case CAPS_MAX_PS30_INSN_SLOTS: *value = caps.MaxPixelShader30InstructionSlots; break; } return result; } diff --git a/src/osd/windows/d3dcomm.h b/src/osd/windows/d3dcomm.h index fedcd6ebbac..806e4aa7a17 100644 --- a/src/osd/windows/d3dcomm.h +++ b/src/osd/windows/d3dcomm.h @@ -55,55 +55,55 @@ /* d3d_texture_info holds information about a texture */ struct d3d_texture_info { - d3d_texture_info * next; // next texture in the list - d3d_texture_info * prev; // prev texture in the list - UINT32 hash; // hash value for the texture - UINT32 flags; // rendering flags - render_texinfo texinfo; // copy of the texture info - float ustart, ustop; // beginning/ending U coordinates - float vstart, vstop; // beginning/ending V coordinates - int rawwidth, rawheight; // raw width/height of the texture - int type; // what type of texture are we? - int xborderpix; // number of border pixels in X - int yborderpix; // number of border pixels in Y - int xprescale; // what is our X prescale factor? - int yprescale; // what is our Y prescale factor? - int cur_frame; // what is our current frame? - int prev_frame; // what was our last frame? (used to determine pause state) - d3d_texture * d3dtex; // Direct3D texture pointer - d3d_surface * d3dsurface; // Direct3D offscreen plain surface pointer - d3d_texture * d3dfinaltex; // Direct3D final (post-scaled) texture - int target_index; // Direct3D target index + d3d_texture_info * next; // next texture in the list + d3d_texture_info * prev; // prev texture in the list + UINT32 hash; // hash value for the texture + UINT32 flags; // rendering flags + render_texinfo texinfo; // copy of the texture info + float ustart, ustop; // beginning/ending U coordinates + float vstart, vstop; // beginning/ending V coordinates + int rawwidth, rawheight; // raw width/height of the texture + int type; // what type of texture are we? + int xborderpix; // number of border pixels in X + int yborderpix; // number of border pixels in Y + int xprescale; // what is our X prescale factor? + int yprescale; // what is our Y prescale factor? + int cur_frame; // what is our current frame? + int prev_frame; // what was our last frame? (used to determine pause state) + d3d_texture * d3dtex; // Direct3D texture pointer + d3d_surface * d3dsurface; // Direct3D offscreen plain surface pointer + d3d_texture * d3dfinaltex; // Direct3D final (post-scaled) texture + int target_index; // Direct3D target index }; /* d3d_poly_info holds information about a single polygon/d3d primitive */ struct d3d_poly_info { - D3DPRIMITIVETYPE type; // type of primitive - UINT32 count; // total number of primitives - UINT32 numverts; // total number of vertices - UINT32 flags; // rendering flags - DWORD modmode; // texture modulation mode - d3d_texture_info * texture; // pointer to texture info + D3DPRIMITIVETYPE type; // type of primitive + UINT32 count; // total number of primitives + UINT32 numverts; // total number of vertices + UINT32 flags; // rendering flags + DWORD modmode; // texture modulation mode + d3d_texture_info * texture; // pointer to texture info }; /* d3d_vertex describes a single vertex */ struct d3d_vertex { - float x, y, z; // X,Y,Z coordinates - float rhw; // RHW when no HLSL, padding when HLSL - D3DCOLOR color; // diffuse color - float u0, v0; // texture stage 0 coordinates + float x, y, z; // X,Y,Z coordinates + float rhw; // RHW when no HLSL, padding when HLSL + D3DCOLOR color; // diffuse color + float u0, v0; // texture stage 0 coordinates }; /* line_aa_step is used for drawing antialiased lines */ struct line_aa_step { - float xoffs, yoffs; // X/Y deltas - float weight; // weight contribution + float xoffs, yoffs; // X/Y deltas + float weight; // weight contribution }; diff --git a/src/osd/windows/d3dhlsl.c b/src/osd/windows/d3dhlsl.c index b316642db90..f21312217f4 100644 --- a/src/osd/windows/d3dhlsl.c +++ b/src/osd/windows/d3dhlsl.c @@ -85,7 +85,7 @@ static hlsl_options g_hlsl_presets[4] = { - { // 25% Shadow mask, 50% Scanlines, 3% Pincushion, 0 defocus, No Tint, 0.9 Exponent, 5% Floor, 25% Phosphor Return, 120% Saturation + { // 25% Shadow mask, 50% Scanlines, 3% Pincushion, 0 defocus, No Tint, 0.9 Exponent, 5% Floor, 25% Phosphor Return, 120% Saturation true, 0.25f, { "aperture.png" }, 320, 240, 0.09375f, 0.109375f, 0.03f, 0.03f, @@ -106,7 +106,7 @@ static hlsl_options g_hlsl_presets[4] = 1.2f, false, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0 }, - { // 25% Shadow mask, 0% Scanlines, 3% Pincushion, 0 defocus, No Tint, 0.9 Exponent, 5% Floor, 25% Phosphor Return, 120% Saturation + { // 25% Shadow mask, 0% Scanlines, 3% Pincushion, 0 defocus, No Tint, 0.9 Exponent, 5% Floor, 25% Phosphor Return, 120% Saturation true, 0.25f, { "aperture.png" }, 320, 240, 0.09375f, 0.109375f, 0.03f, 0.03f, @@ -127,7 +127,7 @@ static hlsl_options g_hlsl_presets[4] = 1.2f, false, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0 }, - { // 25% Shadow mask, 0% Scanlines, 0% Pincushion, 0 defocus, No Tint, 0.9 Exponent, 5% Floor, 25% Phosphor Return, 120% Saturation + { // 25% Shadow mask, 0% Scanlines, 0% Pincushion, 0 defocus, No Tint, 0.9 Exponent, 5% Floor, 25% Phosphor Return, 120% Saturation true, 0.25f, { "aperture.png" }, 320, 240, 0.09375f, 0.109375f, 0.0f, 0.0f, @@ -148,7 +148,7 @@ static hlsl_options g_hlsl_presets[4] = 1.2f, false, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0 }, - { // 25% Shadow mask, 100% Scanlines, 15% Pincushion, 3 defocus, 24-degree Tint Out, 1.5 Exponent, 5% Floor, 70% Phosphor Return, 80% Saturation, Bad Convergence + { // 25% Shadow mask, 100% Scanlines, 15% Pincushion, 3 defocus, 24-degree Tint Out, 1.5 Exponent, 5% Floor, 70% Phosphor Return, 80% Saturation, Bad Convergence true, 0.25f, { "aperture.png" }, 320, 240, 0.09375f, 0.109375f, 0.15f, 0.15f, @@ -2805,5 +2805,5 @@ static file_error open_next(d3d_info *d3d, emu_file &file, const char *templ, co // create the final file file.set_openflags(origflags); - return file.open(fname); + return file.open(fname); } diff --git a/src/osd/windows/d3dhlsl.h b/src/osd/windows/d3dhlsl.h index 2a7f0c6d15f..32786776ad7 100644 --- a/src/osd/windows/d3dhlsl.h +++ b/src/osd/windows/d3dhlsl.h @@ -48,7 +48,7 @@ // CONSTANTS //============================================================ -#define HLSL_VECTOR (0) +#define HLSL_VECTOR (0) //============================================================ // TYPE DEFINITIONS @@ -62,47 +62,47 @@ struct d3d_info; /* in the future this will be moved into an OSD/emu shared buffer */ struct hlsl_options { - bool params_dirty; - float shadow_mask_alpha; - char shadow_mask_texture[1024]; - int shadow_mask_count_x; - int shadow_mask_count_y; - float shadow_mask_u_size; - float shadow_mask_v_size; - float curvature; - float pincushion; - float scanline_alpha; - float scanline_scale; - float scanline_height; - float scanline_bright_scale; - float scanline_bright_offset; - float scanline_offset; - float defocus[4]; - float converge_x[3]; - float converge_y[3]; - float radial_converge_x[3]; - float radial_converge_y[3]; - float red_ratio[3]; - float grn_ratio[3]; - float blu_ratio[3]; - float offset[3]; - float scale[3]; - float power[3]; - float floor[3]; - float phosphor[3]; - float saturation; - bool yiq_enable; - float yiq_cc; - float yiq_a; - float yiq_b; - float yiq_o; - float yiq_p; - float yiq_n; - float yiq_y; - float yiq_i; - float yiq_q; - float yiq_scan_time; - int yiq_phase_count; + bool params_dirty; + float shadow_mask_alpha; + char shadow_mask_texture[1024]; + int shadow_mask_count_x; + int shadow_mask_count_y; + float shadow_mask_u_size; + float shadow_mask_v_size; + float curvature; + float pincushion; + float scanline_alpha; + float scanline_scale; + float scanline_height; + float scanline_bright_scale; + float scanline_bright_offset; + float scanline_offset; + float defocus[4]; + float converge_x[3]; + float converge_y[3]; + float radial_converge_x[3]; + float radial_converge_y[3]; + float red_ratio[3]; + float grn_ratio[3]; + float blu_ratio[3]; + float offset[3]; + float scale[3]; + float power[3]; + float floor[3]; + float phosphor[3]; + float saturation; + bool yiq_enable; + float yiq_cc; + float yiq_a; + float yiq_b; + float yiq_o; + float yiq_p; + float yiq_n; + float yiq_y; + float yiq_i; + float yiq_q; + float yiq_scan_time; + int yiq_phase_count; }; class hlsl_info @@ -141,11 +141,11 @@ public: void frame_complete(); - void set_texture(d3d_texture_info *texture); - d3d_render_target * find_render_target(d3d_texture_info *info); - void remove_render_target(d3d_texture_info *texture); - void remove_render_target(int width, int height, UINT32 screen_index, UINT32 page_index); - void remove_render_target(d3d_render_target *rt); + void set_texture(d3d_texture_info *texture); + d3d_render_target * find_render_target(d3d_texture_info *info); + void remove_render_target(d3d_texture_info *texture); + void remove_render_target(int width, int height, UINT32 screen_index, UINT32 page_index); + void remove_render_target(d3d_render_target *rt); int create_resources(bool reset); void delete_resources(bool reset); @@ -154,79 +154,79 @@ public: slider_state *init_slider_list(); private: - void enumerate_screens(); - - void end_avi_recording(); - void begin_avi_recording(const char *name); - - bool register_texture(d3d_texture_info *texture, int width, int height, int xscale, int yscale); - - d3d_render_target* find_render_target(int width, int height, UINT32 screen_index, UINT32 page_index); - d3d_cache_target * find_cache_target(UINT32 screen_index, int width, int height); - void remove_cache_target(d3d_cache_target *cache); - - d3d_base * d3dintf; // D3D interface - win_window_info * window; // D3D window info - - bool master_enable; // overall enable flag - bool vector_enable; // vector post-processing enable flag - bool paused; // whether or not rendering is currently paused - int num_screens; // number of emulated physical screens - int curr_screen; // current screen for render target operations - int curr_frame; // current frame (0/1) of a screen for render target operations - int lastidx; // index of the last-encountered target - bool write_ini; // enable external ini saving - bool read_ini; // enable external ini loading - int prescale_force_x; // prescale force x - int prescale_force_y; // prescale force y - int prescale_size_x; // prescale size x - int prescale_size_y; // prescale size y - int preset; // preset, if relevant - bitmap_argb32 shadow_bitmap; // shadow mask bitmap for post-processing shader - d3d_texture_info * shadow_texture; // shadow mask texture for post-processing shader - hlsl_options * options; // current uniform state - - avi_file * avi_output_file; // AVI file - bitmap_rgb32 avi_snap; // AVI snapshot - int avi_frame; // AVI frame - attotime avi_frame_period; // AVI frame period - attotime avi_next_frame_time; // AVI next frame time - d3d_surface * avi_copy_surface; // AVI destination surface in system memory - d3d_texture * avi_copy_texture; // AVI destination texture in system memory - d3d_surface * avi_final_target; // AVI upscaled surface - d3d_texture * avi_final_texture; // AVI upscaled texture - - bool render_snap; // whether or not to take HLSL post-render snapshot - bool snap_rendered; // whether we just rendered our HLSL post-render shot or not - d3d_surface * snap_copy_target; // snapshot destination surface in system memory - d3d_texture * snap_copy_texture; // snapshot destination surface in system memory - d3d_surface * snap_target; // snapshot upscaled surface - d3d_texture * snap_texture; // snapshot upscaled texture - int snap_width; // snapshot width - int snap_height; // snapshot height - bool lines_pending; // whether or not we have lines to flush on the next quad + void enumerate_screens(); + + void end_avi_recording(); + void begin_avi_recording(const char *name); + + bool register_texture(d3d_texture_info *texture, int width, int height, int xscale, int yscale); + + d3d_render_target* find_render_target(int width, int height, UINT32 screen_index, UINT32 page_index); + d3d_cache_target * find_cache_target(UINT32 screen_index, int width, int height); + void remove_cache_target(d3d_cache_target *cache); + + d3d_base * d3dintf; // D3D interface + win_window_info * window; // D3D window info + + bool master_enable; // overall enable flag + bool vector_enable; // vector post-processing enable flag + bool paused; // whether or not rendering is currently paused + int num_screens; // number of emulated physical screens + int curr_screen; // current screen for render target operations + int curr_frame; // current frame (0/1) of a screen for render target operations + int lastidx; // index of the last-encountered target + bool write_ini; // enable external ini saving + bool read_ini; // enable external ini loading + int prescale_force_x; // prescale force x + int prescale_force_y; // prescale force y + int prescale_size_x; // prescale size x + int prescale_size_y; // prescale size y + int preset; // preset, if relevant + bitmap_argb32 shadow_bitmap; // shadow mask bitmap for post-processing shader + d3d_texture_info * shadow_texture; // shadow mask texture for post-processing shader + hlsl_options * options; // current uniform state + + avi_file * avi_output_file; // AVI file + bitmap_rgb32 avi_snap; // AVI snapshot + int avi_frame; // AVI frame + attotime avi_frame_period; // AVI frame period + attotime avi_next_frame_time; // AVI next frame time + d3d_surface * avi_copy_surface; // AVI destination surface in system memory + d3d_texture * avi_copy_texture; // AVI destination texture in system memory + d3d_surface * avi_final_target; // AVI upscaled surface + d3d_texture * avi_final_texture; // AVI upscaled texture + + bool render_snap; // whether or not to take HLSL post-render snapshot + bool snap_rendered; // whether we just rendered our HLSL post-render shot or not + d3d_surface * snap_copy_target; // snapshot destination surface in system memory + d3d_texture * snap_copy_texture; // snapshot destination surface in system memory + d3d_surface * snap_target; // snapshot upscaled surface + d3d_texture * snap_texture; // snapshot upscaled texture + int snap_width; // snapshot width + int snap_height; // snapshot height + bool lines_pending; // whether or not we have lines to flush on the next quad // HLSL effects - d3d_surface * backbuffer; // pointer to our device's backbuffer - d3d_effect * curr_effect; // pointer to the currently active effect object - d3d_effect * effect; // pointer to the primary-effect object - d3d_effect * prescale_effect; // pointer to the prescale-effect object - d3d_effect * post_effect; // pointer to the post-effect object - d3d_effect * pincushion_effect; // pointer to the pincushion-effect object - d3d_effect * focus_effect; // pointer to the focus-effect object - d3d_effect * phosphor_effect; // pointer to the phosphor-effect object - d3d_effect * deconverge_effect; // pointer to the deconvergence-effect object - d3d_effect * color_effect; // pointer to the color-effect object - d3d_effect * yiq_encode_effect; // pointer to the YIQ encoder effect object - d3d_effect * yiq_decode_effect; // pointer to the YIQ decoder effect object + d3d_surface * backbuffer; // pointer to our device's backbuffer + d3d_effect * curr_effect; // pointer to the currently active effect object + d3d_effect * effect; // pointer to the primary-effect object + d3d_effect * prescale_effect; // pointer to the prescale-effect object + d3d_effect * post_effect; // pointer to the post-effect object + d3d_effect * pincushion_effect; // pointer to the pincushion-effect object + d3d_effect * focus_effect; // pointer to the focus-effect object + d3d_effect * phosphor_effect; // pointer to the phosphor-effect object + d3d_effect * deconverge_effect; // pointer to the deconvergence-effect object + d3d_effect * color_effect; // pointer to the color-effect object + d3d_effect * yiq_encode_effect; // pointer to the YIQ encoder effect object + d3d_effect * yiq_decode_effect; // pointer to the YIQ decoder effect object #if HLSL_VECTOR - d3d_effect * vector_effect; // pointer to the vector-effect object + d3d_effect * vector_effect; // pointer to the vector-effect object #endif - d3d_vertex * fsfx_vertices; // pointer to our full-screen-quad object + d3d_vertex * fsfx_vertices; // pointer to our full-screen-quad object public: - d3d_render_target * targethead; - d3d_cache_target * cachehead; + d3d_render_target * targethead; + d3d_cache_target * cachehead; }; #endif diff --git a/src/osd/windows/d3dintf.h b/src/osd/windows/d3dintf.h index 6503b5bd769..27643afcdb8 100644 --- a/src/osd/windows/d3dintf.h +++ b/src/osd/windows/d3dintf.h @@ -113,15 +113,15 @@ struct d3d_present_parameters struct d3d_adapter_identifier { - char Driver[512]; - char Description[512]; - LARGE_INTEGER DriverVersion; - DWORD VendorId; - DWORD DeviceId; - DWORD SubSysId; - DWORD Revision; - GUID DeviceIdentifier; - DWORD WHQLLevel; + char Driver[512]; + char Description[512]; + LARGE_INTEGER DriverVersion; + DWORD VendorId; + DWORD DeviceId; + DWORD SubSysId; + DWORD Revision; + GUID DeviceIdentifier; + DWORD WHQLLevel; }; @@ -265,16 +265,16 @@ struct d3d_effect_interface struct d3d_base { // internal objects - int version; - void * d3dobj; - HINSTANCE dllhandle; - bool post_fx_available; + int version; + void * d3dobj; + HINSTANCE dllhandle; + bool post_fx_available; // interface pointers - d3d_interface d3d; - d3d_device_interface device; - d3d_surface_interface surface; - d3d_texture_interface texture; + d3d_interface d3d; + d3d_device_interface device; + d3d_surface_interface surface; + d3d_texture_interface texture; d3d_vertex_buffer_interface vertexbuf; d3d_effect_interface effect; }; diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c index debb293363b..0b74fc60918 100644 --- a/src/osd/windows/debugwin.c +++ b/src/osd/windows/debugwin.c @@ -78,35 +78,35 @@ // PARAMETERS //============================================================ -#define MAX_VIEWS 4 -#define EDGE_WIDTH 3 -#define MAX_EDIT_STRING 256 -#define HISTORY_LENGTH 20 -#define MAX_OTHER_WND 4 +#define MAX_VIEWS 4 +#define EDGE_WIDTH 3 +#define MAX_EDIT_STRING 256 +#define HISTORY_LENGTH 20 +#define MAX_OTHER_WND 4 // debugger window styles -#define DEBUG_WINDOW_STYLE (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN) & (~WS_MINIMIZEBOX & ~WS_MAXIMIZEBOX) -#define DEBUG_WINDOW_STYLE_EX 0 +#define DEBUG_WINDOW_STYLE (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN) & (~WS_MINIMIZEBOX & ~WS_MAXIMIZEBOX) +#define DEBUG_WINDOW_STYLE_EX 0 // debugger view styles -#define DEBUG_VIEW_STYLE WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN -#define DEBUG_VIEW_STYLE_EX 0 +#define DEBUG_VIEW_STYLE WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN +#define DEBUG_VIEW_STYLE_EX 0 // edit box styles -#define EDIT_BOX_STYLE WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL -#define EDIT_BOX_STYLE_EX 0 +#define EDIT_BOX_STYLE WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL +#define EDIT_BOX_STYLE_EX 0 // combo box styles -#define COMBO_BOX_STYLE WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL -#define COMBO_BOX_STYLE_EX 0 +#define COMBO_BOX_STYLE WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL +#define COMBO_BOX_STYLE_EX 0 // horizontal scroll bar styles -#define HSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_HORZ -#define HSCROLL_STYLE_EX 0 +#define HSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_HORZ +#define HSCROLL_STYLE_EX 0 // vertical scroll bar styles -#define VSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_VERT -#define VSCROLL_STYLE_EX 0 +#define VSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_VERT +#define VSCROLL_STYLE_EX 0 enum @@ -157,11 +157,11 @@ class debugwin_info; struct debugview_info { - debugwin_info * owner; - debug_view * view; - HWND wnd; - HWND hscroll; - HWND vscroll; + debugwin_info * owner; + debug_view * view; + HWND wnd; + HWND hscroll; + HWND vscroll; }; @@ -173,34 +173,34 @@ public: running_machine &machine() const { return m_machine; } - debugwin_info * next; - HWND wnd; - HWND focuswnd; - WNDPROC handler; + debugwin_info * next; + HWND wnd; + HWND focuswnd; + WNDPROC handler; - UINT32 minwidth, maxwidth; - UINT32 minheight, maxheight; - void (*recompute_children)(debugwin_info *); - void (*update_menu)(debugwin_info *); + UINT32 minwidth, maxwidth; + UINT32 minheight, maxheight; + void (*recompute_children)(debugwin_info *); + void (*update_menu)(debugwin_info *); - int (*handle_command)(debugwin_info *, WPARAM, LPARAM); - int (*handle_key)(debugwin_info *, WPARAM, LPARAM); - UINT16 ignore_char_lparam; + int (*handle_command)(debugwin_info *, WPARAM, LPARAM); + int (*handle_key)(debugwin_info *, WPARAM, LPARAM); + UINT16 ignore_char_lparam; - debugview_info view[MAX_VIEWS]; + debugview_info view[MAX_VIEWS]; - HWND editwnd; - char edit_defstr[256]; - void (*process_string)(debugwin_info *, const char *); - WNDPROC original_editproc; - TCHAR history[HISTORY_LENGTH][MAX_EDIT_STRING]; - int history_count; - int last_history; + HWND editwnd; + char edit_defstr[256]; + void (*process_string)(debugwin_info *, const char *); + WNDPROC original_editproc; + TCHAR history[HISTORY_LENGTH][MAX_EDIT_STRING]; + int history_count; + int last_history; - HWND otherwnd[MAX_OTHER_WND]; + HWND otherwnd[MAX_OTHER_WND]; private: - running_machine & m_machine; + running_machine & m_machine; }; @@ -403,24 +403,24 @@ void debugwin_init_windows(running_machine &machine) WNDCLASS wc = { 0 }; // initialize the description of the window class - wc.lpszClassName = TEXT("MAMEDebugWindow"); - wc.hInstance = GetModuleHandle(NULL); - wc.lpfnWndProc = debugwin_window_proc; - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2)); - wc.lpszMenuName = NULL; - wc.hbrBackground = NULL; - wc.style = 0; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; + wc.lpszClassName = TEXT("MAMEDebugWindow"); + wc.hInstance = GetModuleHandle(NULL); + wc.lpfnWndProc = debugwin_window_proc; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2)); + wc.lpszMenuName = NULL; + wc.hbrBackground = NULL; + wc.style = 0; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; // register the class; fail if we can't if (!RegisterClass(&wc)) fatalerror("Unable to register debug window class\n"); // initialize the description of the view class - wc.lpszClassName = TEXT("MAMEDebugView"); - wc.lpfnWndProc = debugwin_view_proc; + wc.lpszClassName = TEXT("MAMEDebugView"); + wc.lpfnWndProc = debugwin_view_proc; // register the class; fail if we can't if (!RegisterClass(&wc)) @@ -2423,8 +2423,8 @@ static void image_update_menu(debugwin_info *info) AppendMenu(devicesubmenu, MF_STRING, new_item + DEVOPTION_OPEN, TEXT("Mount...")); /*if (img->is_creatable()) - AppendMenu(devicesubmenu, MF_STRING, new_item + DEVOPTION_CREATE, TEXT("Create...")); - */ + AppendMenu(devicesubmenu, MF_STRING, new_item + DEVOPTION_CREATE, TEXT("Create...")); + */ AppendMenu(devicesubmenu, flags_for_exists, new_item + DEVOPTION_CLOSE, TEXT("Unmount")); if (img->device().type() == CASSETTE) @@ -2432,9 +2432,9 @@ static void image_update_menu(debugwin_info *info) cassette_state state; state = (cassette_state)(img->exists() ? (dynamic_cast<cassette_image_device*>(&img->device())->get_state() & CASSETTE_MASK_UISTATE) : CASSETTE_STOPPED); AppendMenu(devicesubmenu, MF_SEPARATOR, 0, NULL); - AppendMenu(devicesubmenu, flags_for_exists | ((state == CASSETTE_STOPPED) ? MF_CHECKED : 0), new_item + DEVOPTION_CASSETTE_STOPPAUSE, TEXT("Pause/Stop")); - AppendMenu(devicesubmenu, flags_for_exists | ((state == CASSETTE_PLAY) ? MF_CHECKED : 0), new_item + DEVOPTION_CASSETTE_PLAY, TEXT("Play")); - AppendMenu(devicesubmenu, flags_for_writing | ((state == CASSETTE_RECORD) ? MF_CHECKED : 0), new_item + DEVOPTION_CASSETTE_RECORD, TEXT("Record")); + AppendMenu(devicesubmenu, flags_for_exists | ((state == CASSETTE_STOPPED) ? MF_CHECKED : 0), new_item + DEVOPTION_CASSETTE_STOPPAUSE, TEXT("Pause/Stop")); + AppendMenu(devicesubmenu, flags_for_exists | ((state == CASSETTE_PLAY) ? MF_CHECKED : 0), new_item + DEVOPTION_CASSETTE_PLAY, TEXT("Play")); + AppendMenu(devicesubmenu, flags_for_writing | ((state == CASSETTE_RECORD) ? MF_CHECKED : 0), new_item + DEVOPTION_CASSETTE_RECORD, TEXT("Record")); AppendMenu(devicesubmenu, flags_for_exists, new_item + DEVOPTION_CASSETTE_REWIND, TEXT("Rewind")); AppendMenu(devicesubmenu, flags_for_exists, new_item + DEVOPTION_CASSETTE_FASTFORWARD, TEXT("Fast Forward")); } diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c index 1b3a28c6238..481ca37f3fa 100644 --- a/src/osd/windows/drawd3d.c +++ b/src/osd/windows/drawd3d.c @@ -90,7 +90,7 @@ extern void mtlog_add(const char *event); // CONSTANTS //============================================================ -#define ENABLE_BORDER_PIX (1) +#define ENABLE_BORDER_PIX (1) enum { @@ -113,7 +113,7 @@ enum // GLOBALS //============================================================ -static d3d_base * d3dintf; // FIX ME +static d3d_base * d3dintf; // FIX ME static const line_aa_step line_aa_1step[] = { @@ -165,26 +165,26 @@ INLINE UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr) { /* original equations: - C = Y - 16 - D = Cb - 128 - E = Cr - 128 + C = Y - 16 + D = Cb - 128 + E = Cr - 128 - R = clip(( 298 * C + 409 * E + 128) >> 8) - G = clip(( 298 * C - 100 * D - 208 * E + 128) >> 8) - B = clip(( 298 * C + 516 * D + 128) >> 8) + R = clip(( 298 * C + 409 * E + 128) >> 8) + G = clip(( 298 * C - 100 * D - 208 * E + 128) >> 8) + B = clip(( 298 * C + 516 * D + 128) >> 8) - R = clip(( 298 * (Y - 16) + 409 * (Cr - 128) + 128) >> 8) - G = clip(( 298 * (Y - 16) - 100 * (Cb - 128) - 208 * (Cr - 128) + 128) >> 8) - B = clip(( 298 * (Y - 16) + 516 * (Cb - 128) + 128) >> 8) + R = clip(( 298 * (Y - 16) + 409 * (Cr - 128) + 128) >> 8) + G = clip(( 298 * (Y - 16) - 100 * (Cb - 128) - 208 * (Cr - 128) + 128) >> 8) + B = clip(( 298 * (Y - 16) + 516 * (Cb - 128) + 128) >> 8) - R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8) - G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8) - B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8) + R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8) + G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8) + B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8) - R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8) - G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8) - B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8) - */ + R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8) + G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8) + B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8) + */ int r, g, b, common; common = 298 * y - 298 * 16; @@ -286,10 +286,10 @@ INLINE void set_blendmode(d3d_info *d3d, int blendmode) switch (blendmode) { default: - case BLENDMODE_NONE: blendenable = FALSE; blendop = D3DBLENDOP_ADD; blendsrc = D3DBLEND_SRCALPHA; blenddst = D3DBLEND_INVSRCALPHA; break; - case BLENDMODE_ALPHA: blendenable = TRUE; blendop = D3DBLENDOP_ADD; blendsrc = D3DBLEND_SRCALPHA; blenddst = D3DBLEND_INVSRCALPHA; break; - case BLENDMODE_RGB_MULTIPLY: blendenable = TRUE; blendop = D3DBLENDOP_ADD; blendsrc = D3DBLEND_DESTCOLOR; blenddst = D3DBLEND_ZERO; break; - case BLENDMODE_ADD: blendenable = TRUE; blendop = D3DBLENDOP_ADD; blendsrc = D3DBLEND_SRCALPHA; blenddst = D3DBLEND_ONE; break; + case BLENDMODE_NONE: blendenable = FALSE; blendop = D3DBLENDOP_ADD; blendsrc = D3DBLEND_SRCALPHA; blenddst = D3DBLEND_INVSRCALPHA; break; + case BLENDMODE_ALPHA: blendenable = TRUE; blendop = D3DBLENDOP_ADD; blendsrc = D3DBLEND_SRCALPHA; blenddst = D3DBLEND_INVSRCALPHA; break; + case BLENDMODE_RGB_MULTIPLY: blendenable = TRUE; blendop = D3DBLENDOP_ADD; blendsrc = D3DBLEND_DESTCOLOR; blenddst = D3DBLEND_ZERO; break; + case BLENDMODE_ADD: blendenable = TRUE; blendop = D3DBLENDOP_ADD; blendsrc = D3DBLEND_SRCALPHA; blenddst = D3DBLEND_ONE; break; } // adjust the bits that changed @@ -721,19 +721,19 @@ try_again: // initialize the D3D presentation parameters memset(&d3d->presentation, 0, sizeof(d3d->presentation)); - d3d->presentation.BackBufferWidth = d3d->width; - d3d->presentation.BackBufferHeight = d3d->height; - d3d->presentation.BackBufferFormat = d3d->pixformat; - d3d->presentation.BackBufferCount = video_config.triplebuf ? 2 : 1; - d3d->presentation.MultiSampleType = D3DMULTISAMPLE_NONE; - d3d->presentation.SwapEffect = D3DSWAPEFFECT_DISCARD; - d3d->presentation.hDeviceWindow = window->hwnd; - d3d->presentation.Windowed = !window->fullscreen || win_has_menu(window); - d3d->presentation.EnableAutoDepthStencil = FALSE; - d3d->presentation.AutoDepthStencilFormat = D3DFMT_D16; - d3d->presentation.Flags = 0; - d3d->presentation.FullScreen_RefreshRateInHz = d3d->refresh; - d3d->presentation.PresentationInterval = ((video_config.triplebuf && window->fullscreen) || video_config.waitvsync || video_config.syncrefresh) ? + d3d->presentation.BackBufferWidth = d3d->width; + d3d->presentation.BackBufferHeight = d3d->height; + d3d->presentation.BackBufferFormat = d3d->pixformat; + d3d->presentation.BackBufferCount = video_config.triplebuf ? 2 : 1; + d3d->presentation.MultiSampleType = D3DMULTISAMPLE_NONE; + d3d->presentation.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3d->presentation.hDeviceWindow = window->hwnd; + d3d->presentation.Windowed = !window->fullscreen || win_has_menu(window); + d3d->presentation.EnableAutoDepthStencil = FALSE; + d3d->presentation.AutoDepthStencilFormat = D3DFMT_D16; + d3d->presentation.Flags = 0; + d3d->presentation.FullScreen_RefreshRateInHz = d3d->refresh; + d3d->presentation.PresentationInterval = ((video_config.triplebuf && window->fullscreen) || video_config.waitvsync || video_config.syncrefresh) ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; // create the D3D device @@ -789,7 +789,7 @@ try_again: int ret = d3d->hlsl->create_resources(false); if (ret != 0) - return ret; + return ret; return device_create_resources(d3d); } @@ -2345,9 +2345,9 @@ static void texture_set_data(d3d_info *d3d, d3d_texture_info *texture, const ren switch (texture->type) { default: - case TEXTURE_TYPE_PLAIN: result = (*d3dintf->texture.lock_rect)(texture->d3dtex, 0, &rect, NULL, 0); break; - case TEXTURE_TYPE_DYNAMIC: result = (*d3dintf->texture.lock_rect)(texture->d3dtex, 0, &rect, NULL, D3DLOCK_DISCARD); break; - case TEXTURE_TYPE_SURFACE: result = (*d3dintf->surface.lock_rect)(texture->d3dsurface, &rect, NULL, D3DLOCK_DISCARD); break; + case TEXTURE_TYPE_PLAIN: result = (*d3dintf->texture.lock_rect)(texture->d3dtex, 0, &rect, NULL, 0); break; + case TEXTURE_TYPE_DYNAMIC: result = (*d3dintf->texture.lock_rect)(texture->d3dtex, 0, &rect, NULL, D3DLOCK_DISCARD); break; + case TEXTURE_TYPE_SURFACE: result = (*d3dintf->surface.lock_rect)(texture->d3dsurface, &rect, NULL, D3DLOCK_DISCARD); break; } if (result != D3D_OK) return; @@ -2398,9 +2398,9 @@ static void texture_set_data(d3d_info *d3d, d3d_texture_info *texture, const ren switch (texture->type) { default: - case TEXTURE_TYPE_PLAIN: result = (*d3dintf->texture.unlock_rect)(texture->d3dtex, 0); break; - case TEXTURE_TYPE_DYNAMIC: result = (*d3dintf->texture.unlock_rect)(texture->d3dtex, 0); break; - case TEXTURE_TYPE_SURFACE: result = (*d3dintf->surface.unlock_rect)(texture->d3dsurface); break; + case TEXTURE_TYPE_PLAIN: result = (*d3dintf->texture.unlock_rect)(texture->d3dtex, 0); break; + case TEXTURE_TYPE_DYNAMIC: result = (*d3dintf->texture.unlock_rect)(texture->d3dtex, 0); break; + case TEXTURE_TYPE_SURFACE: result = (*d3dintf->surface.unlock_rect)(texture->d3dsurface); break; } if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during texture unlock_rect call\n", (int)result); @@ -2598,10 +2598,10 @@ static d3d_texture_info *texture_find(d3d_info *d3d, const render_primitive *pri // Clear our old texture reference if (texture->hash == texhash && - texture->texinfo.base == prim->texture.base && - ((texture->flags ^ prim->flags) & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK)) == 0 && - (texture->texinfo.width != prim->texture.width || - texture->texinfo.height != prim->texture.height)) + texture->texinfo.base == prim->texture.base && + ((texture->flags ^ prim->flags) & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK)) == 0 && + (texture->texinfo.width != prim->texture.width || + texture->texinfo.height != prim->texture.height)) { d3d->hlsl->remove_render_target(texture); break; @@ -2694,7 +2694,7 @@ d3d_render_target::~d3d_render_target() prescaletexture = NULL; } if (prescaletarget != NULL) - { + { (*d3dintf->surface.release)(prescaletarget); prescaletarget = NULL; } diff --git a/src/osd/windows/drawd3d.h b/src/osd/windows/drawd3d.h index fb590a9bd82..a0feed411d5 100644 --- a/src/osd/windows/drawd3d.h +++ b/src/osd/windows/drawd3d.h @@ -50,8 +50,8 @@ // CONSTANTS //============================================================ -#define VERTEX_BASE_FORMAT (D3DFVF_DIFFUSE | D3DFVF_TEX1) -#define VERTEX_BUFFER_SIZE (2048*4+4) +#define VERTEX_BASE_FORMAT (D3DFVF_DIFFUSE | D3DFVF_TEX1) +#define VERTEX_BUFFER_SIZE (2048*4+4) //============================================================ // TYPE DEFINITIONS @@ -114,57 +114,57 @@ public: /* d3d_info is the information about Direct3D for the current screen */ struct d3d_info { - int adapter; // ordinal adapter number - int width, height; // current width, height - int refresh; // current refresh rate - int create_error_count; // number of consecutive create errors - - win_window_info * window; // current window info - - d3d_device * device; // pointer to the Direct3DDevice object - int gamma_supported; // is full screen gamma supported? - d3d_present_parameters presentation; // set of presentation parameters - D3DDISPLAYMODE origmode; // original display mode for the adapter - D3DFORMAT pixformat; // pixel format we are using - - d3d_vertex_buffer * vertexbuf; // pointer to the vertex buffer object - d3d_vertex * lockedbuf; // pointer to the locked vertex buffer - int numverts; // number of accumulated vertices - - d3d_poly_info poly[VERTEX_BUFFER_SIZE/3]; // array to hold polygons as they are created - int numpolys; // number of accumulated polygons - - d3d_texture_info * texlist; // list of active textures - int dynamic_supported; // are dynamic textures supported? - int stretch_supported; // is StretchRect with point filtering supported? - int mod2x_supported; // is D3DTOP_MODULATE2X supported? - int mod4x_supported; // is D3DTOP_MODULATE4X supported? - D3DFORMAT screen_format; // format to use for screen textures - D3DFORMAT yuv_format; // format to use for YUV textures - - DWORD texture_caps; // textureCaps field - DWORD texture_max_aspect; // texture maximum aspect ratio - DWORD texture_max_width; // texture maximum width - DWORD texture_max_height; // texture maximum height - - d3d_texture_info * last_texture; // previous texture - UINT32 last_texture_flags; // previous texture flags - int last_blendenable; // previous blendmode - int last_blendop; // previous blendmode - int last_blendsrc; // previous blendmode - int last_blenddst; // previous blendmode - int last_filter; // previous texture filter - int last_wrap; // previous wrap state - DWORD last_modmode; // previous texture modulation - - bitmap_argb32 vector_bitmap; // experimental: bitmap for vectors - d3d_texture_info * vector_texture; // experimental: texture for vectors - - bitmap_rgb32 default_bitmap; // experimental: default bitmap - d3d_texture_info * default_texture; // experimental: default texture - - void * hlsl_buf; // HLSL vertex data - hlsl_info * hlsl; // HLSL interface + int adapter; // ordinal adapter number + int width, height; // current width, height + int refresh; // current refresh rate + int create_error_count; // number of consecutive create errors + + win_window_info * window; // current window info + + d3d_device * device; // pointer to the Direct3DDevice object + int gamma_supported; // is full screen gamma supported? + d3d_present_parameters presentation; // set of presentation parameters + D3DDISPLAYMODE origmode; // original display mode for the adapter + D3DFORMAT pixformat; // pixel format we are using + + d3d_vertex_buffer * vertexbuf; // pointer to the vertex buffer object + d3d_vertex * lockedbuf; // pointer to the locked vertex buffer + int numverts; // number of accumulated vertices + + d3d_poly_info poly[VERTEX_BUFFER_SIZE/3]; // array to hold polygons as they are created + int numpolys; // number of accumulated polygons + + d3d_texture_info * texlist; // list of active textures + int dynamic_supported; // are dynamic textures supported? + int stretch_supported; // is StretchRect with point filtering supported? + int mod2x_supported; // is D3DTOP_MODULATE2X supported? + int mod4x_supported; // is D3DTOP_MODULATE4X supported? + D3DFORMAT screen_format; // format to use for screen textures + D3DFORMAT yuv_format; // format to use for YUV textures + + DWORD texture_caps; // textureCaps field + DWORD texture_max_aspect; // texture maximum aspect ratio + DWORD texture_max_width; // texture maximum width + DWORD texture_max_height; // texture maximum height + + d3d_texture_info * last_texture; // previous texture + UINT32 last_texture_flags; // previous texture flags + int last_blendenable; // previous blendmode + int last_blendop; // previous blendmode + int last_blendsrc; // previous blendmode + int last_blenddst; // previous blendmode + int last_filter; // previous texture filter + int last_wrap; // previous wrap state + DWORD last_modmode; // previous texture modulation + + bitmap_argb32 vector_bitmap; // experimental: bitmap for vectors + d3d_texture_info * vector_texture; // experimental: texture for vectors + + bitmap_rgb32 default_bitmap; // experimental: default bitmap + d3d_texture_info * default_texture; // experimental: default texture + + void * hlsl_buf; // HLSL vertex data + hlsl_info * hlsl; // HLSL interface }; diff --git a/src/osd/windows/drawdd.c b/src/osd/windows/drawdd.c index 25004360e09..896255004cf 100644 --- a/src/osd/windows/drawdd.c +++ b/src/osd/windows/drawdd.c @@ -71,52 +71,52 @@ typedef HRESULT (WINAPI *directdrawenumerateex_ptr)(LPDDENUMCALLBACKEXA lpCallba /* dd_info is the information about DirectDraw for the current screen */ struct dd_info { - GUID adapter; // current display adapter - GUID * adapter_ptr; // pointer to current display adapter - int width, height; // current width, height - int refresh; // current refresh rate - int clearouter; // clear the outer areas? - - INT32 blitwidth, blitheight; // current blit width/height values - RECT lastdest; // last destination rectangle - - IDirectDraw7 * ddraw; // pointer to the DirectDraw object - IDirectDrawSurface7 * primary; // pointer to the primary surface object - IDirectDrawSurface7 * back; // pointer to the back buffer surface object - IDirectDrawSurface7 * blit; // pointer to the blit surface object - IDirectDrawClipper * clipper; // pointer to the clipper object - IDirectDrawGammaControl *gamma; // pointer to the gamma control object - - DDSURFACEDESC2 primarydesc; // description of the primary surface - DDSURFACEDESC2 blitdesc; // description of the blitting surface - DDSURFACEDESC2 origmode; // original video mode - - DDCAPS ddcaps; // capabilities of the device - DDCAPS helcaps; // capabilities of the hardware - - void * membuffer; // memory buffer for complex rendering - UINT32 membuffersize; // current size of the memory buffer + GUID adapter; // current display adapter + GUID * adapter_ptr; // pointer to current display adapter + int width, height; // current width, height + int refresh; // current refresh rate + int clearouter; // clear the outer areas? + + INT32 blitwidth, blitheight; // current blit width/height values + RECT lastdest; // last destination rectangle + + IDirectDraw7 * ddraw; // pointer to the DirectDraw object + IDirectDrawSurface7 * primary; // pointer to the primary surface object + IDirectDrawSurface7 * back; // pointer to the back buffer surface object + IDirectDrawSurface7 * blit; // pointer to the blit surface object + IDirectDrawClipper * clipper; // pointer to the clipper object + IDirectDrawGammaControl *gamma; // pointer to the gamma control object + + DDSURFACEDESC2 primarydesc; // description of the primary surface + DDSURFACEDESC2 blitdesc; // description of the blitting surface + DDSURFACEDESC2 origmode; // original video mode + + DDCAPS ddcaps; // capabilities of the device + DDCAPS helcaps; // capabilities of the hardware + + void * membuffer; // memory buffer for complex rendering + UINT32 membuffersize; // current size of the memory buffer }; /* monitor_enum_info holds information during a monitor enumeration */ struct monitor_enum_info { - win_monitor_info * monitor; // pointer to monitor we want - GUID guid; // GUID of the one we found - GUID * guid_ptr; // pointer to our GUID - int foundit; // TRUE if we found what we wanted + win_monitor_info * monitor; // pointer to monitor we want + GUID guid; // GUID of the one we found + GUID * guid_ptr; // pointer to our GUID + int foundit; // TRUE if we found what we wanted }; /* mode_enum_info holds information during a display mode enumeration */ struct mode_enum_info { - win_window_info * window; - INT32 minimum_width, minimum_height; - INT32 target_width, target_height; - double target_refresh; - float best_score; + win_window_info * window; + INT32 minimum_width, minimum_height; + INT32 target_width, target_height; + double target_refresh; + float best_score; }; @@ -377,10 +377,10 @@ static int drawdd_window_draw(win_window_info *window, HDC dc, int update) // based on the target format, use one of our standard renderers switch (dd->blitdesc.ddpfPixelFormat.dwRBitMask) { - case 0x00ff0000: software_renderer<UINT32, 0,0,0, 16,8,0>::draw_primitives(*window->primlist, dd->membuffer, dd->blitwidth, dd->blitheight, dd->blitwidth); break; - case 0x000000ff: software_renderer<UINT32, 0,0,0, 0,8,16>::draw_primitives(*window->primlist, dd->membuffer, dd->blitwidth, dd->blitheight, dd->blitwidth); break; - case 0xf800: software_renderer<UINT16, 3,2,3, 11,5,0>::draw_primitives(*window->primlist, dd->membuffer, dd->blitwidth, dd->blitheight, dd->blitwidth); break; - case 0x7c00: software_renderer<UINT16, 3,3,3, 10,5,0>::draw_primitives(*window->primlist, dd->membuffer, dd->blitwidth, dd->blitheight, dd->blitwidth); break; + case 0x00ff0000: software_renderer<UINT32, 0,0,0, 16,8,0>::draw_primitives(*window->primlist, dd->membuffer, dd->blitwidth, dd->blitheight, dd->blitwidth); break; + case 0x000000ff: software_renderer<UINT32, 0,0,0, 0,8,16>::draw_primitives(*window->primlist, dd->membuffer, dd->blitwidth, dd->blitheight, dd->blitwidth); break; + case 0xf800: software_renderer<UINT16, 3,2,3, 11,5,0>::draw_primitives(*window->primlist, dd->membuffer, dd->blitwidth, dd->blitheight, dd->blitwidth); break; + case 0x7c00: software_renderer<UINT16, 3,3,3, 10,5,0>::draw_primitives(*window->primlist, dd->membuffer, dd->blitwidth, dd->blitheight, dd->blitwidth); break; default: mame_printf_verbose("DirectDraw: Unknown target mode: R=%08X G=%08X B=%08X\n", (int)dd->blitdesc.ddpfPixelFormat.dwRBitMask, (int)dd->blitdesc.ddpfPixelFormat.dwGBitMask, (int)dd->blitdesc.ddpfPixelFormat.dwBBitMask); break; @@ -413,10 +413,10 @@ static int drawdd_window_draw(win_window_info *window, HDC dc, int update) // based on the target format, use one of our standard renderers switch (dd->blitdesc.ddpfPixelFormat.dwRBitMask) { - case 0x00ff0000: software_renderer<UINT32, 0,0,0, 16,8,0, true>::draw_primitives(*window->primlist, dd->blitdesc.lpSurface, dd->blitwidth, dd->blitheight, dd->blitdesc.lPitch / 4); break; - case 0x000000ff: software_renderer<UINT32, 0,0,0, 0,8,16, true>::draw_primitives(*window->primlist, dd->blitdesc.lpSurface, dd->blitwidth, dd->blitheight, dd->blitdesc.lPitch / 4); break; - case 0xf800: software_renderer<UINT16, 3,2,3, 11,5,0, true>::draw_primitives(*window->primlist, dd->blitdesc.lpSurface, dd->blitwidth, dd->blitheight, dd->blitdesc.lPitch / 2); break; - case 0x7c00: software_renderer<UINT16, 3,3,3, 10,5,0, true>::draw_primitives(*window->primlist, dd->blitdesc.lpSurface, dd->blitwidth, dd->blitheight, dd->blitdesc.lPitch / 2); break; + case 0x00ff0000: software_renderer<UINT32, 0,0,0, 16,8,0, true>::draw_primitives(*window->primlist, dd->blitdesc.lpSurface, dd->blitwidth, dd->blitheight, dd->blitdesc.lPitch / 4); break; + case 0x000000ff: software_renderer<UINT32, 0,0,0, 0,8,16, true>::draw_primitives(*window->primlist, dd->blitdesc.lpSurface, dd->blitwidth, dd->blitheight, dd->blitdesc.lPitch / 4); break; + case 0xf800: software_renderer<UINT16, 3,2,3, 11,5,0, true>::draw_primitives(*window->primlist, dd->blitdesc.lpSurface, dd->blitwidth, dd->blitheight, dd->blitdesc.lPitch / 2); break; + case 0x7c00: software_renderer<UINT16, 3,3,3, 10,5,0, true>::draw_primitives(*window->primlist, dd->blitdesc.lpSurface, dd->blitwidth, dd->blitheight, dd->blitdesc.lPitch / 2); break; default: mame_printf_verbose("DirectDraw: Unknown target mode: R=%08X G=%08X B=%08X\n", (int)dd->blitdesc.ddpfPixelFormat.dwRBitMask, (int)dd->blitdesc.ddpfPixelFormat.dwGBitMask, (int)dd->blitdesc.ddpfPixelFormat.dwBBitMask); break; diff --git a/src/osd/windows/drawgdi.c b/src/osd/windows/drawgdi.c index 1ff77066f0a..52d3b629f81 100644 --- a/src/osd/windows/drawgdi.c +++ b/src/osd/windows/drawgdi.c @@ -59,10 +59,10 @@ /* gdi_info is the information for the current screen */ struct gdi_info { - BITMAPINFO bminfo; - RGBQUAD colors[256]; - UINT8 * bmdata; - size_t bmsize; + BITMAPINFO bminfo; + RGBQUAD colors[256]; + UINT8 * bmdata; + size_t bmsize; }; @@ -123,22 +123,22 @@ static int drawgdi_window_init(win_window_info *window) window->drawdata = gdi; // fill in the bitmap info header - gdi->bminfo.bmiHeader.biSize = sizeof(gdi->bminfo.bmiHeader); - gdi->bminfo.bmiHeader.biPlanes = 1; - gdi->bminfo.bmiHeader.biCompression = BI_RGB; - gdi->bminfo.bmiHeader.biSizeImage = 0; - gdi->bminfo.bmiHeader.biXPelsPerMeter = 0; - gdi->bminfo.bmiHeader.biYPelsPerMeter = 0; - gdi->bminfo.bmiHeader.biClrUsed = 0; - gdi->bminfo.bmiHeader.biClrImportant = 0; + gdi->bminfo.bmiHeader.biSize = sizeof(gdi->bminfo.bmiHeader); + gdi->bminfo.bmiHeader.biPlanes = 1; + gdi->bminfo.bmiHeader.biCompression = BI_RGB; + gdi->bminfo.bmiHeader.biSizeImage = 0; + gdi->bminfo.bmiHeader.biXPelsPerMeter = 0; + gdi->bminfo.bmiHeader.biYPelsPerMeter = 0; + gdi->bminfo.bmiHeader.biClrUsed = 0; + gdi->bminfo.bmiHeader.biClrImportant = 0; // initialize the palette to a gray ramp for (i = 0; i < 256; i++) { - gdi->bminfo.bmiColors[i].rgbRed = i; - gdi->bminfo.bmiColors[i].rgbGreen = i; - gdi->bminfo.bmiColors[i].rgbBlue = i; - gdi->bminfo.bmiColors[i].rgbReserved = i; + gdi->bminfo.bmiColors[i].rgbRed = i; + gdi->bminfo.bmiColors[i].rgbGreen = i; + gdi->bminfo.bmiColors[i].rgbBlue = i; + gdi->bminfo.bmiColors[i].rgbReserved = i; } return 0; diff --git a/src/osd/windows/eivcx86.h b/src/osd/windows/eivcx86.h index b9cd1e30dcb..04f337a12bf 100644 --- a/src/osd/windows/eivcx86.h +++ b/src/osd/windows/eivcx86.h @@ -64,12 +64,12 @@ INLINE INT64 _mul_32x32(INT32 a, INT32 b) { // in theory this should work, but it is untested - __asm - { - mov eax,a - imul b - // leave results in edx:eax - } + __asm + { + mov eax,a + imul b + // leave results in edx:eax + } } #endif @@ -85,12 +85,12 @@ INLINE INT64 _mul_32x32(INT32 a, INT32 b) INLINE UINT64 _mulu_32x32(UINT32 a, UINT32 b) { // in theory this should work, but it is untested - __asm - { - mov eax,a - mul b - // leave results in edx:eax - } + __asm + { + mov eax,a + mul b + // leave results in edx:eax + } } #endif @@ -107,12 +107,12 @@ INLINE INT32 _mul_32x32_hi(INT32 a, INT32 b) { INT32 result; - __asm - { - mov eax,a - imul b - mov result,edx - } + __asm + { + mov eax,a + imul b + mov result,edx + } return result; } @@ -131,12 +131,12 @@ INLINE UINT32 _mulu_32x32_hi(UINT32 a, UINT32 b) { INT32 result; - __asm - { - mov eax,a - mul b - mov result,edx - } + __asm + { + mov eax,a + mul b + mov result,edx + } return result; } @@ -156,14 +156,14 @@ INLINE INT32 _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift) { INT32 result; - __asm - { - mov eax,a - imul b - mov cl,shift - shrd eax,edx,cl - mov result,eax - } + __asm + { + mov eax,a + imul b + mov cl,shift + shrd eax,edx,cl + mov result,eax + } return result; } @@ -183,14 +183,14 @@ INLINE UINT32 _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift) { INT32 result; - __asm - { - mov eax,a - mul b - mov cl,shift - shrd eax,edx,cl - mov result,eax - } + __asm + { + mov eax,a + mul b + mov cl,shift + shrd eax,edx,cl + mov result,eax + } return result; } @@ -210,13 +210,13 @@ INLINE INT32 _div_64x32(INT64 a, INT32 b) INT32 alow = a; INT32 ahigh = a >> 32; - __asm - { - mov eax,alow - mov edx,ahigh - idiv b - mov result,eax - } + __asm + { + mov eax,alow + mov edx,ahigh + idiv b + mov result,eax + } return result; } @@ -236,13 +236,13 @@ INLINE UINT32 _divu_64x32(UINT64 a, UINT32 b) UINT32 alow = a; UINT32 ahigh = a >> 32; - __asm - { - mov eax,alow - mov edx,ahigh - div b - mov result,eax - } + __asm + { + mov eax,alow + mov edx,ahigh + div b + mov result,eax + } return result; } @@ -264,14 +264,14 @@ INLINE INT32 _div_64x32_rem(INT64 a, INT32 b, INT32 *remainder) INT32 ahigh = a >> 32; INT32 rem; - __asm - { - mov eax,alow - mov edx,ahigh - idiv b - mov result,eax - mov rem,edx - } + __asm + { + mov eax,alow + mov edx,ahigh + idiv b + mov result,eax + mov rem,edx + } *remainder = rem; return result; @@ -294,14 +294,14 @@ INLINE UINT32 _divu_64x32_rem(UINT64 a, UINT32 b, UINT32 *remainder) UINT32 ahigh = a >> 32; UINT32 rem; - __asm - { - mov eax,alow - mov edx,ahigh - div b - mov result,eax - mov rem,edx - } + __asm + { + mov eax,alow + mov edx,ahigh + div b + mov result,eax + mov rem,edx + } *remainder = rem; return result; @@ -321,16 +321,16 @@ INLINE INT32 _div_32x32_shift(INT32 a, INT32 b, UINT8 shift) { INT32 result; - __asm - { - mov eax,a - cdq - mov cl,shift - shld edx,eax,cl - shl eax,cl - idiv b - mov result,eax - } + __asm + { + mov eax,a + cdq + mov cl,shift + shld edx,eax,cl + shl eax,cl + idiv b + mov result,eax + } return result; } @@ -349,16 +349,16 @@ INLINE UINT32 _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift) { UINT32 result; - __asm - { - mov eax,a - xor edx,edx - mov cl,shift - shld edx,eax,cl - shl eax,cl - div b - mov result,eax - } + __asm + { + mov eax,a + xor edx,edx + mov cl,shift + shld edx,eax,cl + shl eax,cl + div b + mov result,eax + } return result; } @@ -378,13 +378,13 @@ INLINE INT32 _mod_64x32(INT64 a, INT32 b) INT32 alow = a; INT32 ahigh = a >> 32; - __asm - { - mov eax,alow - mov edx,ahigh - idiv b - mov result,edx - } + __asm + { + mov eax,alow + mov edx,ahigh + idiv b + mov result,edx + } return result; } @@ -404,13 +404,13 @@ INLINE UINT32 _modu_64x32(UINT64 a, UINT32 b) UINT32 alow = a; UINT32 ahigh = a >> 32; - __asm - { - mov eax,alow - mov edx,ahigh - div b - mov result,edx - } + __asm + { + mov eax,alow + mov edx,ahigh + div b + mov result,edx + } return result; } @@ -451,15 +451,15 @@ INLINE UINT8 _count_leading_zeros(UINT32 value) { INT32 result; - __asm - { - bsr eax,value - jnz skip - mov eax,63 - skip: - xor eax,31 - mov result,eax - } + __asm + { + bsr eax,value + jnz skip + mov eax,63 + skip: + xor eax,31 + mov result,eax + } return result; } @@ -477,17 +477,17 @@ INLINE UINT8 _count_leading_ones(UINT32 value) { INT32 result; - __asm - { - mov eax,value - not eax - bsr eax,eax - jnz skip - mov eax,63 - skip: - xor eax,31 - mov result,eax - } + __asm + { + mov eax,value + not eax + bsr eax,eax + jnz skip + mov eax,63 + skip: + xor eax,31 + mov result,eax + } return result; } @@ -523,7 +523,7 @@ INLINE osd_ticks_t _get_profile_ticks(void) UINT64 *presult = &result; __asm { - __asm _emit 0Fh __asm _emit 031h // rdtsc + __asm _emit 0Fh __asm _emit 031h // rdtsc mov ebx, presult mov [ebx],eax mov [ebx+4],edx diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c index e22b669efc4..8e28447efaa 100644 --- a/src/osd/windows/input.c +++ b/src/osd/windows/input.c @@ -40,7 +40,7 @@ //============================================================ // For testing purposes: force DirectInput -#define FORCE_DIRECTINPUT 0 +#define FORCE_DIRECTINPUT 0 // standard windows headers #define WIN32_LEAN_AND_MEAN @@ -84,12 +84,12 @@ enum POVDIR_DOWN }; -#define MAX_KEYS 256 +#define MAX_KEYS 256 -#define MAME_KEY 0 -#define DI_KEY 1 -#define VIRTUAL_KEY 2 -#define ASCII_KEY 3 +#define MAME_KEY 0 +#define DI_KEY 1 +#define VIRTUAL_KEY 2 +#define ASCII_KEY 3 @@ -97,12 +97,12 @@ enum // MACROS //============================================================ -#define STRUCTSIZE(x) ((dinput_version == 0x0300) ? sizeof(x##_DX3) : sizeof(x)) +#define STRUCTSIZE(x) ((dinput_version == 0x0300) ? sizeof(x##_DX3) : sizeof(x)) #ifdef UNICODE -#define UNICODE_SUFFIX "W" +#define UNICODE_SUFFIX "W" #else -#define UNICODE_SUFFIX "A" +#define UNICODE_SUFFIX "A" #endif @@ -114,43 +114,43 @@ enum // state information for a keyboard; DirectInput state must be first element struct keyboard_state { - UINT8 state[MAX_KEYS]; - INT8 oldkey[MAX_KEYS]; - INT8 currkey[MAX_KEYS]; + UINT8 state[MAX_KEYS]; + INT8 oldkey[MAX_KEYS]; + INT8 currkey[MAX_KEYS]; }; // state information for a mouse; DirectInput state must be first element struct mouse_state { - DIMOUSESTATE2 state; - LONG raw_x, raw_y, raw_z; + DIMOUSESTATE2 state; + LONG raw_x, raw_y, raw_z; }; // state information for a joystick; DirectInput state must be first element struct joystick_state { - DIJOYSTATE state; - LONG rangemin[8]; - LONG rangemax[8]; + DIJOYSTATE state; + LONG rangemin[8]; + LONG rangemax[8]; }; // DirectInput-specific information about a device struct dinput_device_info { - LPDIRECTINPUTDEVICE device; - LPDIRECTINPUTDEVICE2 device2; - DIDEVCAPS caps; - LPCDIDATAFORMAT format; + LPDIRECTINPUTDEVICE device; + LPDIRECTINPUTDEVICE2 device2; + DIDEVCAPS caps; + LPCDIDATAFORMAT format; }; // RawInput-specific information about a device struct rawinput_device_info { - HANDLE device; + HANDLE device; }; @@ -164,28 +164,28 @@ public: running_machine &machine() const { return m_machine; } // device information - device_info ** head; - device_info * next; - const char * name; - void (*poll)(device_info *info); + device_info ** head; + device_info * next; + const char * name; + void (*poll)(device_info *info); // MAME information - input_device * device; + input_device * device; // device state union { - keyboard_state keyboard; - mouse_state mouse; - joystick_state joystick; + keyboard_state keyboard; + mouse_state mouse; + joystick_state joystick; }; // DirectInput/RawInput-specific state - dinput_device_info dinput; - rawinput_device_info rawinput; + dinput_device_info dinput; + rawinput_device_info rawinput; private: - running_machine & m_machine; + running_machine & m_machine; }; @@ -202,36 +202,36 @@ typedef /*WINUSERAPI*/ BOOL (WINAPI *register_rawinput_devices_ptr)(IN PCRAWINPU //============================================================ // global states -static UINT8 input_enabled; -static osd_lock * input_lock; -static UINT8 input_paused; -static DWORD last_poll; +static UINT8 input_enabled; +static osd_lock * input_lock; +static UINT8 input_paused; +static DWORD last_poll; // DirectInput variables -static LPDIRECTINPUT dinput; -static int dinput_version; +static LPDIRECTINPUT dinput; +static int dinput_version; // RawInput variables -static get_rawinput_device_list_ptr get_rawinput_device_list; -static get_rawinput_data_ptr get_rawinput_data; -static get_rawinput_device_info_ptr get_rawinput_device_info; -static register_rawinput_devices_ptr register_rawinput_devices; +static get_rawinput_device_list_ptr get_rawinput_device_list; +static get_rawinput_data_ptr get_rawinput_data; +static get_rawinput_device_info_ptr get_rawinput_device_info; +static register_rawinput_devices_ptr register_rawinput_devices; // keyboard states -static UINT8 keyboard_win32_reported_key_down; -static device_info * keyboard_list; +static UINT8 keyboard_win32_reported_key_down; +static device_info * keyboard_list; // mouse states -static UINT8 mouse_enabled; -static device_info * mouse_list; +static UINT8 mouse_enabled; +static device_info * mouse_list; // lightgun states -static UINT8 lightgun_shared_axis_mode; -static UINT8 lightgun_enabled; -static device_info * lightgun_list; +static UINT8 lightgun_shared_axis_mode; +static UINT8 lightgun_enabled; +static device_info * lightgun_list; // joystick states -static device_info * joystick_list; +static device_info * joystick_list; // default axis names static const TCHAR *const default_axis_name[] = @@ -311,115 +311,115 @@ static const TCHAR *default_pov_name(int which); static const int win_key_trans_table[][4] = { // MAME key dinput key virtual key ascii - { ITEM_ID_ESC, DIK_ESCAPE, VK_ESCAPE, 27 }, - { ITEM_ID_1, DIK_1, '1', '1' }, - { ITEM_ID_2, DIK_2, '2', '2' }, - { ITEM_ID_3, DIK_3, '3', '3' }, - { ITEM_ID_4, DIK_4, '4', '4' }, - { ITEM_ID_5, DIK_5, '5', '5' }, - { ITEM_ID_6, DIK_6, '6', '6' }, - { ITEM_ID_7, DIK_7, '7', '7' }, - { ITEM_ID_8, DIK_8, '8', '8' }, - { ITEM_ID_9, DIK_9, '9', '9' }, - { ITEM_ID_0, DIK_0, '0', '0' }, - { ITEM_ID_MINUS, DIK_MINUS, VK_OEM_MINUS, '-' }, - { ITEM_ID_EQUALS, DIK_EQUALS, VK_OEM_PLUS, '=' }, - { ITEM_ID_BACKSPACE, DIK_BACK, VK_BACK, 8 }, - { ITEM_ID_TAB, DIK_TAB, VK_TAB, 9 }, - { ITEM_ID_Q, DIK_Q, 'Q', 'Q' }, - { ITEM_ID_W, DIK_W, 'W', 'W' }, - { ITEM_ID_E, DIK_E, 'E', 'E' }, - { ITEM_ID_R, DIK_R, 'R', 'R' }, - { ITEM_ID_T, DIK_T, 'T', 'T' }, - { ITEM_ID_Y, DIK_Y, 'Y', 'Y' }, - { ITEM_ID_U, DIK_U, 'U', 'U' }, - { ITEM_ID_I, DIK_I, 'I', 'I' }, - { ITEM_ID_O, DIK_O, 'O', 'O' }, - { ITEM_ID_P, DIK_P, 'P', 'P' }, - { ITEM_ID_OPENBRACE, DIK_LBRACKET, VK_OEM_4, '[' }, - { ITEM_ID_CLOSEBRACE, DIK_RBRACKET, VK_OEM_6, ']' }, - { ITEM_ID_ENTER, DIK_RETURN, VK_RETURN, 13 }, - { ITEM_ID_LCONTROL, DIK_LCONTROL, VK_LCONTROL, 0 }, - { ITEM_ID_A, DIK_A, 'A', 'A' }, - { ITEM_ID_S, DIK_S, 'S', 'S' }, - { ITEM_ID_D, DIK_D, 'D', 'D' }, - { ITEM_ID_F, DIK_F, 'F', 'F' }, - { ITEM_ID_G, DIK_G, 'G', 'G' }, - { ITEM_ID_H, DIK_H, 'H', 'H' }, - { ITEM_ID_J, DIK_J, 'J', 'J' }, - { ITEM_ID_K, DIK_K, 'K', 'K' }, - { ITEM_ID_L, DIK_L, 'L', 'L' }, - { ITEM_ID_COLON, DIK_SEMICOLON, VK_OEM_1, ';' }, - { ITEM_ID_QUOTE, DIK_APOSTROPHE, VK_OEM_7, '\'' }, - { ITEM_ID_TILDE, DIK_GRAVE, VK_OEM_3, '`' }, - { ITEM_ID_LSHIFT, DIK_LSHIFT, VK_LSHIFT, 0 }, - { ITEM_ID_BACKSLASH, DIK_BACKSLASH, VK_OEM_5, '\\' }, - { ITEM_ID_BACKSLASH2, DIK_OEM_102, VK_OEM_102, '<' }, - { ITEM_ID_Z, DIK_Z, 'Z', 'Z' }, - { ITEM_ID_X, DIK_X, 'X', 'X' }, - { ITEM_ID_C, DIK_C, 'C', 'C' }, - { ITEM_ID_V, DIK_V, 'V', 'V' }, - { ITEM_ID_B, DIK_B, 'B', 'B' }, - { ITEM_ID_N, DIK_N, 'N', 'N' }, - { ITEM_ID_M, DIK_M, 'M', 'M' }, - { ITEM_ID_COMMA, DIK_COMMA, VK_OEM_COMMA, ',' }, - { ITEM_ID_STOP, DIK_PERIOD, VK_OEM_PERIOD, '.' }, - { ITEM_ID_SLASH, DIK_SLASH, VK_OEM_2, '/' }, - { ITEM_ID_RSHIFT, DIK_RSHIFT, VK_RSHIFT, 0 }, - { ITEM_ID_ASTERISK, DIK_MULTIPLY, VK_MULTIPLY, '*' }, - { ITEM_ID_LALT, DIK_LMENU, VK_LMENU, 0 }, - { ITEM_ID_SPACE, DIK_SPACE, VK_SPACE, ' ' }, - { ITEM_ID_CAPSLOCK, DIK_CAPITAL, VK_CAPITAL, 0 }, - { ITEM_ID_F1, DIK_F1, VK_F1, 0 }, - { ITEM_ID_F2, DIK_F2, VK_F2, 0 }, - { ITEM_ID_F3, DIK_F3, VK_F3, 0 }, - { ITEM_ID_F4, DIK_F4, VK_F4, 0 }, - { ITEM_ID_F5, DIK_F5, VK_F5, 0 }, - { ITEM_ID_F6, DIK_F6, VK_F6, 0 }, - { ITEM_ID_F7, DIK_F7, VK_F7, 0 }, - { ITEM_ID_F8, DIK_F8, VK_F8, 0 }, - { ITEM_ID_F9, DIK_F9, VK_F9, 0 }, - { ITEM_ID_F10, DIK_F10, VK_F10, 0 }, - { ITEM_ID_NUMLOCK, DIK_NUMLOCK, VK_NUMLOCK, 0 }, - { ITEM_ID_SCRLOCK, DIK_SCROLL, VK_SCROLL, 0 }, - { ITEM_ID_7_PAD, DIK_NUMPAD7, VK_NUMPAD7, 0 }, - { ITEM_ID_8_PAD, DIK_NUMPAD8, VK_NUMPAD8, 0 }, - { ITEM_ID_9_PAD, DIK_NUMPAD9, VK_NUMPAD9, 0 }, - { ITEM_ID_MINUS_PAD, DIK_SUBTRACT, VK_SUBTRACT, 0 }, - { ITEM_ID_4_PAD, DIK_NUMPAD4, VK_NUMPAD4, 0 }, - { ITEM_ID_5_PAD, DIK_NUMPAD5, VK_NUMPAD5, 0 }, - { ITEM_ID_6_PAD, DIK_NUMPAD6, VK_NUMPAD6, 0 }, - { ITEM_ID_PLUS_PAD, DIK_ADD, VK_ADD, 0 }, - { ITEM_ID_1_PAD, DIK_NUMPAD1, VK_NUMPAD1, 0 }, - { ITEM_ID_2_PAD, DIK_NUMPAD2, VK_NUMPAD2, 0 }, - { ITEM_ID_3_PAD, DIK_NUMPAD3, VK_NUMPAD3, 0 }, - { ITEM_ID_0_PAD, DIK_NUMPAD0, VK_NUMPAD0, 0 }, - { ITEM_ID_DEL_PAD, DIK_DECIMAL, VK_DECIMAL, 0 }, - { ITEM_ID_F11, DIK_F11, VK_F11, 0 }, - { ITEM_ID_F12, DIK_F12, VK_F12, 0 }, - { ITEM_ID_F13, DIK_F13, VK_F13, 0 }, - { ITEM_ID_F14, DIK_F14, VK_F14, 0 }, - { ITEM_ID_F15, DIK_F15, VK_F15, 0 }, - { ITEM_ID_ENTER_PAD, DIK_NUMPADENTER, VK_RETURN, 0 }, - { ITEM_ID_RCONTROL, DIK_RCONTROL, VK_RCONTROL, 0 }, - { ITEM_ID_SLASH_PAD, DIK_DIVIDE, VK_DIVIDE, 0 }, - { ITEM_ID_PRTSCR, DIK_SYSRQ, 0, 0 }, - { ITEM_ID_RALT, DIK_RMENU, VK_RMENU, 0 }, - { ITEM_ID_HOME, DIK_HOME, VK_HOME, 0 }, - { ITEM_ID_UP, DIK_UP, VK_UP, 0 }, - { ITEM_ID_PGUP, DIK_PRIOR, VK_PRIOR, 0 }, - { ITEM_ID_LEFT, DIK_LEFT, VK_LEFT, 0 }, - { ITEM_ID_RIGHT, DIK_RIGHT, VK_RIGHT, 0 }, - { ITEM_ID_END, DIK_END, VK_END, 0 }, - { ITEM_ID_DOWN, DIK_DOWN, VK_DOWN, 0 }, - { ITEM_ID_PGDN, DIK_NEXT, VK_NEXT, 0 }, - { ITEM_ID_INSERT, DIK_INSERT, VK_INSERT, 0 }, - { ITEM_ID_DEL, DIK_DELETE, VK_DELETE, 0 }, - { ITEM_ID_LWIN, DIK_LWIN, VK_LWIN, 0 }, - { ITEM_ID_RWIN, DIK_RWIN, VK_RWIN, 0 }, - { ITEM_ID_MENU, DIK_APPS, VK_APPS, 0 }, - { ITEM_ID_PAUSE, DIK_PAUSE, VK_PAUSE, 0 }, - { ITEM_ID_CANCEL, 0, VK_CANCEL, 0 }, + { ITEM_ID_ESC, DIK_ESCAPE, VK_ESCAPE, 27 }, + { ITEM_ID_1, DIK_1, '1', '1' }, + { ITEM_ID_2, DIK_2, '2', '2' }, + { ITEM_ID_3, DIK_3, '3', '3' }, + { ITEM_ID_4, DIK_4, '4', '4' }, + { ITEM_ID_5, DIK_5, '5', '5' }, + { ITEM_ID_6, DIK_6, '6', '6' }, + { ITEM_ID_7, DIK_7, '7', '7' }, + { ITEM_ID_8, DIK_8, '8', '8' }, + { ITEM_ID_9, DIK_9, '9', '9' }, + { ITEM_ID_0, DIK_0, '0', '0' }, + { ITEM_ID_MINUS, DIK_MINUS, VK_OEM_MINUS, '-' }, + { ITEM_ID_EQUALS, DIK_EQUALS, VK_OEM_PLUS, '=' }, + { ITEM_ID_BACKSPACE, DIK_BACK, VK_BACK, 8 }, + { ITEM_ID_TAB, DIK_TAB, VK_TAB, 9 }, + { ITEM_ID_Q, DIK_Q, 'Q', 'Q' }, + { ITEM_ID_W, DIK_W, 'W', 'W' }, + { ITEM_ID_E, DIK_E, 'E', 'E' }, + { ITEM_ID_R, DIK_R, 'R', 'R' }, + { ITEM_ID_T, DIK_T, 'T', 'T' }, + { ITEM_ID_Y, DIK_Y, 'Y', 'Y' }, + { ITEM_ID_U, DIK_U, 'U', 'U' }, + { ITEM_ID_I, DIK_I, 'I', 'I' }, + { ITEM_ID_O, DIK_O, 'O', 'O' }, + { ITEM_ID_P, DIK_P, 'P', 'P' }, + { ITEM_ID_OPENBRACE, DIK_LBRACKET, VK_OEM_4, '[' }, + { ITEM_ID_CLOSEBRACE, DIK_RBRACKET, VK_OEM_6, ']' }, + { ITEM_ID_ENTER, DIK_RETURN, VK_RETURN, 13 }, + { ITEM_ID_LCONTROL, DIK_LCONTROL, VK_LCONTROL, 0 }, + { ITEM_ID_A, DIK_A, 'A', 'A' }, + { ITEM_ID_S, DIK_S, 'S', 'S' }, + { ITEM_ID_D, DIK_D, 'D', 'D' }, + { ITEM_ID_F, DIK_F, 'F', 'F' }, + { ITEM_ID_G, DIK_G, 'G', 'G' }, + { ITEM_ID_H, DIK_H, 'H', 'H' }, + { ITEM_ID_J, DIK_J, 'J', 'J' }, + { ITEM_ID_K, DIK_K, 'K', 'K' }, + { ITEM_ID_L, DIK_L, 'L', 'L' }, + { ITEM_ID_COLON, DIK_SEMICOLON, VK_OEM_1, ';' }, + { ITEM_ID_QUOTE, DIK_APOSTROPHE, VK_OEM_7, '\'' }, + { ITEM_ID_TILDE, DIK_GRAVE, VK_OEM_3, '`' }, + { ITEM_ID_LSHIFT, DIK_LSHIFT, VK_LSHIFT, 0 }, + { ITEM_ID_BACKSLASH, DIK_BACKSLASH, VK_OEM_5, '\\' }, + { ITEM_ID_BACKSLASH2, DIK_OEM_102, VK_OEM_102, '<' }, + { ITEM_ID_Z, DIK_Z, 'Z', 'Z' }, + { ITEM_ID_X, DIK_X, 'X', 'X' }, + { ITEM_ID_C, DIK_C, 'C', 'C' }, + { ITEM_ID_V, DIK_V, 'V', 'V' }, + { ITEM_ID_B, DIK_B, 'B', 'B' }, + { ITEM_ID_N, DIK_N, 'N', 'N' }, + { ITEM_ID_M, DIK_M, 'M', 'M' }, + { ITEM_ID_COMMA, DIK_COMMA, VK_OEM_COMMA, ',' }, + { ITEM_ID_STOP, DIK_PERIOD, VK_OEM_PERIOD, '.' }, + { ITEM_ID_SLASH, DIK_SLASH, VK_OEM_2, '/' }, + { ITEM_ID_RSHIFT, DIK_RSHIFT, VK_RSHIFT, 0 }, + { ITEM_ID_ASTERISK, DIK_MULTIPLY, VK_MULTIPLY, '*' }, + { ITEM_ID_LALT, DIK_LMENU, VK_LMENU, 0 }, + { ITEM_ID_SPACE, DIK_SPACE, VK_SPACE, ' ' }, + { ITEM_ID_CAPSLOCK, DIK_CAPITAL, VK_CAPITAL, 0 }, + { ITEM_ID_F1, DIK_F1, VK_F1, 0 }, + { ITEM_ID_F2, DIK_F2, VK_F2, 0 }, + { ITEM_ID_F3, DIK_F3, VK_F3, 0 }, + { ITEM_ID_F4, DIK_F4, VK_F4, 0 }, + { ITEM_ID_F5, DIK_F5, VK_F5, 0 }, + { ITEM_ID_F6, DIK_F6, VK_F6, 0 }, + { ITEM_ID_F7, DIK_F7, VK_F7, 0 }, + { ITEM_ID_F8, DIK_F8, VK_F8, 0 }, + { ITEM_ID_F9, DIK_F9, VK_F9, 0 }, + { ITEM_ID_F10, DIK_F10, VK_F10, 0 }, + { ITEM_ID_NUMLOCK, DIK_NUMLOCK, VK_NUMLOCK, 0 }, + { ITEM_ID_SCRLOCK, DIK_SCROLL, VK_SCROLL, 0 }, + { ITEM_ID_7_PAD, DIK_NUMPAD7, VK_NUMPAD7, 0 }, + { ITEM_ID_8_PAD, DIK_NUMPAD8, VK_NUMPAD8, 0 }, + { ITEM_ID_9_PAD, DIK_NUMPAD9, VK_NUMPAD9, 0 }, + { ITEM_ID_MINUS_PAD, DIK_SUBTRACT, VK_SUBTRACT, 0 }, + { ITEM_ID_4_PAD, DIK_NUMPAD4, VK_NUMPAD4, 0 }, + { ITEM_ID_5_PAD, DIK_NUMPAD5, VK_NUMPAD5, 0 }, + { ITEM_ID_6_PAD, DIK_NUMPAD6, VK_NUMPAD6, 0 }, + { ITEM_ID_PLUS_PAD, DIK_ADD, VK_ADD, 0 }, + { ITEM_ID_1_PAD, DIK_NUMPAD1, VK_NUMPAD1, 0 }, + { ITEM_ID_2_PAD, DIK_NUMPAD2, VK_NUMPAD2, 0 }, + { ITEM_ID_3_PAD, DIK_NUMPAD3, VK_NUMPAD3, 0 }, + { ITEM_ID_0_PAD, DIK_NUMPAD0, VK_NUMPAD0, 0 }, + { ITEM_ID_DEL_PAD, DIK_DECIMAL, VK_DECIMAL, 0 }, + { ITEM_ID_F11, DIK_F11, VK_F11, 0 }, + { ITEM_ID_F12, DIK_F12, VK_F12, 0 }, + { ITEM_ID_F13, DIK_F13, VK_F13, 0 }, + { ITEM_ID_F14, DIK_F14, VK_F14, 0 }, + { ITEM_ID_F15, DIK_F15, VK_F15, 0 }, + { ITEM_ID_ENTER_PAD, DIK_NUMPADENTER, VK_RETURN, 0 }, + { ITEM_ID_RCONTROL, DIK_RCONTROL, VK_RCONTROL, 0 }, + { ITEM_ID_SLASH_PAD, DIK_DIVIDE, VK_DIVIDE, 0 }, + { ITEM_ID_PRTSCR, DIK_SYSRQ, 0, 0 }, + { ITEM_ID_RALT, DIK_RMENU, VK_RMENU, 0 }, + { ITEM_ID_HOME, DIK_HOME, VK_HOME, 0 }, + { ITEM_ID_UP, DIK_UP, VK_UP, 0 }, + { ITEM_ID_PGUP, DIK_PRIOR, VK_PRIOR, 0 }, + { ITEM_ID_LEFT, DIK_LEFT, VK_LEFT, 0 }, + { ITEM_ID_RIGHT, DIK_RIGHT, VK_RIGHT, 0 }, + { ITEM_ID_END, DIK_END, VK_END, 0 }, + { ITEM_ID_DOWN, DIK_DOWN, VK_DOWN, 0 }, + { ITEM_ID_PGDN, DIK_NEXT, VK_NEXT, 0 }, + { ITEM_ID_INSERT, DIK_INSERT, VK_INSERT, 0 }, + { ITEM_ID_DEL, DIK_DELETE, VK_DELETE, 0 }, + { ITEM_ID_LWIN, DIK_LWIN, VK_LWIN, 0 }, + { ITEM_ID_RWIN, DIK_RWIN, VK_RWIN, 0 }, + { ITEM_ID_MENU, DIK_APPS, VK_APPS, 0 }, + { ITEM_ID_PAUSE, DIK_PAUSE, VK_PAUSE, 0 }, + { ITEM_ID_CANCEL, 0, VK_CANCEL, 0 }, // New keys introduced in Windows 2000. These have no MAME codes to // preserve compatibility with old config files that may refer to them @@ -429,18 +429,18 @@ static const int win_key_trans_table[][4] = // paused). Some codes are missing because the mapping to vkey codes // isn't clear, and MapVirtualKey is no help. - { ITEM_ID_OTHER_SWITCH, DIK_MUTE, VK_VOLUME_MUTE, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_VOLUMEDOWN, VK_VOLUME_DOWN, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_VOLUMEUP, VK_VOLUME_UP, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_WEBHOME, VK_BROWSER_HOME, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_WEBSEARCH, VK_BROWSER_SEARCH, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_WEBFAVORITES, VK_BROWSER_FAVORITES, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_WEBREFRESH, VK_BROWSER_REFRESH, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_WEBSTOP, VK_BROWSER_STOP, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_WEBFORWARD, VK_BROWSER_FORWARD, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_WEBBACK, VK_BROWSER_BACK, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_MAIL, VK_LAUNCH_MAIL, 0 }, - { ITEM_ID_OTHER_SWITCH, DIK_MEDIASELECT, VK_LAUNCH_MEDIA_SELECT, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_MUTE, VK_VOLUME_MUTE, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_VOLUMEDOWN, VK_VOLUME_DOWN, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_VOLUMEUP, VK_VOLUME_UP, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_WEBHOME, VK_BROWSER_HOME, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_WEBSEARCH, VK_BROWSER_SEARCH, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_WEBFAVORITES, VK_BROWSER_FAVORITES, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_WEBREFRESH, VK_BROWSER_REFRESH, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_WEBSTOP, VK_BROWSER_STOP, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_WEBFORWARD, VK_BROWSER_FORWARD, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_WEBBACK, VK_BROWSER_BACK, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_MAIL, VK_LAUNCH_MAIL, 0 }, + { ITEM_ID_OTHER_SWITCH, DIK_MEDIASELECT, VK_LAUNCH_MEDIA_SELECT, 0 }, }; @@ -1649,10 +1649,10 @@ static INT32 dinput_joystick_pov_get_state(void *device_internal, void *item_int // return the current state switch (povdir) { - case POVDIR_LEFT: result = (pov >= 22500 && pov <= 31500); break; - case POVDIR_RIGHT: result = (pov >= 4500 && pov <= 13500); break; - case POVDIR_UP: result = (pov >= 31500 || pov <= 4500); break; - case POVDIR_DOWN: result = (pov >= 13500 && pov <= 22500); break; + case POVDIR_LEFT: result = (pov >= 22500 && pov <= 31500); break; + case POVDIR_RIGHT: result = (pov >= 4500 && pov <= 13500); break; + case POVDIR_UP: result = (pov >= 31500 || pov <= 4500); break; + case POVDIR_DOWN: result = (pov >= 13500 && pov <= 22500); break; } return result; } diff --git a/src/osd/windows/ledutil.c b/src/osd/windows/ledutil.c index 7630bfc15fe..9931e2f053d 100644 --- a/src/osd/windows/ledutil.c +++ b/src/osd/windows/ledutil.c @@ -85,10 +85,10 @@ typedef int running_machine; // note you need to compile as a console app to have any of // these printfs show up -#define DEBUG_VERSION 0 +#define DEBUG_VERSION 0 #if DEBUG_VERSION -#define DEBUG_PRINTF(x) printf x +#define DEBUG_PRINTF(x) printf x #else #define DEBUG_PRINTF(x) #endif @@ -99,31 +99,31 @@ typedef int running_machine; //============================================================ // unique client ID -#define CLIENT_ID (('M' << 24) | ('L' << 16) | ('E' << 8) | ('D' << 0)) +#define CLIENT_ID (('M' << 24) | ('L' << 16) | ('E' << 8) | ('D' << 0)) // LED methods -#define LED_METHOD_PS2 0 -#define LED_METHOD_USB 1 -#define LED_METHOD_WIN9X 2 +#define LED_METHOD_PS2 0 +#define LED_METHOD_USB 1 +#define LED_METHOD_WIN9X 2 // window parameters -#define WINDOW_CLASS TEXT("LEDSample") -#define WINDOW_NAME TEXT("LEDSample") +#define WINDOW_CLASS TEXT("LEDSample") +#define WINDOW_NAME TEXT("LEDSample") // window styles -#define WINDOW_STYLE WS_OVERLAPPEDWINDOW -#define WINDOW_STYLE_EX 0 +#define WINDOW_STYLE WS_OVERLAPPEDWINDOW +#define WINDOW_STYLE_EX 0 // Define the keyboard indicators. // (Definitions borrowed from ntddkbd.h) -#define IOCTL_KEYBOARD_SET_INDICATORS CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0002, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_KEYBOARD_QUERY_TYPEMATIC CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_KEYBOARD_QUERY_INDICATORS CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_KEYBOARD_SET_INDICATORS CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0002, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_KEYBOARD_QUERY_TYPEMATIC CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_KEYBOARD_QUERY_INDICATORS CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define KEYBOARD_SCROLL_LOCK_ON 1 -#define KEYBOARD_NUM_LOCK_ON 2 -#define KEYBOARD_CAPS_LOCK_ON 4 +#define KEYBOARD_SCROLL_LOCK_ON 1 +#define KEYBOARD_NUM_LOCK_ON 2 +#define KEYBOARD_CAPS_LOCK_ON 4 @@ -133,16 +133,16 @@ typedef int running_machine; struct KEYBOARD_INDICATOR_PARAMETERS { - USHORT UnitId; // Unit identifier. - USHORT LedFlags; // LED indicator state. + USHORT UnitId; // Unit identifier. + USHORT LedFlags; // LED indicator state. }; struct id_map_entry { - id_map_entry * next; - const char * name; - WPARAM id; + id_map_entry * next; + const char * name; + WPARAM id; }; @@ -151,24 +151,24 @@ struct id_map_entry // GLOBAL VARIABLES //============================================================ -static int ledmethod; -static int original_state; -static int current_state; -static int pause_state; -static HANDLE hKbdDev; +static int ledmethod; +static int original_state; +static int current_state; +static int pause_state; +static HANDLE hKbdDev; -static HWND mame_target; -static HWND listener_hwnd; +static HWND mame_target; +static HWND listener_hwnd; -static id_map_entry * idmaplist; +static id_map_entry * idmaplist; // message IDs -static UINT om_mame_start; -static UINT om_mame_stop; -static UINT om_mame_update_state; -static UINT om_mame_register_client; -static UINT om_mame_unregister_client; -static UINT om_mame_get_id_string; +static UINT om_mame_start; +static UINT om_mame_stop; +static UINT om_mame_update_state; +static UINT om_mame_register_client; +static UINT om_mame_unregister_client; +static UINT om_mame_get_id_string; @@ -306,9 +306,9 @@ static int create_window_class(void) WNDCLASS wc = { 0 }; // initialize the description of the window class - wc.lpszClassName = WINDOW_CLASS; - wc.hInstance = GetModuleHandle(NULL); - wc.lpfnWndProc = listener_window_proc; + wc.lpszClassName = WINDOW_CLASS; + wc.hInstance = GetModuleHandle(NULL); + wc.lpfnWndProc = listener_window_proc; // register the class; fail if we can't if (!RegisterClass(&wc)) @@ -670,9 +670,9 @@ static int led_get_state(void) case LED_METHOD_PS2: { - KEYBOARD_INDICATOR_PARAMETERS OutputBuffer; // Output buffer for DeviceIoControl - ULONG DataLength = sizeof(KEYBOARD_INDICATOR_PARAMETERS); - ULONG ReturnedLength; // Number of bytes returned in output buffer + KEYBOARD_INDICATOR_PARAMETERS OutputBuffer; // Output buffer for DeviceIoControl + ULONG DataLength = sizeof(KEYBOARD_INDICATOR_PARAMETERS); + ULONG ReturnedLength; // Number of bytes returned in output buffer // Address first keyboard OutputBuffer.UnitId = 0; @@ -750,10 +750,10 @@ static void led_set_state(int state) case LED_METHOD_PS2: { - KEYBOARD_INDICATOR_PARAMETERS InputBuffer; // Input buffer for DeviceIoControl - ULONG DataLength = sizeof(KEYBOARD_INDICATOR_PARAMETERS); - ULONG ReturnedLength; // Number of bytes returned in output buffer - UINT LedFlags=0; + KEYBOARD_INDICATOR_PARAMETERS InputBuffer; // Input buffer for DeviceIoControl + ULONG DataLength = sizeof(KEYBOARD_INDICATOR_PARAMETERS); + ULONG ReturnedLength; // Number of bytes returned in output buffer + UINT LedFlags=0; // Demangle lights to match 95/98 if (state & 0x1) LedFlags |= KEYBOARD_NUM_LOCK_ON; diff --git a/src/osd/windows/netdev_pcap.c b/src/osd/windows/netdev_pcap.c index b1f5b0e97c8..92dc87b0b42 100644 --- a/src/osd/windows/netdev_pcap.c +++ b/src/osd/windows/netdev_pcap.c @@ -135,4 +135,3 @@ void deinit_pcap() clear_netdev(); FreeLibrary(handle); } - diff --git a/src/osd/windows/output.c b/src/osd/windows/output.c index 637ba1f94f8..483042eecf1 100644 --- a/src/osd/windows/output.c +++ b/src/osd/windows/output.c @@ -57,8 +57,8 @@ //============================================================ // window styles -#define WINDOW_STYLE WS_OVERLAPPEDWINDOW -#define WINDOW_STYLE_EX 0 +#define WINDOW_STYLE WS_OVERLAPPEDWINDOW +#define WINDOW_STYLE_EX 0 @@ -68,9 +68,9 @@ struct registered_client { - registered_client * next; // next client in the list - LPARAM id; // client-specified ID - HWND hwnd; // client HWND + registered_client * next; // next client in the list + LPARAM id; // client-specified ID + HWND hwnd; // client HWND }; @@ -80,18 +80,18 @@ struct registered_client //============================================================ // our HWND -static HWND output_hwnd; +static HWND output_hwnd; // client list -static registered_client * clientlist; +static registered_client * clientlist; // message IDs -static UINT om_mame_start; -static UINT om_mame_stop; -static UINT om_mame_update_state; -static UINT om_mame_register_client; -static UINT om_mame_unregister_client; -static UINT om_mame_get_id_string; +static UINT om_mame_start; +static UINT om_mame_stop; +static UINT om_mame_update_state; +static UINT om_mame_register_client; +static UINT om_mame_unregister_client; +static UINT om_mame_get_id_string; @@ -201,9 +201,9 @@ static int create_window_class(void) WNDCLASS wc = { 0 }; // initialize the description of the window class - wc.lpszClassName = OUTPUT_WINDOW_CLASS; - wc.hInstance = GetModuleHandle(NULL); - wc.lpfnWndProc = output_window_proc; + wc.lpszClassName = OUTPUT_WINDOW_CLASS; + wc.hInstance = GetModuleHandle(NULL); + wc.lpfnWndProc = output_window_proc; // register the class; fail if we can't if (!RegisterClass(&wc)) diff --git a/src/osd/windows/output.h b/src/osd/windows/output.h index 8e8919116e3..b563c2e0711 100644 --- a/src/osd/windows/output.h +++ b/src/osd/windows/output.h @@ -48,8 +48,8 @@ //============================================================ // window parameters -#define OUTPUT_WINDOW_CLASS TEXT("MAMEOutput") -#define OUTPUT_WINDOW_NAME TEXT("MAMEOutput") +#define OUTPUT_WINDOW_CLASS TEXT("MAMEOutput") +#define OUTPUT_WINDOW_NAME TEXT("MAMEOutput") // // These messages are sent by MAME: @@ -58,18 +58,18 @@ // OM_MAME_START: broadcast when MAME initializes // WPARAM = HWND of MAME's output window // LPARAM = unused -#define OM_MAME_START TEXT("MAMEOutputStart") +#define OM_MAME_START TEXT("MAMEOutputStart") // OM_MAME_STOP: broadcast when MAME shuts down // WPARAM = HWND of MAME's output window // LPARAM = unused -#define OM_MAME_STOP TEXT("MAMEOutputStop") +#define OM_MAME_STOP TEXT("MAMEOutputStop") // OM_MAME_UPDATE_STATE: sent to registered clients when the state // of an output changes // WPARAM = ID of the output // LPARAM = new value for the output -#define OM_MAME_UPDATE_STATE TEXT("MAMEOutputUpdateState") +#define OM_MAME_UPDATE_STATE TEXT("MAMEOutputUpdateState") // @@ -79,12 +79,12 @@ // OM_MAME_REGISTER_CLIENT: sent to MAME to register a client // WPARAM = HWND of client's listener window // LPARAM = client-specified ID (must be unique) -#define OM_MAME_REGISTER_CLIENT TEXT("MAMEOutputRegister") +#define OM_MAME_REGISTER_CLIENT TEXT("MAMEOutputRegister") // OM_MAME_UNREGISTER_CLIENT: sent to MAME to unregister a client // WPARAM = HWND of client's listener window // LPARAM = client-specified ID (must match registration) -#define OM_MAME_UNREGISTER_CLIENT TEXT("MAMEOutputUnregister") +#define OM_MAME_UNREGISTER_CLIENT TEXT("MAMEOutputUnregister") // OM_MAME_GET_ID_STRING: requests the string associated with a // given ID. ID=0 is always the name of the game. Other IDs are @@ -94,7 +94,7 @@ // and lpData pointing to a NULL-terminated string. // WPARAM = HWND of client's listener window // LPARAM = ID you wish to know about -#define OM_MAME_GET_ID_STRING TEXT("MAMEOutputGetIDString") +#define OM_MAME_GET_ID_STRING TEXT("MAMEOutputGetIDString") // @@ -102,7 +102,7 @@ // coming from MAME: // -#define COPYDATA_MESSAGE_ID_STRING 1 +#define COPYDATA_MESSAGE_ID_STRING 1 @@ -112,8 +112,8 @@ struct copydata_id_string { - UINT32 id; // ID that was requested - char string[1]; // string array containing the data + UINT32 id; // ID that was requested + char string[1]; // string array containing the data }; diff --git a/src/osd/windows/sound.c b/src/osd/windows/sound.c index 413c8fb9e0b..9ccfc39e6c3 100644 --- a/src/osd/windows/sound.c +++ b/src/osd/windows/sound.c @@ -66,7 +66,7 @@ // DEBUGGING //============================================================ -#define LOG_SOUND 0 +#define LOG_SOUND 0 #define LOG(x) do { if (LOG_SOUND) logerror x; } while(0) @@ -76,35 +76,35 @@ //============================================================ // DirectSound objects -static LPDIRECTSOUND dsound; -static DSCAPS dsound_caps; +static LPDIRECTSOUND dsound; +static DSCAPS dsound_caps; // sound buffers -static LPDIRECTSOUNDBUFFER primary_buffer; -static LPDIRECTSOUNDBUFFER stream_buffer; -static UINT32 stream_buffer_size; -static UINT32 stream_buffer_in; +static LPDIRECTSOUNDBUFFER primary_buffer; +static LPDIRECTSOUNDBUFFER stream_buffer; +static UINT32 stream_buffer_size; +static UINT32 stream_buffer_in; // descriptors and formats -static DSBUFFERDESC primary_desc; -static DSBUFFERDESC stream_desc; -static WAVEFORMATEX primary_format; -static WAVEFORMATEX stream_format; +static DSBUFFERDESC primary_desc; +static DSBUFFERDESC stream_desc; +static WAVEFORMATEX primary_format; +static WAVEFORMATEX stream_format; // buffer over/underflow counts -static int buffer_underflows; -static int buffer_overflows; +static int buffer_underflows; +static int buffer_overflows; //============================================================ // PROTOTYPES //============================================================ -static void sound_exit(running_machine &machine); -static HRESULT dsound_init(running_machine &machine); -static void dsound_kill(void); -static HRESULT dsound_create_buffers(void); -static void dsound_destroy_buffers(void); +static void sound_exit(running_machine &machine); +static HRESULT dsound_init(running_machine &machine); +static void dsound_kill(void); +static HRESULT dsound_create_buffers(void); +static void dsound_destroy_buffers(void); @@ -297,12 +297,12 @@ static HRESULT dsound_init(running_machine &machine) } // make a format description for what we want - stream_format.wBitsPerSample = 16; - stream_format.wFormatTag = WAVE_FORMAT_PCM; - stream_format.nChannels = 2; - stream_format.nSamplesPerSec = machine.sample_rate(); - stream_format.nBlockAlign = stream_format.wBitsPerSample * stream_format.nChannels / 8; - stream_format.nAvgBytesPerSec = stream_format.nSamplesPerSec * stream_format.nBlockAlign; + stream_format.wBitsPerSample = 16; + stream_format.wFormatTag = WAVE_FORMAT_PCM; + stream_format.nChannels = 2; + stream_format.nSamplesPerSec = machine.sample_rate(); + stream_format.nBlockAlign = stream_format.wBitsPerSample * stream_format.nChannels / 8; + stream_format.nAvgBytesPerSec = stream_format.nSamplesPerSec * stream_format.nBlockAlign; // compute the buffer size based on the output sample rate stream_buffer_size = stream_format.nSamplesPerSec * stream_format.nBlockAlign * downcast<windows_options &>(machine.options()).audio_latency() / 10; @@ -359,7 +359,7 @@ static HRESULT dsound_create_buffers(void) // create a buffer desc for the primary buffer memset(&primary_desc, 0, sizeof(primary_desc)); - primary_desc.dwSize = sizeof(primary_desc); + primary_desc.dwSize = sizeof(primary_desc); primary_desc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_GETCURRENTPOSITION2; primary_desc.lpwfxFormat = NULL; @@ -394,7 +394,7 @@ static HRESULT dsound_create_buffers(void) stream_desc.dwSize = sizeof(stream_desc); stream_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2; stream_desc.dwBufferBytes = stream_buffer_size; - stream_desc.lpwfxFormat = &stream_format; + stream_desc.lpwfxFormat = &stream_format; // create the stream buffer result = IDirectSound_CreateSoundBuffer(dsound, &stream_desc, &stream_buffer, NULL); diff --git a/src/osd/windows/strconv.h b/src/osd/windows/strconv.h index b98a7388093..bb64db4bb27 100644 --- a/src/osd/windows/strconv.h +++ b/src/osd/windows/strconv.h @@ -59,11 +59,11 @@ WCHAR *wstring_from_utf8(const char *s); char *utf8_from_wstring(const WCHAR *s); #ifdef UNICODE -#define tstring_from_utf8 wstring_from_utf8 -#define utf8_from_tstring utf8_from_wstring +#define tstring_from_utf8 wstring_from_utf8 +#define utf8_from_tstring utf8_from_wstring #else // !UNICODE -#define tstring_from_utf8 astring_from_utf8 -#define utf8_from_tstring utf8_from_astring +#define tstring_from_utf8 astring_from_utf8 +#define utf8_from_tstring utf8_from_astring #endif // UNICODE diff --git a/src/osd/windows/vconv.c b/src/osd/windows/vconv.c index 0e8319a48e9..108ab7cb4e5 100644 --- a/src/osd/windows/vconv.c +++ b/src/osd/windows/vconv.c @@ -51,13 +51,13 @@ // CONSTANTS //============================================================ -#define PRINT_COMMAND_LINE 0 +#define PRINT_COMMAND_LINE 0 -#define VS6 0x00060000 -#define VS7 0x00070000 -#define VS71 0x0007000a -#define VS2005 0x00080000 -#define VS2008 0x00090000 +#define VS6 0x00060000 +#define VS7 0x00070000 +#define VS71 0x0007000a +#define VS2005 0x00080000 +#define VS2008 0x00090000 @@ -80,90 +80,90 @@ typedef struct static const translation_info gcc_translate[] = { - { 0, "-D*", "/D*" }, - { 0, "-U*", "/U*" }, - { 0, "-I*", "/I*" }, - { 0, "-o*", "~*" }, - { 0, "-include*", "/FI*" }, - { 0, "-c", "/c~/Fo" }, - { 0, "-E", "/c~/E >" }, - { 0, "-S", "/c~/Fa" }, - { VS7, "-O0", "/Od /GS /Oi" }, - { 0, "-O0", "/Od" }, - { 0, "-O1", "/O2" }, - { 0, "-O2", "/O2" }, - { 0, "-O3", "/O2" }, - { 0, "-Os", "/O1" }, - { 0, "-g*", "/Zi" }, - { VS2005, "-fno-strict-aliasing", "" }, // deprecated in VS2005 - { 0, "-fno-strict-aliasing", "/Oa" }, - { 0, "-fno-omit-frame-pointer", "" }, - { 0, "-fomit-frame-pointer", "" }, - { 0, "-Werror", "/WX" }, - //{ VS7, "-Wall", "/Wall /W3 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826" }, - { VS7, "-Wall", "/Wall /W4 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826 /wd4820 /wd4514 /wd4668 /wd4127 /wd4625 /wd4626 /wd4512 /wd4100 /wd4310 /wd4571 /wd4061 /wd4131 /wd4255 /wd4510 /wd4610 /wd4505 /wd4324 /wd4611 /wd4201 /wd4189 /wd4296 /wd4986 /wd4347" }, - { 0, "-Wall", "/W0" }, - { VS7, "-Wno-unused", "/wd4100 /wd4101 /wd4102 /wd4505" }, - { 0, "-Wno-sign-compare", "/wd4365 /wd4389 /wd4245" }, - { 0, "-W*", "" }, - { VS2005, "-march=*", "" }, // deprecated in VS2005 - { 0, "-march=pentium", "/G5" }, - { 0, "-march=pentiumpro", "/G6" }, - { 0, "-march=pentium3", "/G6" }, - { 0, "-march=pentium-m", "/G6" }, - { 0, "-march=athlon", "/G7" }, - { 0, "-march=pentium4", "/G7" }, - { 0, "-march=athlon64", "/G7" }, - { VS71, "-msse2", "/arch:SSE2" }, - { 0, "-msse2", "" }, - { 0, "-msse3", "" }, - { 0, "-mwindows", "" }, - { 0, "-mno-cygwin", "" }, - { 0, "-std=gnu89", "" }, - { 0, "-std=gnu++98", "/TP" }, - { 0, "-pipe", "" }, - { 0, "-x", "" }, - { 0, "c++", "" }, + { 0, "-D*", "/D*" }, + { 0, "-U*", "/U*" }, + { 0, "-I*", "/I*" }, + { 0, "-o*", "~*" }, + { 0, "-include*", "/FI*" }, + { 0, "-c", "/c~/Fo" }, + { 0, "-E", "/c~/E >" }, + { 0, "-S", "/c~/Fa" }, + { VS7, "-O0", "/Od /GS /Oi" }, + { 0, "-O0", "/Od" }, + { 0, "-O1", "/O2" }, + { 0, "-O2", "/O2" }, + { 0, "-O3", "/O2" }, + { 0, "-Os", "/O1" }, + { 0, "-g*", "/Zi" }, + { VS2005, "-fno-strict-aliasing", "" }, // deprecated in VS2005 + { 0, "-fno-strict-aliasing", "/Oa" }, + { 0, "-fno-omit-frame-pointer", "" }, + { 0, "-fomit-frame-pointer", "" }, + { 0, "-Werror", "/WX" }, + //{ VS7, "-Wall", "/Wall /W3 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826" }, + { VS7, "-Wall", "/Wall /W4 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826 /wd4820 /wd4514 /wd4668 /wd4127 /wd4625 /wd4626 /wd4512 /wd4100 /wd4310 /wd4571 /wd4061 /wd4131 /wd4255 /wd4510 /wd4610 /wd4505 /wd4324 /wd4611 /wd4201 /wd4189 /wd4296 /wd4986 /wd4347" }, + { 0, "-Wall", "/W0" }, + { VS7, "-Wno-unused", "/wd4100 /wd4101 /wd4102 /wd4505" }, + { 0, "-Wno-sign-compare", "/wd4365 /wd4389 /wd4245" }, + { 0, "-W*", "" }, + { VS2005, "-march=*", "" }, // deprecated in VS2005 + { 0, "-march=pentium", "/G5" }, + { 0, "-march=pentiumpro", "/G6" }, + { 0, "-march=pentium3", "/G6" }, + { 0, "-march=pentium-m", "/G6" }, + { 0, "-march=athlon", "/G7" }, + { 0, "-march=pentium4", "/G7" }, + { 0, "-march=athlon64", "/G7" }, + { VS71, "-msse2", "/arch:SSE2" }, + { 0, "-msse2", "" }, + { 0, "-msse3", "" }, + { 0, "-mwindows", "" }, + { 0, "-mno-cygwin", "" }, + { 0, "-std=gnu89", "" }, + { 0, "-std=gnu++98", "/TP" }, + { 0, "-pipe", "" }, + { 0, "-x", "" }, + { 0, "c++", "" }, { 0 } }; static const translation_info ld_translate[] = { - { VS2008, "-lbufferoverflowu", "" }, - { 0, "-l*", "*.lib" }, - { 0, "-o*", "/out:*" }, - { 0, "-Wl,-Map,*", "/map:*" }, - { 0, "-Wl,--allow-multiple-definition", "/force:multiple" }, - { 0, "-Wl,--warn-common", "" }, - { 0, "-mno-cygwin", "" }, - { 0, "-s", "" }, - { 0, "-WO", "" }, - { 0, "-mconsole", "/subsystem:console" }, - { 0, "-mwindows", "/subsystem:windows" }, - { 0, "-municode", "" }, - { 0, "-static-libgcc", "" }, - { 0, "-static-libstdc++", "" }, - { 0, "-shared", "/dll" }, + { VS2008, "-lbufferoverflowu", "" }, + { 0, "-l*", "*.lib" }, + { 0, "-o*", "/out:*" }, + { 0, "-Wl,-Map,*", "/map:*" }, + { 0, "-Wl,--allow-multiple-definition", "/force:multiple" }, + { 0, "-Wl,--warn-common", "" }, + { 0, "-mno-cygwin", "" }, + { 0, "-s", "" }, + { 0, "-WO", "" }, + { 0, "-mconsole", "/subsystem:console" }, + { 0, "-mwindows", "/subsystem:windows" }, + { 0, "-municode", "" }, + { 0, "-static-libgcc", "" }, + { 0, "-static-libstdc++", "" }, + { 0, "-shared", "/dll" }, { 0 } }; static const translation_info ar_translate[] = { - { 0, "-cr", "" }, - { 0, "/LTCG", "/LTCG" }, + { 0, "-cr", "" }, + { 0, "/LTCG", "/LTCG" }, { 0 } }; static const translation_info windres_translate[] = { - { 0, "-D*", "/D*" }, - { 0, "-U*", "/U*" }, - { 0, "-I*", "/I*" }, - { 0, "--include-dir*", "/I*" }, - { 0, "-o*", "/fo*" }, - { 0, "-O*", "" }, - { 0, "-i*", "*" }, + { 0, "-D*", "/D*" }, + { 0, "-U*", "/U*" }, + { 0, "-I*", "/I*" }, + { 0, "--include-dir*", "/I*" }, + { 0, "-o*", "/fo*" }, + { 0, "-O*", "" }, + { 0, "-i*", "*" }, { 0 } }; diff --git a/src/osd/windows/video.h b/src/osd/windows/video.h index 86e5107b1e1..90320ee4562 100644 --- a/src/osd/windows/video.h +++ b/src/osd/windows/video.h @@ -49,12 +49,12 @@ // CONSTANTS //============================================================ -#define MAX_WINDOWS 4 +#define MAX_WINDOWS 4 -#define VIDEO_MODE_NONE 0 -#define VIDEO_MODE_GDI 1 -#define VIDEO_MODE_DDRAW 2 -#define VIDEO_MODE_D3D 3 +#define VIDEO_MODE_NONE 0 +#define VIDEO_MODE_GDI 1 +#define VIDEO_MODE_DDRAW 2 +#define VIDEO_MODE_D3D 3 @@ -64,48 +64,48 @@ struct win_monitor_info { - win_monitor_info * next; // pointer to next monitor in list - HMONITOR handle; // handle to the monitor - MONITORINFOEX info; // most recently retrieved info - float aspect; // computed/configured aspect ratio of the physical device - int reqwidth; // requested width for this monitor - int reqheight; // requested height for this monitor + win_monitor_info * next; // pointer to next monitor in list + HMONITOR handle; // handle to the monitor + MONITORINFOEX info; // most recently retrieved info + float aspect; // computed/configured aspect ratio of the physical device + int reqwidth; // requested width for this monitor + int reqheight; // requested height for this monitor }; struct win_window_config { - float aspect; // decoded aspect ratio - int width; // decoded width - int height; // decoded height - int refresh; // decoded refresh + float aspect; // decoded aspect ratio + int width; // decoded width + int height; // decoded height + int refresh; // decoded refresh }; struct win_video_config { // global configuration - int windowed; // start windowed? - int prescale; // prescale factor - int keepaspect; // keep aspect ratio - int numscreens; // number of screens - render_layer_config layerconfig; // default configuration of layers + int windowed; // start windowed? + int prescale; // prescale factor + int keepaspect; // keep aspect ratio + int numscreens; // number of screens + render_layer_config layerconfig; // default configuration of layers // per-window configuration - win_window_config window[MAX_WINDOWS]; // configuration data per-window + win_window_config window[MAX_WINDOWS]; // configuration data per-window // hardware options - int mode; // output mode - int waitvsync; // spin until vsync - int syncrefresh; // sync only to refresh rate - int triplebuf; // triple buffer - int switchres; // switch resolutions + int mode; // output mode + int waitvsync; // spin until vsync + int syncrefresh; // sync only to refresh rate + int triplebuf; // triple buffer + int switchres; // switch resolutions // ddraw options - int hwstretch; // stretch using the hardware + int hwstretch; // stretch using the hardware // d3d options - int filter; // enable filtering + int filter; // enable filtering }; diff --git a/src/osd/windows/windir.c b/src/osd/windows/windir.c index 6b41a63f04a..7ca49029c1e 100644 --- a/src/osd/windows/windir.c +++ b/src/osd/windows/windir.c @@ -63,10 +63,10 @@ struct osd_directory { - HANDLE find; // handle to the finder - int is_first; // TRUE if this is the first entry - osd_directory_entry entry; // current entry's data - WIN32_FIND_DATA data; // current raw data + HANDLE find; // handle to the finder + int is_first; // TRUE if this is the first entry + osd_directory_entry entry; // current entry's data + WIN32_FIND_DATA data; // current raw data }; @@ -184,4 +184,3 @@ int osd_is_absolute_path(const char *path) } return result; } - diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c index b4d8114815a..52366a704f8 100644 --- a/src/osd/windows/window.c +++ b/src/osd/windows/window.c @@ -39,8 +39,8 @@ // //============================================================ -#define LOG_THREADS 0 -#define LOG_TEMP_PAUSE 0 +#define LOG_THREADS 0 +#define LOG_TEMP_PAUSE 0 // Needed for RAW Input #define WM_INPUT 0x00FF @@ -80,29 +80,29 @@ extern int drawd3d_init(running_machine &machine, win_draw_callbacks *callbacks) //============================================================ // window styles -#define WINDOW_STYLE WS_OVERLAPPEDWINDOW -#define WINDOW_STYLE_EX 0 +#define WINDOW_STYLE WS_OVERLAPPEDWINDOW +#define WINDOW_STYLE_EX 0 // debugger window styles -#define DEBUG_WINDOW_STYLE WS_OVERLAPPED -#define DEBUG_WINDOW_STYLE_EX 0 +#define DEBUG_WINDOW_STYLE WS_OVERLAPPED +#define DEBUG_WINDOW_STYLE_EX 0 // full screen window styles -#define FULLSCREEN_STYLE WS_POPUP -#define FULLSCREEN_STYLE_EX WS_EX_TOPMOST +#define FULLSCREEN_STYLE WS_POPUP +#define FULLSCREEN_STYLE_EX WS_EX_TOPMOST // minimum window dimension -#define MIN_WINDOW_DIM 200 +#define MIN_WINDOW_DIM 200 // custom window messages -#define WM_USER_FINISH_CREATE_WINDOW (WM_USER + 0) -#define WM_USER_SELF_TERMINATE (WM_USER + 1) -#define WM_USER_REDRAW (WM_USER + 2) -#define WM_USER_SET_FULLSCREEN (WM_USER + 3) -#define WM_USER_SET_MAXSIZE (WM_USER + 4) -#define WM_USER_SET_MINSIZE (WM_USER + 5) -#define WM_USER_UI_TEMP_PAUSE (WM_USER + 6) -#define WM_USER_EXEC_FUNC (WM_USER + 7) +#define WM_USER_FINISH_CREATE_WINDOW (WM_USER + 0) +#define WM_USER_SELF_TERMINATE (WM_USER + 1) +#define WM_USER_REDRAW (WM_USER + 2) +#define WM_USER_SET_FULLSCREEN (WM_USER + 3) +#define WM_USER_SET_MAXSIZE (WM_USER + 4) +#define WM_USER_SET_MINSIZE (WM_USER + 5) +#define WM_USER_UI_TEMP_PAUSE (WM_USER + 6) +#define WM_USER_EXEC_FUNC (WM_USER + 7) @@ -175,7 +175,7 @@ static void set_fullscreen(win_window_info *window, int fullscreen); #if LOG_THREADS struct mtlog { - osd_ticks_t timestamp; + osd_ticks_t timestamp; const char *event; }; @@ -872,11 +872,11 @@ static void create_window_class(void) WNDCLASS wc = { 0 }; // initialize the description of the window class - wc.lpszClassName = TEXT("MAME"); - wc.hInstance = GetModuleHandle(NULL); - wc.lpfnWndProc = winwindow_video_window_proc_ui; - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2)); + wc.lpszClassName = TEXT("MAME"); + wc.hInstance = GetModuleHandle(NULL); + wc.lpfnWndProc = winwindow_video_window_proc_ui; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2)); // register the class; fail if we can't if (!RegisterClass(&wc)) diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h index 5e167c934a0..cd1ebc80842 100644 --- a/src/osd/windows/window.h +++ b/src/osd/windows/window.h @@ -55,9 +55,9 @@ // CONSTANTS //============================================================ -#define RESIZE_STATE_NORMAL 0 -#define RESIZE_STATE_RESIZING 1 -#define RESIZE_STATE_PENDING 2 +#define RESIZE_STATE_NORMAL 0 +#define RESIZE_STATE_RESIZING 1 +#define RESIZE_STATE_PENDING 2 @@ -73,44 +73,44 @@ public: running_machine &machine() const { return m_machine; } - win_window_info * next; - volatile int init_state; + win_window_info * next; + volatile int init_state; // window handle and info - HWND hwnd; - char title[256]; - RECT non_fullscreen_bounds; - int startmaximized; - int isminimized; - int ismaximized; - int resize_state; + HWND hwnd; + char title[256]; + RECT non_fullscreen_bounds; + int startmaximized; + int isminimized; + int ismaximized; + int resize_state; // monitor info - win_monitor_info * monitor; - int fullscreen; - int fullscreen_safe; - int maxwidth, maxheight; - int refresh; - float aspect; + win_monitor_info * monitor; + int fullscreen; + int fullscreen_safe; + int maxwidth, maxheight; + int refresh; + float aspect; // rendering info - osd_lock * render_lock; - render_target * target; - int targetview; - int targetorient; - render_layer_config targetlayerconfig; + osd_lock * render_lock; + render_target * target; + int targetview; + int targetorient; + render_layer_config targetlayerconfig; render_primitive_list *primlist; // input info - DWORD lastclicktime; - int lastclickx; - int lastclicky; + DWORD lastclicktime; + int lastclickx; + int lastclicky; // drawing data - void * drawdata; + void * drawdata; private: - running_machine & m_machine; + running_machine & m_machine; }; diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak index 0b8cd744c28..809fa259426 100644 --- a/src/osd/windows/windows.mak +++ b/src/osd/windows/windows.mak @@ -98,7 +98,7 @@ RCFLAGS = -O coff -I $(WINSRC) -I $(WINOBJ) ifdef CYGWIN_BUILD CCOMFLAGS += -mno-cygwin -LDFLAGS += -mno-cygwin +LDFLAGS += -mno-cygwin endif @@ -279,8 +279,8 @@ LIBS += -lcomdlg32 #------------------------------------------------- OSDCOREOBJS = \ - $(WINOBJ)/main.o \ - $(WINOBJ)/strconv.o \ + $(WINOBJ)/main.o \ + $(WINOBJ)/strconv.o \ $(WINOBJ)/windir.o \ $(WINOBJ)/winfile.o \ $(WINOBJ)/winmisc.o \ @@ -292,7 +292,7 @@ OSDCOREOBJS = \ $(WINOBJ)/winsocket.o \ $(WINOBJ)/winwork.o \ $(WINOBJ)/winptty.o \ - $(WINOBJ)/winmidi.o + $(WINOBJ)/winmidi.o #------------------------------------------------- @@ -328,8 +328,8 @@ OSDOBJS += $(WINOBJ)/d3d8intf.o endif # extra dependencies -$(WINOBJ)/drawdd.o : $(SRC)/emu/rendersw.c -$(WINOBJ)/drawgdi.o : $(SRC)/emu/rendersw.c +$(WINOBJ)/drawdd.o : $(SRC)/emu/rendersw.c +$(WINOBJ)/drawgdi.o : $(SRC)/emu/rendersw.c $(WINOBJ)/winmidi.o: $(SRC)/osd/portmedia/pmmidi.c # add debug-specific files diff --git a/src/osd/windows/winfile.c b/src/osd/windows/winfile.c index 1d3ea1748a6..2afa8da23ed 100644 --- a/src/osd/windows/winfile.c +++ b/src/osd/windows/winfile.c @@ -202,8 +202,8 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 length, LONG upper = offset >> 32; DWORD result; - switch (file->type) - { + switch (file->type) + { case WINFILE_FILE: // attempt to set the file pointer result = SetFilePointer(file->handle, (UINT32)offset, &upper, FILE_BEGIN); @@ -241,8 +241,8 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l LONG upper = offset >> 32; DWORD result; - switch (file->type) - { + switch (file->type) + { case WINFILE_FILE: // attempt to set the file pointer result = SetFilePointer(file->handle, (UINT32)offset, &upper, FILE_BEGIN); @@ -277,8 +277,8 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l file_error osd_close(osd_file *file) { - switch (file->type) - { + switch (file->type) + { case WINFILE_FILE: // close the file handle and free the file structure CloseHandle(file->handle); diff --git a/src/osd/windows/winfile.h b/src/osd/windows/winfile.h index cae70873982..a5afab43a58 100644 --- a/src/osd/windows/winfile.h +++ b/src/osd/windows/winfile.h @@ -25,10 +25,10 @@ enum struct osd_file { - HANDLE handle; - SOCKET socket; - int type; - TCHAR filename[1]; + HANDLE handle; + SOCKET socket; + int type; + TCHAR filename[1]; }; //============================================================ diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c index 9fb164d22e0..1d84d659c77 100644 --- a/src/osd/windows/winmain.c +++ b/src/osd/windows/winmain.c @@ -75,7 +75,7 @@ #include "netdev.h" #endif -#define DEBUG_SLOW_LOCKS 0 +#define DEBUG_SLOW_LOCKS 0 //************************************************************************** @@ -114,7 +114,7 @@ public: _FunctionPtr operator *() const { return m_function; } private: - _FunctionPtr m_function; + _FunctionPtr m_function; }; @@ -132,11 +132,11 @@ public: bool unwind(); private: - HANDLE m_process; - HANDLE m_thread; - STACKFRAME64 m_stackframe; - CONTEXT m_context; - bool m_first; + HANDLE m_process; + HANDLE m_thread; + STACKFRAME64 m_stackframe; + CONTEXT m_context; + bool m_first; dynamic_bind<BOOL (WINAPI *)(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, PREAD_PROCESS_MEMORY_ROUTINE64, PFUNCTION_TABLE_ACCESS_ROUTINE64, PGET_MODULE_BASE_ROUTINE64, PTRANSLATE_ADDRESS_ROUTINE64)> m_stack_walk_64; @@ -145,7 +145,7 @@ private: dynamic_bind<DWORD64 (WINAPI *)(HANDLE, DWORD64)> m_sym_get_module_base_64; dynamic_bind<VOID (WINAPI *)(PCONTEXT)> m_rtl_capture_context; - static bool s_initialized; + static bool s_initialized; }; @@ -184,18 +184,18 @@ private: m_next(NULL), m_address(address), m_name(symbol) { } cache_entry *next() const { return m_next; } - cache_entry * m_next; - FPTR m_address; - astring m_name; + cache_entry * m_next; + FPTR m_address; + astring m_name; }; simple_list<cache_entry> m_cache; - astring m_mapfile; - astring m_symfile; - astring m_buffer; - HANDLE m_process; - FPTR m_last_base; - FPTR m_text_base; + astring m_mapfile; + astring m_symfile; + astring m_buffer; + HANDLE m_process; + FPTR m_last_base; + FPTR m_text_base; dynamic_bind<BOOL (WINAPI *)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFO)> m_sym_from_addr; dynamic_bind<BOOL (WINAPI *)(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64)> m_sym_get_line_from_addr_64; @@ -221,18 +221,18 @@ private: static int CLIB_DECL compare_address(const void *item1, const void *item2); static int CLIB_DECL compare_frequency(const void *item1, const void *item2); - HANDLE m_target_thread; + HANDLE m_target_thread; - HANDLE m_thread; - DWORD m_thread_id; - volatile bool m_thread_exit; + HANDLE m_thread; + DWORD m_thread_id; + volatile bool m_thread_exit; - UINT8 m_stack_depth; - UINT8 m_entry_stride; - UINT32 m_max_seconds; - FPTR * m_buffer; - FPTR * m_buffer_ptr; - FPTR * m_buffer_end; + UINT8 m_stack_depth; + UINT8 m_entry_stride; + UINT32 m_max_seconds; + FPTR * m_buffer; + FPTR * m_buffer_ptr; + FPTR * m_buffer_end; }; @@ -306,7 +306,7 @@ const options_entry windows_options::s_option_entries[] = { NULL, NULL, OPTION_HEADER, "WINDOWS PERFORMANCE OPTIONS" }, { WINOPTION_PRIORITY "(-15-1)", "0", OPTION_INTEGER, "thread priority for the main game thread; range from -15 to 1" }, { WINOPTION_MULTITHREADING ";mt", "1", OPTION_BOOLEAN, "enable multithreading; this enables rendering and blitting on a separate thread" }, - { WINOPTION_NUMPROCESSORS ";np", "auto", OPTION_STRING, "number of processors; this overrides the number the system reports" }, + { WINOPTION_NUMPROCESSORS ";np", "auto", OPTION_STRING, "number of processors; this overrides the number the system reports" }, { WINOPTION_PROFILE, "0", OPTION_INTEGER, "enable profiling, specifying the stack depth to track" }, { WINOPTION_BENCH, "0", OPTION_INTEGER, "benchmark for the given number of emulated seconds; implies -video none -nosound -nothrottle" }, @@ -320,7 +320,7 @@ const options_entry windows_options::s_option_entries[] = { WINOPTION_PRESCALE, "1", OPTION_INTEGER, "scale screen rendering by this amount in software" }, { WINOPTION_WAITVSYNC ";vs", "0", OPTION_BOOLEAN, "enable waiting for the start of VBLANK before flipping screens; reduces tearing effects" }, { WINOPTION_SYNCREFRESH ";srf", "0", OPTION_BOOLEAN, "enable using the start of VBLANK for throttling instead of the game time" }, - { WINOPTION_MENU, "0", OPTION_BOOLEAN, "enable menu bar if available by UI implementation" }, + { WINOPTION_MENU, "0", OPTION_BOOLEAN, "enable menu bar if available by UI implementation" }, // DirectDraw-specific options { NULL, NULL, OPTION_HEADER, "DIRECTDRAW-SPECIFIC OPTIONS" }, @@ -332,61 +332,61 @@ const options_entry windows_options::s_option_entries[] = { WINOPTION_FILTER ";d3dfilter;flt", "1", OPTION_BOOLEAN, "enable bilinear filtering on screen output" }, // post-processing options - { NULL, NULL, OPTION_HEADER, "DIRECT3D POST-PROCESSING OPTIONS" }, - { WINOPTION_HLSL_ENABLE";hlsl", "0", OPTION_BOOLEAN, "enable HLSL post-processing (PS3.0 required)" }, - { WINOPTION_HLSLPATH, "hlsl", OPTION_STRING, "path to hlsl files" }, - { WINOPTION_HLSL_INI_READ, "0", OPTION_BOOLEAN, "enable HLSL INI reading" }, - { WINOPTION_HLSL_INI_WRITE, "0", OPTION_BOOLEAN, "enable HLSL INI writing" }, - { WINOPTION_HLSL_INI_NAME, "%g", OPTION_STRING, "HLSL INI file name for this game" }, - { WINOPTION_HLSL_PRESCALE_X, "0", OPTION_INTEGER, "HLSL pre-scale override factor for X (0 for auto)" }, - { WINOPTION_HLSL_PRESCALE_Y, "0", OPTION_INTEGER, "HLSL pre-scale override factor for Y (0 for auto)" }, + { NULL, NULL, OPTION_HEADER, "DIRECT3D POST-PROCESSING OPTIONS" }, + { WINOPTION_HLSL_ENABLE";hlsl", "0", OPTION_BOOLEAN, "enable HLSL post-processing (PS3.0 required)" }, + { WINOPTION_HLSLPATH, "hlsl", OPTION_STRING, "path to hlsl files" }, + { WINOPTION_HLSL_INI_READ, "0", OPTION_BOOLEAN, "enable HLSL INI reading" }, + { WINOPTION_HLSL_INI_WRITE, "0", OPTION_BOOLEAN, "enable HLSL INI writing" }, + { WINOPTION_HLSL_INI_NAME, "%g", OPTION_STRING, "HLSL INI file name for this game" }, + { WINOPTION_HLSL_PRESCALE_X, "0", OPTION_INTEGER, "HLSL pre-scale override factor for X (0 for auto)" }, + { WINOPTION_HLSL_PRESCALE_Y, "0", OPTION_INTEGER, "HLSL pre-scale override factor for Y (0 for auto)" }, { WINOPTION_HLSL_PRESET";(-1-3)", "-1", OPTION_INTEGER, "HLSL preset to use (0-3)" }, - { WINOPTION_HLSL_WRITE, NULL, OPTION_STRING, "enable HLSL AVI writing (huge disk bandwidth suggested)" }, - { WINOPTION_HLSL_SNAP_WIDTH, "2048", OPTION_STRING, "HLSL upscaled-snapshot width" }, - { WINOPTION_HLSL_SNAP_HEIGHT, "1536", OPTION_STRING, "HLSL upscaled-snapshot height" }, + { WINOPTION_HLSL_WRITE, NULL, OPTION_STRING, "enable HLSL AVI writing (huge disk bandwidth suggested)" }, + { WINOPTION_HLSL_SNAP_WIDTH, "2048", OPTION_STRING, "HLSL upscaled-snapshot width" }, + { WINOPTION_HLSL_SNAP_HEIGHT, "1536", OPTION_STRING, "HLSL upscaled-snapshot height" }, { WINOPTION_SHADOW_MASK_ALPHA";fs_shadwa(0.0-1.0)", "0.0", OPTION_FLOAT, "shadow mask alpha-blend value (1.0 is fully blended, 0.0 is no mask)" }, { WINOPTION_SHADOW_MASK_TEXTURE";fs_shadwt(0.0-1.0)", "aperture.png", OPTION_STRING, "shadow mask texture name" }, - { WINOPTION_SHADOW_MASK_COUNT_X";fs_shadww", "320", OPTION_INTEGER, "shadow mask width, in phosphor dots" }, - { WINOPTION_SHADOW_MASK_COUNT_Y";fs_shadwh", "240", OPTION_INTEGER, "shadow mask height, in phosphor dots" }, - { WINOPTION_SHADOW_MASK_USIZE";fs_shadwu(0.0-1.0)", "0.09375", OPTION_FLOAT, "shadow mask texture size in U direction" }, - { WINOPTION_SHADOW_MASK_VSIZE";fs_shadwv(0.0-1.0)", "0.109375", OPTION_FLOAT, "shadow mask texture size in V direction" }, - { WINOPTION_CURVATURE";fs_curv(0.0-4.0)", "0.0", OPTION_FLOAT, "screen curvature amount" }, + { WINOPTION_SHADOW_MASK_COUNT_X";fs_shadww", "320", OPTION_INTEGER, "shadow mask width, in phosphor dots" }, + { WINOPTION_SHADOW_MASK_COUNT_Y";fs_shadwh", "240", OPTION_INTEGER, "shadow mask height, in phosphor dots" }, + { WINOPTION_SHADOW_MASK_USIZE";fs_shadwu(0.0-1.0)", "0.09375", OPTION_FLOAT, "shadow mask texture size in U direction" }, + { WINOPTION_SHADOW_MASK_VSIZE";fs_shadwv(0.0-1.0)", "0.109375", OPTION_FLOAT, "shadow mask texture size in V direction" }, + { WINOPTION_CURVATURE";fs_curv(0.0-4.0)", "0.0", OPTION_FLOAT, "screen curvature amount" }, /* Beam-related values below this line*/ - { WINOPTION_PINCUSHION";fs_pin(0.0-4.0)", "0.0", OPTION_FLOAT, "pincushion amount" }, - { WINOPTION_SCANLINE_AMOUNT";fs_scanam(0.0-4.0)", "0.0", OPTION_FLOAT, "overall alpha scaling value for scanlines" }, - { WINOPTION_SCANLINE_SCALE";fs_scansc(0.0-4.0)", "1.0", OPTION_FLOAT, "overall height scaling value for scanlines" }, - { WINOPTION_SCANLINE_HEIGHT";fs_scanh(0.0-4.0)", "0.7", OPTION_FLOAT, "individual height scaling value for scanlines" }, - { WINOPTION_SCANLINE_BRIGHT_SCALE";fs_scanbs(0.0-2.0)", "1.0", OPTION_FLOAT, "overall brightness scaling value for scanlines (multiplicative)" }, - { WINOPTION_SCANLINE_BRIGHT_OFFSET";fs_scanbo(0.0-1.0)", "0.0", OPTION_FLOAT, "overall brightness offset value for scanlines (additive)" }, - { WINOPTION_SCANLINE_OFFSET";fs_scanjt(0.0-4.0)", "0.0", OPTION_FLOAT, "overall interlace jitter scaling value for scanlines" }, - { WINOPTION_DEFOCUS";fs_focus", "0.0,0.0", OPTION_STRING, "overall defocus value in screen-relative coords" }, - { WINOPTION_CONVERGE_X";fs_convx", "0.0,0.0,0.0",OPTION_STRING, "convergence in screen-relative X direction" }, - { WINOPTION_CONVERGE_Y";fs_convy", "0.0,0.0,0.0",OPTION_STRING, "convergence in screen-relative Y direction" }, - { WINOPTION_RADIAL_CONVERGE_X";fs_rconvx", "0.0,0.0,0.0",OPTION_STRING, "radial convergence in screen-relative X direction" }, - { WINOPTION_RADIAL_CONVERGE_Y";fs_rconvy", "0.0,0.0,0.0",OPTION_STRING, "radial convergence in screen-relative Y direction" }, + { WINOPTION_PINCUSHION";fs_pin(0.0-4.0)", "0.0", OPTION_FLOAT, "pincushion amount" }, + { WINOPTION_SCANLINE_AMOUNT";fs_scanam(0.0-4.0)", "0.0", OPTION_FLOAT, "overall alpha scaling value for scanlines" }, + { WINOPTION_SCANLINE_SCALE";fs_scansc(0.0-4.0)", "1.0", OPTION_FLOAT, "overall height scaling value for scanlines" }, + { WINOPTION_SCANLINE_HEIGHT";fs_scanh(0.0-4.0)", "0.7", OPTION_FLOAT, "individual height scaling value for scanlines" }, + { WINOPTION_SCANLINE_BRIGHT_SCALE";fs_scanbs(0.0-2.0)", "1.0", OPTION_FLOAT, "overall brightness scaling value for scanlines (multiplicative)" }, + { WINOPTION_SCANLINE_BRIGHT_OFFSET";fs_scanbo(0.0-1.0)", "0.0", OPTION_FLOAT, "overall brightness offset value for scanlines (additive)" }, + { WINOPTION_SCANLINE_OFFSET";fs_scanjt(0.0-4.0)", "0.0", OPTION_FLOAT, "overall interlace jitter scaling value for scanlines" }, + { WINOPTION_DEFOCUS";fs_focus", "0.0,0.0", OPTION_STRING, "overall defocus value in screen-relative coords" }, + { WINOPTION_CONVERGE_X";fs_convx", "0.0,0.0,0.0",OPTION_STRING, "convergence in screen-relative X direction" }, + { WINOPTION_CONVERGE_Y";fs_convy", "0.0,0.0,0.0",OPTION_STRING, "convergence in screen-relative Y direction" }, + { WINOPTION_RADIAL_CONVERGE_X";fs_rconvx", "0.0,0.0,0.0",OPTION_STRING, "radial convergence in screen-relative X direction" }, + { WINOPTION_RADIAL_CONVERGE_Y";fs_rconvy", "0.0,0.0,0.0",OPTION_STRING, "radial convergence in screen-relative Y direction" }, /* RGB colorspace convolution below this line */ - { WINOPTION_RED_RATIO";fs_redratio", "1.0,0.0,0.0",OPTION_STRING, "red output signal generated by input signal" }, - { WINOPTION_GRN_RATIO";fs_grnratio", "0.0,1.0,0.0",OPTION_STRING, "green output signal generated by input signal" }, - { WINOPTION_BLU_RATIO";fs_bluratio", "0.0,0.0,1.0",OPTION_STRING, "blue output signal generated by input signal" }, - { WINOPTION_SATURATION";fs_sat(0.0-4.0)", "1.0", OPTION_FLOAT, "saturation scaling value" }, - { WINOPTION_OFFSET";fs_offset", "0.0,0.0,0.0",OPTION_STRING, "signal offset value (additive)" }, - { WINOPTION_SCALE";fs_scale", "1.0,1.0,1.0",OPTION_STRING, "signal scaling value (multiplicative)" }, - { WINOPTION_POWER";fs_power", "1.0,1.0,1.0",OPTION_STRING, "signal power value (exponential)" }, - { WINOPTION_FLOOR";fs_floor", "0.0,0.0,0.0",OPTION_STRING, "signal floor level" }, - { WINOPTION_PHOSPHOR";fs_phosphor", "0.0,0.0,0.0",OPTION_STRING, "phosphorescence decay rate (0.0 is instant, 1.0 is forever)" }, + { WINOPTION_RED_RATIO";fs_redratio", "1.0,0.0,0.0",OPTION_STRING, "red output signal generated by input signal" }, + { WINOPTION_GRN_RATIO";fs_grnratio", "0.0,1.0,0.0",OPTION_STRING, "green output signal generated by input signal" }, + { WINOPTION_BLU_RATIO";fs_bluratio", "0.0,0.0,1.0",OPTION_STRING, "blue output signal generated by input signal" }, + { WINOPTION_SATURATION";fs_sat(0.0-4.0)", "1.0", OPTION_FLOAT, "saturation scaling value" }, + { WINOPTION_OFFSET";fs_offset", "0.0,0.0,0.0",OPTION_STRING, "signal offset value (additive)" }, + { WINOPTION_SCALE";fs_scale", "1.0,1.0,1.0",OPTION_STRING, "signal scaling value (multiplicative)" }, + { WINOPTION_POWER";fs_power", "1.0,1.0,1.0",OPTION_STRING, "signal power value (exponential)" }, + { WINOPTION_FLOOR";fs_floor", "0.0,0.0,0.0",OPTION_STRING, "signal floor level" }, + { WINOPTION_PHOSPHOR";fs_phosphor", "0.0,0.0,0.0",OPTION_STRING, "phosphorescence decay rate (0.0 is instant, 1.0 is forever)" }, /* NTSC simulation below this line */ - { WINOPTION_YIQ_ENABLE";yiq", "0", OPTION_BOOLEAN, "enable YIQ-space HLSL post-processing" }, - { WINOPTION_YIQ_CCVALUE";yiqcc", "3.59754545",OPTION_FLOAT, "Color Carrier frequency for NTSC signal processing" }, - { WINOPTION_YIQ_AVALUE";yiqa", "0.5", OPTION_FLOAT, "A value for NTSC signal processing" }, - { WINOPTION_YIQ_BVALUE";yiqb", "0.5", OPTION_FLOAT, "B value for NTSC signal processing" }, - { WINOPTION_YIQ_OVALUE";yiqo", "0.0", OPTION_FLOAT, "Outgoing Color Carrier phase offset for NTSC signal processing" }, - { WINOPTION_YIQ_PVALUE";yiqp", "1.0", OPTION_FLOAT, "Incoming Pixel Clock scaling value for NTSC signal processing" }, - { WINOPTION_YIQ_NVALUE";yiqn", "1.0", OPTION_FLOAT, "Y filter notch width for NTSC signal processing" }, - { WINOPTION_YIQ_YVALUE";yiqy", "6.0", OPTION_FLOAT, "Y filter cutoff frequency for NTSC signal processing" }, - { WINOPTION_YIQ_IVALUE";yiqi", "1.2", OPTION_FLOAT, "I filter cutoff frequency for NTSC signal processing" }, - { WINOPTION_YIQ_QVALUE";yiqq", "0.6", OPTION_FLOAT, "Q filter cutoff frequency for NTSC signal processing" }, - { WINOPTION_YIQ_SCAN_TIME";yiqsc", "52.6", OPTION_FLOAT, "Horizontal scanline duration for NTSC signal processing (in usec)" }, - { WINOPTION_YIQ_PHASE_COUNT";yiqp", "2", OPTION_INTEGER, "Phase Count value for NTSC signal processing" }, + { WINOPTION_YIQ_ENABLE";yiq", "0", OPTION_BOOLEAN, "enable YIQ-space HLSL post-processing" }, + { WINOPTION_YIQ_CCVALUE";yiqcc", "3.59754545",OPTION_FLOAT, "Color Carrier frequency for NTSC signal processing" }, + { WINOPTION_YIQ_AVALUE";yiqa", "0.5", OPTION_FLOAT, "A value for NTSC signal processing" }, + { WINOPTION_YIQ_BVALUE";yiqb", "0.5", OPTION_FLOAT, "B value for NTSC signal processing" }, + { WINOPTION_YIQ_OVALUE";yiqo", "0.0", OPTION_FLOAT, "Outgoing Color Carrier phase offset for NTSC signal processing" }, + { WINOPTION_YIQ_PVALUE";yiqp", "1.0", OPTION_FLOAT, "Incoming Pixel Clock scaling value for NTSC signal processing" }, + { WINOPTION_YIQ_NVALUE";yiqn", "1.0", OPTION_FLOAT, "Y filter notch width for NTSC signal processing" }, + { WINOPTION_YIQ_YVALUE";yiqy", "6.0", OPTION_FLOAT, "Y filter cutoff frequency for NTSC signal processing" }, + { WINOPTION_YIQ_IVALUE";yiqi", "1.2", OPTION_FLOAT, "I filter cutoff frequency for NTSC signal processing" }, + { WINOPTION_YIQ_QVALUE";yiqq", "0.6", OPTION_FLOAT, "Q filter cutoff frequency for NTSC signal processing" }, + { WINOPTION_YIQ_SCAN_TIME";yiqsc", "52.6", OPTION_FLOAT, "Horizontal scanline duration for NTSC signal processing (in usec)" }, + { WINOPTION_YIQ_PHASE_COUNT";yiqp", "2", OPTION_INTEGER, "Phase Count value for NTSC signal processing" }, // per-window options { NULL, NULL, OPTION_HEADER, "PER-WINDOW VIDEO OPTIONS" }, @@ -511,12 +511,12 @@ static BOOL WINAPI control_handler(DWORD type) // indicate to the user that we detected something switch (type) { - case CTRL_C_EVENT: fprintf(stderr, "Caught Ctrl+C"); break; - case CTRL_BREAK_EVENT: fprintf(stderr, "Caught Ctrl+break"); break; - case CTRL_CLOSE_EVENT: fprintf(stderr, "Caught console close"); break; - case CTRL_LOGOFF_EVENT: fprintf(stderr, "Caught logoff"); break; - case CTRL_SHUTDOWN_EVENT: fprintf(stderr, "Caught shutdown"); break; - default: fprintf(stderr, "Caught unexpected console event"); break; + case CTRL_C_EVENT: fprintf(stderr, "Caught Ctrl+C"); break; + case CTRL_BREAK_EVENT: fprintf(stderr, "Caught Ctrl+break"); break; + case CTRL_CLOSE_EVENT: fprintf(stderr, "Caught console close"); break; + case CTRL_LOGOFF_EVENT: fprintf(stderr, "Caught logoff"); break; + case CTRL_SHUTDOWN_EVENT: fprintf(stderr, "Caught shutdown"); break; + default: fprintf(stderr, "Caught unexpected console event"); break; } // if we don't have a machine yet, or if we are handling ctrl+c/ctrl+break, @@ -1067,29 +1067,29 @@ static LONG WINAPI exception_filter(struct _EXCEPTION_POINTERS *info) const char *string; } exception_table[] = { - { EXCEPTION_ACCESS_VIOLATION, "ACCESS VIOLATION" }, - { EXCEPTION_DATATYPE_MISALIGNMENT, "DATATYPE MISALIGNMENT" }, - { EXCEPTION_BREAKPOINT, "BREAKPOINT" }, - { EXCEPTION_SINGLE_STEP, "SINGLE STEP" }, - { EXCEPTION_ARRAY_BOUNDS_EXCEEDED, "ARRAY BOUNDS EXCEEDED" }, - { EXCEPTION_FLT_DENORMAL_OPERAND, "FLOAT DENORMAL OPERAND" }, - { EXCEPTION_FLT_DIVIDE_BY_ZERO, "FLOAT DIVIDE BY ZERO" }, - { EXCEPTION_FLT_INEXACT_RESULT, "FLOAT INEXACT RESULT" }, - { EXCEPTION_FLT_INVALID_OPERATION, "FLOAT INVALID OPERATION" }, - { EXCEPTION_FLT_OVERFLOW, "FLOAT OVERFLOW" }, - { EXCEPTION_FLT_STACK_CHECK, "FLOAT STACK CHECK" }, - { EXCEPTION_FLT_UNDERFLOW, "FLOAT UNDERFLOW" }, - { EXCEPTION_INT_DIVIDE_BY_ZERO, "INTEGER DIVIDE BY ZERO" }, - { EXCEPTION_INT_OVERFLOW, "INTEGER OVERFLOW" }, - { EXCEPTION_PRIV_INSTRUCTION, "PRIVILEGED INSTRUCTION" }, - { EXCEPTION_IN_PAGE_ERROR, "IN PAGE ERROR" }, - { EXCEPTION_ILLEGAL_INSTRUCTION, "ILLEGAL INSTRUCTION" }, + { EXCEPTION_ACCESS_VIOLATION, "ACCESS VIOLATION" }, + { EXCEPTION_DATATYPE_MISALIGNMENT, "DATATYPE MISALIGNMENT" }, + { EXCEPTION_BREAKPOINT, "BREAKPOINT" }, + { EXCEPTION_SINGLE_STEP, "SINGLE STEP" }, + { EXCEPTION_ARRAY_BOUNDS_EXCEEDED, "ARRAY BOUNDS EXCEEDED" }, + { EXCEPTION_FLT_DENORMAL_OPERAND, "FLOAT DENORMAL OPERAND" }, + { EXCEPTION_FLT_DIVIDE_BY_ZERO, "FLOAT DIVIDE BY ZERO" }, + { EXCEPTION_FLT_INEXACT_RESULT, "FLOAT INEXACT RESULT" }, + { EXCEPTION_FLT_INVALID_OPERATION, "FLOAT INVALID OPERATION" }, + { EXCEPTION_FLT_OVERFLOW, "FLOAT OVERFLOW" }, + { EXCEPTION_FLT_STACK_CHECK, "FLOAT STACK CHECK" }, + { EXCEPTION_FLT_UNDERFLOW, "FLOAT UNDERFLOW" }, + { EXCEPTION_INT_DIVIDE_BY_ZERO, "INTEGER DIVIDE BY ZERO" }, + { EXCEPTION_INT_OVERFLOW, "INTEGER OVERFLOW" }, + { EXCEPTION_PRIV_INSTRUCTION, "PRIVILEGED INSTRUCTION" }, + { EXCEPTION_IN_PAGE_ERROR, "IN PAGE ERROR" }, + { EXCEPTION_ILLEGAL_INSTRUCTION, "ILLEGAL INSTRUCTION" }, { EXCEPTION_NONCONTINUABLE_EXCEPTION,"NONCONTINUABLE EXCEPTION" }, - { EXCEPTION_STACK_OVERFLOW, "STACK OVERFLOW" }, - { EXCEPTION_INVALID_DISPOSITION, "INVALID DISPOSITION" }, - { EXCEPTION_GUARD_PAGE, "GUARD PAGE VIOLATION" }, - { EXCEPTION_INVALID_HANDLE, "INVALID HANDLE" }, - { 0, "UNKNOWN EXCEPTION" } + { EXCEPTION_STACK_OVERFLOW, "STACK OVERFLOW" }, + { EXCEPTION_INVALID_DISPOSITION, "INVALID DISPOSITION" }, + { EXCEPTION_GUARD_PAGE, "GUARD PAGE VIOLATION" }, + { EXCEPTION_INVALID_HANDLE, "INVALID HANDLE" }, + { 0, "UNKNOWN EXCEPTION" } }; static int already_hit = 0; int i; @@ -1186,13 +1186,13 @@ static LONG WINAPI exception_filter(struct _EXCEPTION_POINTERS *info) stack_walker::stack_walker() : m_process(GetCurrentProcess()), - m_thread(GetCurrentThread()), - m_first(true), - m_stack_walk_64(TEXT("dbghelp.dll"), "StackWalk64"), - m_sym_initialize(TEXT("dbghelp.dll"), "SymInitialize"), - m_sym_function_table_access_64(TEXT("dbghelp.dll"), "SymFunctionTableAccess64"), - m_sym_get_module_base_64(TEXT("dbghelp.dll"), "SymGetModuleBase64"), - m_rtl_capture_context(TEXT("kernel32.dll"), "RtlCaptureContext") + m_thread(GetCurrentThread()), + m_first(true), + m_stack_walk_64(TEXT("dbghelp.dll"), "StackWalk64"), + m_sym_initialize(TEXT("dbghelp.dll"), "SymInitialize"), + m_sym_function_table_access_64(TEXT("dbghelp.dll"), "SymFunctionTableAccess64"), + m_sym_get_module_base_64(TEXT("dbghelp.dll"), "SymGetModuleBase64"), + m_rtl_capture_context(TEXT("kernel32.dll"), "RtlCaptureContext") { // zap the structs memset(&m_stackframe, 0, sizeof(m_stackframe)); @@ -1302,12 +1302,12 @@ bool stack_walker::unwind() symbol_manager::symbol_manager(const char *argv0) : m_mapfile(argv0), - m_symfile(argv0), - m_process(GetCurrentProcess()), - m_last_base(0), - m_text_base(0), - m_sym_from_addr(TEXT("dbghelp.dll"), "SymFromAddr"), - m_sym_get_line_from_addr_64(TEXT("dbghelp.dll"), "SymGetLineFromAddr64") + m_symfile(argv0), + m_process(GetCurrentProcess()), + m_last_base(0), + m_text_base(0), + m_sym_from_addr(TEXT("dbghelp.dll"), "SymFromAddr"), + m_sym_get_line_from_addr_64(TEXT("dbghelp.dll"), "SymGetLineFromAddr64") { #ifdef __GNUC__ // compute the name of the mapfile @@ -1650,14 +1650,14 @@ FPTR symbol_manager::get_text_section_base() sampling_profiler::sampling_profiler(UINT32 max_seconds, UINT8 stack_depth = 0) : m_thread(NULL), - m_thread_id(0), - m_thread_exit(false), - m_stack_depth(stack_depth), - m_entry_stride(stack_depth + 2), - m_max_seconds(max_seconds), - m_buffer(global_alloc(FPTR[max_seconds * 1000 * m_entry_stride])), - m_buffer_ptr(m_buffer), - m_buffer_end(m_buffer + max_seconds * 1000 * m_entry_stride) + m_thread_id(0), + m_thread_exit(false), + m_stack_depth(stack_depth), + m_entry_stride(stack_depth + 2), + m_max_seconds(max_seconds), + m_buffer(global_alloc(FPTR[max_seconds * 1000 * m_entry_stride])), + m_buffer_ptr(m_buffer), + m_buffer_end(m_buffer + max_seconds * 1000 * m_entry_stride) { } diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h index 98d6d038415..a935d8c9c6a 100644 --- a/src/osd/windows/winmain.h +++ b/src/osd/windows/winmain.h @@ -48,107 +48,107 @@ //============================================================ // debugging options -#define WINOPTION_OSLOG "oslog" -#define WINOPTION_WATCHDOG "watchdog" -#define WINOPTION_DEBUGGER_FONT "debugger_font" -#define WINOPTION_DEBUGGER_FONT_SIZE "debugger_font_size" +#define WINOPTION_OSLOG "oslog" +#define WINOPTION_WATCHDOG "watchdog" +#define WINOPTION_DEBUGGER_FONT "debugger_font" +#define WINOPTION_DEBUGGER_FONT_SIZE "debugger_font_size" // performance options -#define WINOPTION_PRIORITY "priority" -#define WINOPTION_MULTITHREADING "multithreading" -#define WINOPTION_NUMPROCESSORS "numprocessors" -#define WINOPTION_PROFILE "profile" -#define WINOPTION_BENCH "bench" +#define WINOPTION_PRIORITY "priority" +#define WINOPTION_MULTITHREADING "multithreading" +#define WINOPTION_NUMPROCESSORS "numprocessors" +#define WINOPTION_PROFILE "profile" +#define WINOPTION_BENCH "bench" // video options -#define WINOPTION_VIDEO "video" -#define WINOPTION_NUMSCREENS "numscreens" -#define WINOPTION_WINDOW "window" -#define WINOPTION_MAXIMIZE "maximize" -#define WINOPTION_KEEPASPECT "keepaspect" -#define WINOPTION_PRESCALE "prescale" -#define WINOPTION_WAITVSYNC "waitvsync" -#define WINOPTION_SYNCREFRESH "syncrefresh" -#define WINOPTION_MENU "menu" +#define WINOPTION_VIDEO "video" +#define WINOPTION_NUMSCREENS "numscreens" +#define WINOPTION_WINDOW "window" +#define WINOPTION_MAXIMIZE "maximize" +#define WINOPTION_KEEPASPECT "keepaspect" +#define WINOPTION_PRESCALE "prescale" +#define WINOPTION_WAITVSYNC "waitvsync" +#define WINOPTION_SYNCREFRESH "syncrefresh" +#define WINOPTION_MENU "menu" // DirectDraw-specific options -#define WINOPTION_HWSTRETCH "hwstretch" +#define WINOPTION_HWSTRETCH "hwstretch" // Direct3D-specific options -#define WINOPTION_D3DVERSION "d3dversion" -#define WINOPTION_FILTER "filter" +#define WINOPTION_D3DVERSION "d3dversion" +#define WINOPTION_FILTER "filter" // core post-processing options -#define WINOPTION_HLSL_ENABLE "hlsl_enable" -#define WINOPTION_HLSLPATH "hlslpath" -#define WINOPTION_HLSL_INI_NAME "hlslini" -#define WINOPTION_HLSL_INI_WRITE "hlsl_ini_write" -#define WINOPTION_HLSL_INI_READ "hlsl_ini_read" -#define WINOPTION_HLSL_PRESCALE_X "hlsl_prescale_x" -#define WINOPTION_HLSL_PRESCALE_Y "hlsl_prescale_y" -#define WINOPTION_HLSL_PRESET "hlsl_preset" -#define WINOPTION_HLSL_WRITE "hlsl_write" -#define WINOPTION_HLSL_SNAP_WIDTH "hlsl_snap_width" -#define WINOPTION_HLSL_SNAP_HEIGHT "hlsl_snap_height" -#define WINOPTION_SHADOW_MASK_ALPHA "shadow_mask_alpha" -#define WINOPTION_SHADOW_MASK_TEXTURE "shadow_mask_texture" -#define WINOPTION_SHADOW_MASK_COUNT_X "shadow_mask_x_count" -#define WINOPTION_SHADOW_MASK_COUNT_Y "shadow_mask_y_count" -#define WINOPTION_SHADOW_MASK_USIZE "shadow_mask_usize" -#define WINOPTION_SHADOW_MASK_VSIZE "shadow_mask_vsize" -#define WINOPTION_PINCUSHION "pincushion" -#define WINOPTION_CURVATURE "curvature" -#define WINOPTION_SCANLINE_AMOUNT "scanline_alpha" -#define WINOPTION_SCANLINE_SCALE "scanline_size" -#define WINOPTION_SCANLINE_HEIGHT "scanline_height" -#define WINOPTION_SCANLINE_BRIGHT_SCALE "scanline_bright_scale" -#define WINOPTION_SCANLINE_BRIGHT_OFFSET "scanline_bright_offset" -#define WINOPTION_SCANLINE_OFFSET "scanline_jitter" -#define WINOPTION_DEFOCUS "defocus" -#define WINOPTION_CONVERGE_X "converge_x" -#define WINOPTION_CONVERGE_Y "converge_y" -#define WINOPTION_RADIAL_CONVERGE_X "radial_converge_x" -#define WINOPTION_RADIAL_CONVERGE_Y "radial_converge_y" -#define WINOPTION_RED_RATIO "red_ratio" -#define WINOPTION_GRN_RATIO "grn_ratio" -#define WINOPTION_BLU_RATIO "blu_ratio" -#define WINOPTION_OFFSET "offset" -#define WINOPTION_SCALE "scale" -#define WINOPTION_POWER "power" -#define WINOPTION_FLOOR "floor" -#define WINOPTION_PHOSPHOR "phosphor_life" -#define WINOPTION_SATURATION "saturation" -#define WINOPTION_YIQ_ENABLE "yiq_enable" -#define WINOPTION_YIQ_CCVALUE "yiq_cc" -#define WINOPTION_YIQ_AVALUE "yiq_a" -#define WINOPTION_YIQ_BVALUE "yiq_b" -#define WINOPTION_YIQ_OVALUE "yiq_o" -#define WINOPTION_YIQ_PVALUE "yiq_p" -#define WINOPTION_YIQ_NVALUE "yiq_n" -#define WINOPTION_YIQ_YVALUE "yiq_y" -#define WINOPTION_YIQ_IVALUE "yiq_i" -#define WINOPTION_YIQ_QVALUE "yiq_q" -#define WINOPTION_YIQ_SCAN_TIME "yiq_scan_time" -#define WINOPTION_YIQ_PHASE_COUNT "yiq_phase_count" +#define WINOPTION_HLSL_ENABLE "hlsl_enable" +#define WINOPTION_HLSLPATH "hlslpath" +#define WINOPTION_HLSL_INI_NAME "hlslini" +#define WINOPTION_HLSL_INI_WRITE "hlsl_ini_write" +#define WINOPTION_HLSL_INI_READ "hlsl_ini_read" +#define WINOPTION_HLSL_PRESCALE_X "hlsl_prescale_x" +#define WINOPTION_HLSL_PRESCALE_Y "hlsl_prescale_y" +#define WINOPTION_HLSL_PRESET "hlsl_preset" +#define WINOPTION_HLSL_WRITE "hlsl_write" +#define WINOPTION_HLSL_SNAP_WIDTH "hlsl_snap_width" +#define WINOPTION_HLSL_SNAP_HEIGHT "hlsl_snap_height" +#define WINOPTION_SHADOW_MASK_ALPHA "shadow_mask_alpha" +#define WINOPTION_SHADOW_MASK_TEXTURE "shadow_mask_texture" +#define WINOPTION_SHADOW_MASK_COUNT_X "shadow_mask_x_count" +#define WINOPTION_SHADOW_MASK_COUNT_Y "shadow_mask_y_count" +#define WINOPTION_SHADOW_MASK_USIZE "shadow_mask_usize" +#define WINOPTION_SHADOW_MASK_VSIZE "shadow_mask_vsize" +#define WINOPTION_PINCUSHION "pincushion" +#define WINOPTION_CURVATURE "curvature" +#define WINOPTION_SCANLINE_AMOUNT "scanline_alpha" +#define WINOPTION_SCANLINE_SCALE "scanline_size" +#define WINOPTION_SCANLINE_HEIGHT "scanline_height" +#define WINOPTION_SCANLINE_BRIGHT_SCALE "scanline_bright_scale" +#define WINOPTION_SCANLINE_BRIGHT_OFFSET "scanline_bright_offset" +#define WINOPTION_SCANLINE_OFFSET "scanline_jitter" +#define WINOPTION_DEFOCUS "defocus" +#define WINOPTION_CONVERGE_X "converge_x" +#define WINOPTION_CONVERGE_Y "converge_y" +#define WINOPTION_RADIAL_CONVERGE_X "radial_converge_x" +#define WINOPTION_RADIAL_CONVERGE_Y "radial_converge_y" +#define WINOPTION_RED_RATIO "red_ratio" +#define WINOPTION_GRN_RATIO "grn_ratio" +#define WINOPTION_BLU_RATIO "blu_ratio" +#define WINOPTION_OFFSET "offset" +#define WINOPTION_SCALE "scale" +#define WINOPTION_POWER "power" +#define WINOPTION_FLOOR "floor" +#define WINOPTION_PHOSPHOR "phosphor_life" +#define WINOPTION_SATURATION "saturation" +#define WINOPTION_YIQ_ENABLE "yiq_enable" +#define WINOPTION_YIQ_CCVALUE "yiq_cc" +#define WINOPTION_YIQ_AVALUE "yiq_a" +#define WINOPTION_YIQ_BVALUE "yiq_b" +#define WINOPTION_YIQ_OVALUE "yiq_o" +#define WINOPTION_YIQ_PVALUE "yiq_p" +#define WINOPTION_YIQ_NVALUE "yiq_n" +#define WINOPTION_YIQ_YVALUE "yiq_y" +#define WINOPTION_YIQ_IVALUE "yiq_i" +#define WINOPTION_YIQ_QVALUE "yiq_q" +#define WINOPTION_YIQ_SCAN_TIME "yiq_scan_time" +#define WINOPTION_YIQ_PHASE_COUNT "yiq_phase_count" // per-window options -#define WINOPTION_SCREEN "screen" -#define WINOPTION_ASPECT "aspect" -#define WINOPTION_RESOLUTION "resolution" -#define WINOPTION_VIEW "view" +#define WINOPTION_SCREEN "screen" +#define WINOPTION_ASPECT "aspect" +#define WINOPTION_RESOLUTION "resolution" +#define WINOPTION_VIEW "view" // full screen options -#define WINOPTION_TRIPLEBUFFER "triplebuffer" -#define WINOPTION_SWITCHRES "switchres" -#define WINOPTION_FULLSCREENBRIGHTNESS "full_screen_brightness" -#define WINOPTION_FULLSCREENCONTRAST "full_screen_contrast" -#define WINOPTION_FULLSCREENGAMMA "full_screen_gamma" +#define WINOPTION_TRIPLEBUFFER "triplebuffer" +#define WINOPTION_SWITCHRES "switchres" +#define WINOPTION_FULLSCREENBRIGHTNESS "full_screen_brightness" +#define WINOPTION_FULLSCREENCONTRAST "full_screen_contrast" +#define WINOPTION_FULLSCREENGAMMA "full_screen_gamma" // sound options -#define WINOPTION_AUDIO_LATENCY "audio_latency" +#define WINOPTION_AUDIO_LATENCY "audio_latency" // input options -#define WINOPTION_DUAL_LIGHTGUN "dual_lightgun" +#define WINOPTION_DUAL_LIGHTGUN "dual_lightgun" @@ -280,9 +280,9 @@ private: //============================================================ #ifdef __cplusplus -#define WRAP_REFIID(x) x +#define WRAP_REFIID(x) x #else -#define WRAP_REFIID(x) &x +#define WRAP_REFIID(x) &x #endif diff --git a/src/osd/windows/winmisc.c b/src/osd/windows/winmisc.c index c83613a5e37..3c74ed879a6 100644 --- a/src/osd/windows/winmisc.c +++ b/src/osd/windows/winmisc.c @@ -58,10 +58,10 @@ //============================================================ // presumed size of a page of memory -#define PAGE_SIZE 4096 +#define PAGE_SIZE 4096 // align allocations to start or end of the page? -#define GUARD_ALIGN_START 0 +#define GUARD_ALIGN_START 0 diff --git a/src/osd/windows/winprefix.h b/src/osd/windows/winprefix.h index eb540920d8d..1e82d355ef1 100644 --- a/src/osd/windows/winprefix.h +++ b/src/osd/windows/winprefix.h @@ -53,10 +53,10 @@ #ifdef __GNUC__ #ifndef alloca -#define alloca __builtin_alloca +#define alloca __builtin_alloca #endif #define min(x,y) fmin(x,y) #define max(x,y) fmax(x,y) #endif -#define PATH_SEPARATOR "\\" +#define PATH_SEPARATOR "\\" diff --git a/src/osd/windows/winsocket.c b/src/osd/windows/winsocket.c index 058488759a3..0704772e1f1 100644 --- a/src/osd/windows/winsocket.c +++ b/src/osd/windows/winsocket.c @@ -43,7 +43,7 @@ bool win_init_sockets() /* check for correct version */ if ( LOBYTE( wsaData.wVersion ) != 2 || - HIBYTE( wsaData.wVersion ) != 0 ) + HIBYTE( wsaData.wVersion ) != 0 ) { /* incorrect WinSock version */ WSACleanup(); diff --git a/src/osd/windows/winsync.c b/src/osd/windows/winsync.c index 6876dd11de3..fbb32cfa441 100644 --- a/src/osd/windows/winsync.c +++ b/src/osd/windows/winsync.c @@ -53,7 +53,7 @@ // DEBUGGING //============================================================ -#define DEBUG_SLOW_LOCKS 0 +#define DEBUG_SLOW_LOCKS 0 @@ -65,7 +65,7 @@ typedef BOOL (WINAPI *try_enter_critical_section_ptr)(LPCRITICAL_SECTION lpCriti struct osd_lock { - CRITICAL_SECTION critsect; + CRITICAL_SECTION critsect; }; diff --git a/src/osd/windows/winutf8.c b/src/osd/windows/winutf8.c index 4e7ca623d74..37d3841bf5f 100644 --- a/src/osd/windows/winutf8.c +++ b/src/osd/windows/winutf8.c @@ -265,8 +265,8 @@ done: //============================================================ HWND win_create_window_ex_utf8(DWORD exstyle, const char* classname, const char* windowname, DWORD style, - int x, int y, int width, int height, HWND parent, HMENU menu, - HINSTANCE instance, void* param) + int x, int y, int width, int height, HWND parent, HMENU menu, + HINSTANCE instance, void* param) { TCHAR* t_classname = NULL; TCHAR* t_windowname = NULL; diff --git a/src/osd/windows/winutf8.h b/src/osd/windows/winutf8.h index dbade1dcd46..b3a87aebce4 100644 --- a/src/osd/windows/winutf8.h +++ b/src/osd/windows/winutf8.h @@ -56,7 +56,7 @@ int win_message_box_utf8(HWND window, const char *text, const char *caption, UIN BOOL win_set_window_text_utf8(HWND window, const char *text); int win_get_window_text_utf8(HWND window, char *buffer, size_t buffer_size); HWND win_create_window_ex_utf8(DWORD exstyle, const char* classname, const char* windowname, DWORD style, - int x, int y, int width, int height, HWND wndparent, HMENU menu, - HINSTANCE instance, void* param); + int x, int y, int width, int height, HWND wndparent, HMENU menu, + HINSTANCE instance, void* param); #endif // __WINUTF8__ diff --git a/src/osd/windows/winwork.c b/src/osd/windows/winwork.c index 5bfa1ebd2ae..250f9700840 100644 --- a/src/osd/windows/winwork.c +++ b/src/osd/windows/winwork.c @@ -59,8 +59,8 @@ // DEBUGGING //============================================================ -#define KEEP_STATISTICS (0) -#define USE_SCALABLE_LOCKS (0) +#define KEEP_STATISTICS (0) +#define USE_SCALABLE_LOCKS (0) @@ -68,7 +68,7 @@ // PARAMETERS //============================================================ -#define SPIN_LOOP_TIME (osd_ticks_per_second() / 1000) +#define SPIN_LOOP_TIME (osd_ticks_per_second() / 1000) @@ -77,13 +77,13 @@ //============================================================ #if KEEP_STATISTICS -#define add_to_stat(v,x) do { atomic_add32((v), (x)); } while (0) -#define begin_timing(v) do { (v) -= get_profile_ticks(); } while (0) -#define end_timing(v) do { (v) += get_profile_ticks(); } while (0) +#define add_to_stat(v,x) do { atomic_add32((v), (x)); } while (0) +#define begin_timing(v) do { (v) -= get_profile_ticks(); } while (0) +#define end_timing(v) do { (v) += get_profile_ticks(); } while (0) #else -#define add_to_stat(v,x) do { } while (0) -#define begin_timing(v) do { } while (0) -#define end_timing(v) do { } while (0) +#define add_to_stat(v,x) do { } while (0) +#define begin_timing(v) do { } while (0) +#define end_timing(v) do { } while (0) #endif #ifndef YieldProcessor @@ -109,69 +109,69 @@ INLINE void YieldProcessor(void) struct scalable_lock { #if USE_SCALABLE_LOCKS - struct - { - volatile INT32 haslock; // do we have the lock? - INT32 filler[64/4-1]; // assumes a 64-byte cache line - } slot[WORK_MAX_THREADS]; // one slot per thread - volatile INT32 nextindex; // index of next slot to use + struct + { + volatile INT32 haslock; // do we have the lock? + INT32 filler[64/4-1]; // assumes a 64-byte cache line + } slot[WORK_MAX_THREADS]; // one slot per thread + volatile INT32 nextindex; // index of next slot to use #else - CRITICAL_SECTION section; + CRITICAL_SECTION section; #endif }; struct work_thread_info { - osd_work_queue * queue; // pointer back to the queue - HANDLE handle; // handle to the thread - HANDLE wakeevent; // wake event for the thread - volatile INT32 active; // are we actively processing work? + osd_work_queue * queue; // pointer back to the queue + HANDLE handle; // handle to the thread + HANDLE wakeevent; // wake event for the thread + volatile INT32 active; // are we actively processing work? #if KEEP_STATISTICS - INT32 itemsdone; - osd_ticks_t actruntime; - osd_ticks_t runtime; - osd_ticks_t spintime; - osd_ticks_t waittime; + INT32 itemsdone; + osd_ticks_t actruntime; + osd_ticks_t runtime; + osd_ticks_t spintime; + osd_ticks_t waittime; #endif }; struct osd_work_queue { - scalable_lock lock; // lock for protecting the queue - osd_work_item * volatile list; // list of items in the queue - osd_work_item ** volatile tailptr; // pointer to the tail pointer of work items in the queue - osd_work_item * volatile free; // free list of work items - volatile INT32 items; // items in the queue - volatile INT32 livethreads; // number of live threads - volatile INT32 waiting; // is someone waiting on the queue to complete? - volatile UINT8 exiting; // should the threads exit on their next opportunity? - UINT32 threads; // number of threads in this queue - UINT32 flags; // creation flags - work_thread_info * thread; // array of thread information - HANDLE doneevent; // event signalled when work is complete + scalable_lock lock; // lock for protecting the queue + osd_work_item * volatile list; // list of items in the queue + osd_work_item ** volatile tailptr; // pointer to the tail pointer of work items in the queue + osd_work_item * volatile free; // free list of work items + volatile INT32 items; // items in the queue + volatile INT32 livethreads; // number of live threads + volatile INT32 waiting; // is someone waiting on the queue to complete? + volatile UINT8 exiting; // should the threads exit on their next opportunity? + UINT32 threads; // number of threads in this queue + UINT32 flags; // creation flags + work_thread_info * thread; // array of thread information + HANDLE doneevent; // event signalled when work is complete #if KEEP_STATISTICS - volatile INT32 itemsqueued; // total items queued - volatile INT32 setevents; // number of times we called SetEvent - volatile INT32 extraitems; // how many extra items we got after the first in the queue loop - volatile INT32 spinloops; // how many times spinning bought us more items + volatile INT32 itemsqueued; // total items queued + volatile INT32 setevents; // number of times we called SetEvent + volatile INT32 extraitems; // how many extra items we got after the first in the queue loop + volatile INT32 spinloops; // how many times spinning bought us more items #endif }; struct osd_work_item { - osd_work_item * next; // pointer to next item - osd_work_queue * queue; // pointer back to the owning queue - osd_work_callback callback; // callback function - void * param; // callback parameter - void * result; // callback result - HANDLE event; // event signalled when complete - UINT32 flags; // creation flags - volatile INT32 done; // is the item done? + osd_work_item * next; // pointer to next item + osd_work_queue * queue; // pointer back to the owning queue + osd_work_callback callback; // callback function + void * param; // callback parameter + void * result; // callback result + HANDLE event; // event signalled when complete + UINT32 flags; // creation flags + volatile INT32 done; // is the item done? }; //============================================================ @@ -267,7 +267,7 @@ osd_work_queue *osd_work_queue_alloc(int flags) queue->flags = flags; // allocate events for the queue - queue->doneevent = CreateEvent(NULL, TRUE, TRUE, NULL); // manual reset, signalled + queue->doneevent = CreateEvent(NULL, TRUE, TRUE, NULL); // manual reset, signalled if (queue->doneevent == NULL) goto error; @@ -307,7 +307,7 @@ osd_work_queue *osd_work_queue_alloc(int flags) thread->queue = queue; // create the per-thread wake event - thread->wakeevent = CreateEvent(NULL, FALSE, FALSE, NULL); // auto-reset, not signalled + thread->wakeevent = CreateEvent(NULL, FALSE, FALSE, NULL); // auto-reset, not signalled if (thread->wakeevent == NULL) goto error; @@ -598,7 +598,7 @@ int osd_work_item_wait(osd_work_item *item, osd_ticks_t timeout) // if we don't have an event, create one if (item->event == NULL) - item->event = CreateEvent(NULL, TRUE, FALSE, NULL); // manual reset, not signalled + item->event = CreateEvent(NULL, TRUE, FALSE, NULL); // manual reset, not signalled else ResetEvent(item->event); |