display -- name

This commit is contained in:
Lars A. Doucet
2015-07-30 14:40:37 -05:00
parent 3588d9e6e0
commit ac275f55ee
4 changed files with 18 additions and 3 deletions

View File

@@ -29,6 +29,8 @@ class Display {
} }
public static function getName(i:Int):String { return lime_display_get_name(i); }
/** /**
* Get the total number of connected displays * Get the total number of connected displays
* @return * @return
@@ -128,11 +130,11 @@ class Display {
private static var lime_display_get_num_devices = function():Int { private static var lime_display_get_num_devices = function():Int {
return 1; return 1;
}; };
*/
private static var lime_display_get_name = function(i:Int) { private static var lime_display_get_name = function(i:Int) {
return "fake"; return "fake";
}; };
*/
private static var lime_display_get_num_display_modes = function(i:Int) { private static var lime_display_get_num_display_modes = function(i:Int) {
return 1; return 1;
}; };
@@ -147,9 +149,9 @@ class Display {
#if (cpp || neko || nodejs) #if (cpp || neko || nodejs)
private static var lime_display_get_num_devices = System.load("lime", "lime_display_get_num_devices", 0); private static var lime_display_get_num_devices = System.load("lime", "lime_display_get_num_devices", 0);
private static var lime_display_get_name = System.load ("lime", "lime_display_get_name", 1);
/* /*
private static var lime_display_get_name = System.load ("lime", "lime_display_get_name", 1);
private static var lime_display_get_num_display_modes = System.load ("lime", "lime_display_get_num_display_modes", 1); private static var lime_display_get_num_display_modes = System.load ("lime", "lime_display_get_num_display_modes", 1);
private static var lime_display_get_display_mode = System.load ("lime", "lime_display_get_display_mode", 2); private static var lime_display_get_display_mode = System.load ("lime", "lime_display_get_display_mode", 2);
private static var lime_display_get_current_display_mode = System.load ("lime", "lime_display_get_current_display_mode", 1); private static var lime_display_get_current_display_mode = System.load ("lime", "lime_display_get_current_display_mode", 1);

View File

@@ -11,6 +11,7 @@ namespace lime {
public: public:
static int GetNumDevices (); static int GetNumDevices ();
static const char* GetDisplayName (int displayIndex);
}; };

View File

@@ -391,6 +391,12 @@ namespace lime {
} }
value lime_display_get_name (value displayIndex) {
return alloc_string (Display::GetDisplayName (val_int (displayIndex)));
}
value lime_display_get_num_devices () { value lime_display_get_num_devices () {
return alloc_int (Display::GetNumDevices()); return alloc_int (Display::GetNumDevices());
@@ -1178,6 +1184,7 @@ namespace lime {
DEFINE_PRIM (lime_font_render_glyph, 3); DEFINE_PRIM (lime_font_render_glyph, 3);
DEFINE_PRIM (lime_font_render_glyphs, 3); DEFINE_PRIM (lime_font_render_glyphs, 3);
DEFINE_PRIM (lime_font_set_size, 2); DEFINE_PRIM (lime_font_set_size, 2);
DEFINE_PRIM (lime_display_get_name, 1);
DEFINE_PRIM (lime_display_get_num_devices, 0); DEFINE_PRIM (lime_display_get_num_devices, 0);
DEFINE_PRIM (lime_gamepad_add_mappings, 1); DEFINE_PRIM (lime_gamepad_add_mappings, 1);
DEFINE_PRIM (lime_gamepad_event_manager_register, 2); DEFINE_PRIM (lime_gamepad_event_manager_register, 2);

View File

@@ -10,5 +10,10 @@ namespace lime {
} }
static const char* GetDisplayName (int displayIndex) {
return SDL_GetDisplayName(displayIndex);
}
} }