20.05.2010

src/filesys.c

@@ -60,7 +60,7 @@
 #define my_open fopen
 #define my_close fclose
 #define my_lseek fseek
-#define my_strdup strdup
+//#define my_strdup strdup
 #define _stat64 stat
 
 #define TRUE 1
@@ -6590,4 +6590,4 @@ int save_filesys_cando (void)
 	return filesys_in_interrupt ? 0 : 1;
 }
 
-#endif
\ No newline at end of file
+#endif

src/gfx-amigaos/ami-win.c

@@ -2404,7 +2404,8 @@ struct inputdevice_functions inputdevicefunc_mouse = {
     unacquire_mouse,
     read_mouse,
     get_mouse_num,
-    get_mouse_name,
+    get_kb_friendlyname,
+    get_kb_uniquename,
     get_mouse_widget_num,
     get_mouse_widget_type,
     get_mouse_widget_first
@@ -2435,11 +2436,16 @@ static unsigned int get_kb_num (void)
     return 1;
 }
 
-static const char *get_kb_name (unsigned int kb)
+static const char *get_kb_friendlyname (unsigned int kb)
 {
     return "Default keyboard";
 }
 
+static const char *get_kb_uniquename (unsigned int kb)
+{
+    return "DEFKEYB1";
+}
+
 static unsigned int get_kb_widget_num (unsigned int kb)
 {
     return 128;

src/gfx-beos/be-Input.cpp

@@ -42,11 +42,16 @@ static unsigned int get_kb_num (void)
     return 1;
 }
 
-static const char *get_kb_name (unsigned int kb)
+static const char *get_kb_friendlyname (unsigned int kb)
 {
     return "Default keyboard";
 }
 
+static const char *get_kb_uniquename (unsigned int kb)
+{
+    return "DEFKEYB1";
+}
+
 static unsigned int get_kb_widget_num (unsigned int kb)
 {
     return 127;
@@ -135,7 +140,8 @@ struct inputdevice_functions inputdevicefunc_keyboard =
     unacquire_kb,
     read_kb,
     get_kb_num,
-    get_kb_name,
+    get_kb_friendlyname,
+    get_kb_uniquename,
     get_kb_widget_num,
     get_kb_widget_type,
     get_kb_widget_first

src/gfx-curses/ncurses.c

@@ -776,11 +776,16 @@ static unsigned int get_kb_num (void)
     return 1;
 }
 
-static const char *get_kb_name (unsigned int kb)
+static const char *get_kb_friendlyname (unsigned int kb)
 {
     return "Default keyboard";
 }
 
+static const char *get_kb_uniquename (unsigned int kb)
+{
+    return "DEFKEYB1";
+}
+
 static unsigned  int get_kb_widget_num (unsigned int kb)
 {
     return 255; // fix me
@@ -833,7 +838,8 @@ struct inputdevice_functions inputdevicefunc_keyboard =
     unacquire_kb,
     read_kb,
     get_kb_num,
-    get_kb_name,
+    get_kb_friendlyname,
+    get_kb_uniquename,
     get_kb_widget_num,
     get_kb_widget_type,
     get_kb_widget_first

src/jd-amigainput/joystick.c

@@ -234,7 +234,7 @@ static void read_joy (unsigned int num)
 /*
  * Query number of joysticks attached to system
  */
-static unsigned int get_joystick_count (void)
+static unsigned int get_joystick_num (void)
 {
     return joystickCount;
 }
@@ -277,7 +277,12 @@ static int get_joystick_widget_first (unsigned int joynum, int type)
     return -1;
 }
 
-static const char *get_joystick_name (unsigned int joynum)
+static const char *get_joystick_friendlyname (unsigned int joynum)
+{
+    return (char *)joystickList[joynum].name;
+}
+
+static const char *get_joystick_uniquename (unsigned int joynum)
 {
     return (char *)joystickList[joynum].name;
 }
