Add Jtk_SetWindowIcon()

src/gui/Window.cc

@@ -52,16 +52,27 @@ static bool Initialize_OpenGL()
     return true;
 }
 
-#if 0
 void Window::set_window_icon()
 {
-    SDL_Surface * surface = SDL_CreateRGBSurfaceFrom((void *)jes_icon_32x32, 32, 32, 24, 32 * 3, 0xFF0000u, 0xFF00u, 0xFFu, 0u);
+    uint8_t * icon_bgra = (uint8_t *)malloc(32u * 32u * 4u);
-
+    uint8_t * out_icon = icon_bgra;
-    SDL_SetWindowIcon(m_window, surface);
+    const uint8_t * in_icon = jes_icon_32x32;
-
+    for (int row = 0; row < 32; row++)
-    SDL_FreeSurface(surface);
+    {
+        for (int col = 0; col < 32; col++)
+        {
+            uint8_t r = *in_icon++;
+            uint8_t g = *in_icon++;
+            uint8_t b = *in_icon++;
+            *out_icon++ = b;
+            *out_icon++ = g;
+            *out_icon++ = r;
+            *out_icon++ = 0xFFu;
+        }
+    }
+    Jtk_SetWindowIcon(m_window, icon_bgra, 32, 32);
+    free(icon_bgra);
 }
-#endif
 
 /**
  * Create a Window.
@@ -85,9 +96,7 @@ bool Window::create(std::shared_ptr<Buffer> buffer)
     }
     Jtk_SetWindowTitle(m_window, "jes");
 
-#if 0
     set_window_icon();
-#endif
 
     if (!Initialize_OpenGL())
     {

src/gui/Window.h

@@ -46,9 +46,7 @@ protected:
     void handle_event(Jtk_Event & event);
     void handle_keypress(uint32_t keyval);
     void change_focus(std::shared_ptr<BufferPane> buffer_pane);
-#if 0
     void set_window_icon();
-#endif
     void handle_command(const EncodedString & command);
 
     void command_write_file(const CommandParser & cp);

src/gui/jtk/Jtk_window.cc

@@ -1,4 +1,3 @@
-
 #include "Jtk.h"
 
 #ifdef JTK_X
@@ -7,6 +6,7 @@
 #include "Jtk_internal.h"
 #include <stdio.h>
 #include <X11/Xatom.h>
+#include <cstring>
 
 static Bool WaitForNotify(Display * display, XEvent * event, XPointer arg)
 {
@@ -56,4 +56,40 @@ void Jtk_SetWindowTitle(void * window, const char * title)
     }
 }
 
+/**
+ * Set the window icon.
+ *
+ * @param window
+ *   The window to operate on.
+ * @param data
+ *   The format of data must be 32 bits per pixel in BGRA format (e.g. data[0]
+ *   is blue value, data[3] is alpha value of first pixel).
+ * @param width
+ *   Icon width.
+ * @param height
+ *   Icon height.
+ */
+void Jtk_SetWindowIcon(void * window, const uint8_t * data,
+        size_t width, size_t height)
+{
+    Atom net_wm_icon_atom = XInternAtom(g_display, "_NET_WM_ICON", False);
+    size_t property_size = (2u + width * height) * sizeof(long);
+    unsigned long * property_data = (unsigned long *)malloc(property_size);
+    property_data[0] = width;
+    property_data[1] = height;
+    unsigned long * dest = &property_data[2];
+    const uint32_t * src = (const uint32_t *)data;
+    for (size_t row = 0u; row < height; row++)
+    {
+        for (size_t col = 0u; col < width; col++)
+        {
+            *dest++ = *src++;
+        }
+    }
+    XChangeProperty(g_display, (Window)window, net_wm_icon_atom, XA_CARDINAL,
+            32, PropModeReplace, (uint8_t *)property_data, property_size);
+    XFlush(g_display);
+    free(property_data);
+}
+
 #endif

src/gui/jtk/Jtk_window.h

@@ -5,5 +5,7 @@ void * Jtk_CreateWindow();
 void Jtk_SwapBuffers(void * window);
 void Jtk_CloseWindow(void * window);
 void Jtk_SetWindowTitle(void * window, const char * title);
+void Jtk_SetWindowIcon(void * window, const uint8_t * data,
+        size_t width, size_t height);
 
 #endif