Added functions for setting the window icon (#926)

* [dx] Added functions to set an icon from bytes

* [sdl] Added support for setIcon

* [dx] Fix typo in Icon

Author: EspeuteClement

libs/directx/dx/Icon.hx

@@ -0,0 +1,19 @@
+package dx;
+
+private typedef IconPtr = hl.Abstract<"dx_icon">;
+
+abstract Icon(IconPtr) {
+	@:hlNative("?directx","create_icon")
+	public static function createIcon( width : Int, height : Int, pixels : hl.Bytes) : Icon {
+		return null;
+	}
+
+	public function destroy() {
+		destroyIcon(this);
+	}
+
+	@:hlNative("?directx","destroy_icon")
+	static function destroyIcon( ptr : IconPtr) {
+	}
+
+}

libs/directx/dx/Window.hx

@@ -54,6 +54,8 @@ class Window {
 	public var vsync : Bool;
 	public var dragAndDropEnabled(default, set) : Bool;
 
+	var icon : Icon = null;
+
 	public function new( title : String, width : Int, height : Int, x : Int = CW_USEDEFAULT, y : Int = CW_USEDEFAULT, windowFlags : Int = RESIZABLE ) {
 		win = winCreateEx(x, y, width, height, windowFlags);
 		this.title = title;
@@ -138,6 +140,10 @@ class Window {
 	public function destroy() {
 		winDestroy(win);
 		win = null;
+		if (icon != null) {
+			icon.destroy();
+			icon = null;
+		}
 		windows.remove(this);
 	}
 
@@ -157,6 +163,20 @@ class Window {
 		winSetFocus(win);
 	}
 
+	public function setIcon(width : Int, height: Int, pixels : hl.Bytes) {
+		var newIcon = Icon.createIcon(width, height, pixels);
+		if (newIcon == null)
+			return;
+
+		winSetIcon(win, newIcon);
+
+		if (icon != null) {
+			icon.destroy();
+		}
+
+		icon = newIcon;
+	}
+
 	public function getNextEvent( e : Event ) : Bool {
 		return winGetNextEvent(win, e);
 	}
@@ -409,4 +429,8 @@ class Window {
 		return null;
 	}
 
+	@:hlNative("?directx", "win_set_icon")
+	static function winSetIcon(win: WinPtr, icon: Icon) : Void {
+	}
+
 }

libs/directx/window.c

@@ -93,6 +93,9 @@ static bool capture_mouse = false;
 static bool relative_mouse = false;
 
 typedef HCURSOR dx_cursor;
+typedef HICON dx_icon;
+
+#define TICON _ABSTRACT(dx_icon)
 
 static dx_cursor cur_cursor = NULL;
 static bool show_cursor = true;
@@ -957,6 +960,11 @@ HL_PRIM int HL_NAME(win_change_display_setting)(wchar_t* device, vdynamic* ds) {
 	return ChangeDisplaySettingsExW(device, found ? &devMode : NULL, NULL, found ? CDS_FULLSCREEN : 0, NULL);
 }
 
+HL_PRIM void HL_NAME(win_set_icon)(HWND wnd, dx_icon icon) {
+	SendMessage(wnd, WM_SETICON, ICON_SMALL, (LPARAM)icon);
+	SendMessage(wnd, WM_SETICON, ICON_BIG, (LPARAM)icon);
+}
+
 #define TWIN _ABSTRACT(dx_window)
 DEFINE_PRIM(TWIN, win_create_ex, _I32 _I32 _I32 _I32 _I32);
 DEFINE_PRIM(TWIN, win_create, _I32 _I32);
@@ -990,6 +998,7 @@ DEFINE_PRIM(_DYN, win_get_current_display_setting, _BYTES _BOOL);
 DEFINE_PRIM(_I32, win_change_display_setting, _BYTES _DYN);
 DEFINE_PRIM(_ARR, win_get_monitors, _NO_ARG);
 DEFINE_PRIM(_BYTES, win_get_monitor_from_window, TWIN);
+DEFINE_PRIM(_VOID, win_set_icon, TWIN TICON);
 DEFINE_PRIM(_VOID, win_set_dark_mode, TWIN _BOOL);
 
 DEFINE_PRIM(_I32, get_screen_width, _NO_ARG);
@@ -999,38 +1008,40 @@ HL_PRIM dx_cursor HL_NAME(load_cursor)( int res ) {
 	return LoadCursor(NULL,MAKEINTRESOURCE(res));
 }
 
-HL_PRIM dx_cursor HL_NAME(create_cursor)( int width, int height, vbyte *data, int hotX, int hotY ) {
+static HICON create_icon_internal(int width, int height, vbyte* data, bool icon, int hotX, int hotY) {
 	int pad = sizeof(void*) << 3;
 	HICON hicon;
 	HDC hdc = GetDC(NULL);
 	BITMAPV4HEADER bmh;
-	void *pixels;
-	void *maskbits;
+	void* pixels;
+	void* maskbits;
 	int maskbitslen;
 	ICONINFO ii;
 
-	ZeroMemory(&bmh,sizeof(bmh));
+	ZeroMemory(&bmh, sizeof(bmh));
 	bmh.bV4Size = sizeof(bmh);
 	bmh.bV4Width = width;
 	bmh.bV4Height = -height;
 	bmh.bV4Planes = 1;
 	bmh.bV4BitCount = 32;
 	bmh.bV4V4Compression = BI_BITFIELDS;
 	bmh.bV4AlphaMask = 0xFF000000;
-	bmh.bV4RedMask   = 0x00FF0000;
+	bmh.bV4RedMask = 0x00FF0000;
 	bmh.bV4GreenMask = 0x0000FF00;
-	bmh.bV4BlueMask  = 0x000000FF;
+	bmh.bV4BlueMask = 0x000000FF;
 
-	maskbitslen = ((width + (-width)%pad) >> 3) * height;
+	maskbitslen = ((width + (-width) % pad) >> 3) * height;
 	maskbits = malloc(maskbitslen);
-	if( maskbits == NULL )
+	if (maskbits == NULL)
 		return NULL;
-	memset(maskbits,0xFF,maskbitslen);
+	memset(maskbits, 0xFF, maskbitslen);
 
-	memset(&ii,0,sizeof(ii));
-	ii.fIcon = FALSE;
-	ii.xHotspot = (DWORD)hotX;
-	ii.yHotspot = (DWORD)hotY;
+	memset(&ii, 0, sizeof(ii));
+	ii.fIcon = icon;
+	if (icon) {
+		ii.xHotspot = (DWORD)hotX;
+		ii.yHotspot = (DWORD)hotY;
+	}
 	ii.hbmColor = CreateDIBSection(hdc, (BITMAPINFO*)&bmh, DIB_RGB_COLORS, &pixels, NULL, 0);
 	ii.hbmMask = CreateBitmap(width, height, 1, 1, maskbits);
 	ReleaseDC(NULL, hdc);
@@ -1044,10 +1055,23 @@ HL_PRIM dx_cursor HL_NAME(create_cursor)( int width, int height, vbyte *data, in
 	return hicon;
 }
 
+
+HL_PRIM dx_cursor HL_NAME(create_cursor)( int width, int height, vbyte *data, int hotX, int hotY ) {
+	return create_icon_internal(width, height, data, false, hotX, hotY);
+}
+
+HL_PRIM dx_icon HL_NAME(create_icon)(int width, int height, vbyte* data) {
+	return create_icon_internal(width, height, data, true, 0, 0);
+}
+
 HL_PRIM void HL_NAME(destroy_cursor)( dx_cursor c ) {
 	DestroyIcon(c);
 }
 
+HL_PRIM void HL_NAME(destroy_icon)(dx_icon i) {
+	DestroyIcon(i);
+}
+
 HL_PRIM void HL_NAME(set_cursor)( dx_cursor c ) {
 	cur_cursor = c;
 	if( CURSOR_VISIBLE )
@@ -1066,7 +1090,9 @@ HL_PRIM bool HL_NAME(is_cursor_visible)() {
 #define TCURSOR _ABSTRACT(dx_cursor)
 DEFINE_PRIM(TCURSOR, load_cursor, _I32);
 DEFINE_PRIM(TCURSOR, create_cursor, _I32 _I32 _BYTES _I32 _I32);
+DEFINE_PRIM(TICON, create_icon, _I32 _I32 _BYTES);
 DEFINE_PRIM(_VOID, destroy_cursor, TCURSOR);
+DEFINE_PRIM(_VOID, destroy_icon, TICON);
 DEFINE_PRIM(_VOID, set_cursor, TCURSOR);
 DEFINE_PRIM(_VOID, show_cursor, _BOOL);
 DEFINE_PRIM(_BOOL, is_cursor_visible, _NO_ARG);

libs/sdl/sdl.c

@@ -21,6 +21,7 @@
 
 #define TWIN _ABSTRACT(sdl_window)
 #define TGL _ABSTRACT(sdl_gl)
+#define _SURF _ABSTRACT(sdl_surface)
 
 typedef struct {
 	int x;
@@ -101,6 +102,7 @@ typedef struct {
 
 static bool isGlOptionsSet = false;
 
+
 HL_PRIM bool HL_NAME(init_once)() {
 	SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
 	if( SDL_Init(SDL_INIT_EVERYTHING) != 0 ) {
@@ -634,6 +636,10 @@ HL_PRIM void HL_NAME(win_set_title)(SDL_Window *win, vbyte *title) {
 	SDL_SetWindowTitle(win, (char*)title);
 }
 
+HL_PRIM void HL_NAME(win_set_icon)(SDL_Window *win, SDL_Surface *s) {
+	SDL_SetWindowIcon(win, s);
+}
+
 HL_PRIM void HL_NAME(win_set_position)(SDL_Window *win, int x, int y) {
 	SDL_SetWindowPosition(win, x, y);
 }
@@ -738,6 +744,7 @@ DEFINE_PRIM(_I32, win_display_handle, TWIN);
 DEFINE_PRIM(_VOID, win_resize, TWIN _I32);
 DEFINE_PRIM(_VOID, win_raise, TWIN);
 DEFINE_PRIM(_VOID, win_set_title, TWIN _BYTES);
+DEFINE_PRIM(_VOID, win_set_icon, TWIN _SURF);
 DEFINE_PRIM(_VOID, win_set_position, TWIN _I32 _I32);
 DEFINE_PRIM(_VOID, win_get_position, TWIN _REF(_I32) _REF(_I32));
 DEFINE_PRIM(_VOID, win_set_size, TWIN _I32 _I32);
@@ -870,7 +877,6 @@ HL_PRIM void HL_NAME(free_surface)( SDL_Surface *s ) {
 	SDL_FreeSurface(s);
 }
 
-#define _SURF	_ABSTRACT(sdl_surface)
 DEFINE_PRIM(_SURF, surface_from, _BYTES _I32 _I32 _I32 _I32 _I32 _I32 _I32 _I32);
 DEFINE_PRIM(_VOID, free_surface, _SURF);
 

libs/sdl/sdl/Window.hx

@@ -160,6 +160,10 @@ class Window {
 		return visible = b;
 	}
 
+	public function setIcon(surface: Surface) {
+		winSetIcon(win, surface);
+	}
+
 	public function resize( width : Int, height : Int ) {
 		winSetSize(win, width, height);
 	}
@@ -258,16 +262,16 @@ class Window {
 		winSetOpacity(win, v);
 		return v;
 	}
-	
+
 	function get_grab() {
 		return getWindowGrab(win);
 	}
-	
+
 	function set_grab(v) {
 		setWindowGrab(win, v);
 		return v;
 	}
-	
+
 	function get_id() {
 		return winGetId(win);
 	}
@@ -320,6 +324,10 @@ class Window {
 	static function winSetTitle( win : WinPtr, title : hl.Bytes ) {
 	}
 
+	@:hlNative("?sdl", "win_set_icon")
+	static function winSetIcon(win : WinPtr, surface: Surface) {
+	}
+
 	static function winSetPosition( win : WinPtr, width : Int, height : Int ) {
 	}
 
@@ -396,11 +404,11 @@ class Window {
 
 	static function setWindowGrab( win : WinPtr, grab : Bool ) {
 	}
-	
+
 	static function getWindowGrab( win : WinPtr ) : Bool {
 		return false;
 	}
-	
+
 	static function warpMouseInWindow( win : WinPtr, x : Int, y : Int ) : Void {
 	}