@@ -320,8 +325,9 @@ struct inputdevice_functions inputdevicefunc_joystick = {
     acquire_joy,
     unacquire_joy,
     read_joysticks,
-    get_joystick_count,
-    get_joystick_name,
+    get_joystick_num,
+    get_joystick_friendlyname,
+    get_joystick_uniquename,
     get_joystick_widget_num,
     get_joystick_widget_type,
     get_joystick_widget_first

src/jd-amigaos/joystick.c

@@ -104,13 +104,20 @@ static unsigned int get_joystick_num (void)
     return nr_joysticks;
 }
 
-static const char *get_joystick_name (unsigned int joy)
+static const char *get_joystick_friendlyname (unsigned int joy)
 {
     static char name[16];
     sprintf (name, "Joy port %d", joy);
     return name;
 }
 
+static const char *get_joystick_uniquename (unsigned int joy)
+{
+    static char name[16];
+    sprintf (name, "JOY%d", joy);
+    return name;
+}
+
 static unsigned int get_joystick_widget_num (unsigned int joy)
 {
     return MAX_AXLES + MAX_BUTTONS;
@@ -149,7 +156,8 @@ struct inputdevice_functions inputdevicefunc_joystick = {
     unacquire_joy,
     read_joysticks,
     get_joystick_num,
-    get_joystick_name,
+    get_joystick_friendlyname,
+    get_joystick_uniquename,
     get_joystick_widget_num,
     get_joystick_widget_type,
     get_joystick_widget_first

src/jd-beos/joystick.cpp

@@ -228,12 +228,17 @@ static void read_joysticks (void)
     }
 }
 
-static unsigned int get_joystick_count (void)
+static unsigned int get_joystick_num (void)
 {
     return nr_joysticks;
 }
 
-static const char *get_joystick_name (unsigned int nr)
+static const char *get_joystick_friendlyname (unsigned int nr)
+{
+    return joysticks[nr]->getName ();
+}
+
+static const char *get_joystick_uniquename (unsigned int nr)
 {
     return joysticks[nr]->getName ();
 }
@@ -279,8 +284,9 @@ struct inputdevice_functions inputdevicefunc_joystick = {
     acquire_joy,
     unacquire_joy,
     read_joysticks,
-    get_joystick_count,
-    get_joystick_name,
+    get_joystick_num,
+    get_joystick_friendlyname,
+    get_joystick_uniquename,
     get_joystick_widget_num,
     get_joystick_widget_type,
     get_joystick_widget_first

src/jd-linuxold/joystick.c

@@ -189,13 +189,20 @@ static void read_joysticks (void)
 		read_joy (i);
 }
 
-static const char *get_joystick_name (unsigned int joy)
+static const char *get_joystick_friendlyname (unsigned int joy)
 {
     static char name[100];
     sprintf (name, "%d: %s%d", joy + 1, js_prefix, joy);
     return name;
 }
 
+static const char *get_joystick_uniquename (unsigned int joy)
+{
+    static char name[100];
+    sprintf (name, "%d%s%d", joy + 1, js_prefix, joy);
+    return name;
+}
+
 static unsigned int get_joystick_widget_num (unsigned int joy)
 {
     return MAX_AXLES + MAX_BUTTONS;
@@ -234,7 +241,8 @@ struct inputdevice_functions inputdevicefunc_joystick = {
     unacquire_joy,
     read_joysticks,
     get_joystick_num,
-    get_joystick_name,
+    get_joystick_friendlyname,
+    get_joystick_uniquename,
     get_joystick_widget_num,
     get_joystick_widget_type,
     get_joystick_widget_first

src/jd-none/joystick.c

@@ -42,7 +42,12 @@ static unsigned int get_joystick_num (void)
     return 0;
 }
 
-static const char *get_joystick_name (unsigned int joy)
+static const char *get_joystick_friendlyname (unsigned int joy)
+{
+    return 0;
+}
+
+static const char *get_joystick_uniquename (unsigned int joy)
 {
     return 0;
 }
@@ -69,7 +74,8 @@ struct inputdevice_functions inputdevicefunc_joystick = {
     unacquire_joystick,
     read_joysticks,
     get_joystick_num,
-    get_joystick_name,
+    get_joystick_friendlyname,
+    get_joystick_uniquename,
     get_joystick_widget_num,
     get_joystick_widget_type,
     get_joystick_widget_first