12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 |
- --- /tmp/work/src/goxel-0.10.8/src/main.c 2021-08-09 09:47:27.000000000 +0300
- +++ main.c 2021-09-28 05:00:28.696566182 +0300
- @@ -214,41 +214,7 @@
- }
- #endif
-
- -#if GLFW_VERSION_MAJOR >= 3 && GLFW_VERSION_MINOR >= 2
- -
- -static void load_icon(GLFWimage *image, const char *path)
- -{
- - uint8_t *img;
- - int w, h, bpp = 0, size;
- - const void *data;
- - data = assets_get(path, &size);
- - assert(data);
- - img = img_read_from_mem(data, size, &w, &h, &bpp);
- - assert(img);
- - assert(bpp == 4);
- - image->width = w;
- - image->height = h;
- - image->pixels = img;
- -}
- -
- -static void set_window_icon(GLFWwindow *window)
- -{
- - GLFWimage icons[7];
- - int i;
- - load_icon(&icons[0], "asset://data/icons/icon16.png");
- - load_icon(&icons[1], "asset://data/icons/icon24.png");
- - load_icon(&icons[2], "asset://data/icons/icon32.png");
- - load_icon(&icons[3], "asset://data/icons/icon48.png");
- - load_icon(&icons[4], "asset://data/icons/icon64.png");
- - load_icon(&icons[5], "asset://data/icons/icon128.png");
- - load_icon(&icons[6], "asset://data/icons/icon256.png");
- - glfwSetWindowIcon(window, 7, icons);
- - for (i = 0; i < 7; i++) free(icons[i].pixels);
- -}
- -
- -#else
- static void set_window_icon(GLFWwindow *window) {}
- -#endif
-
- static void set_window_title(void *user, const char *title)
- {
- @@ -259,6 +225,7 @@
- {
- args_t args = {.scale = 1};
- GLFWwindow *window;
- +
- GLFWmonitor *monitor;
- const GLFWvidmode *mode;
- int width = 640, height = 480, ret = 0;
- @@ -274,6 +241,7 @@
- glfwSetErrorCallback(on_glfw_error);
- glfwInit();
- glfwWindowHint(GLFW_SAMPLES, 4);
- + glfwWindowHint(GLFW_FOCUSED, GLFW_FALSE);
- monitor = glfwGetPrimaryMonitor();
- mode = glfwGetVideoMode(monitor);
- if (mode) {
|