diff --git a/BorMakefile b/BorMakefile index a6a3dec9..d9af66a9 100644 --- a/BorMakefile +++ b/BorMakefile @@ -18,15 +18,14 @@ clean: del /f /q src\color.obj del /f /q src\directory.obj del /f /q src\messagebox.obj - del /f /q external\ds.obj - del /f /q external\image.obj - del /f /q external\truetype.obj + del /f /q external\stb_ds.obj + del /f /q external\stb_image.obj + del /f /q external\stb_truetype.obj del /f /q src\icon\info.obj del /f /q src\icon\note.obj del /f /q src\icon\warning.obj del /f /q src\icon\error.obj del /f /q src\icon\news.obj - del /f /q src\icon\question.obj del /f /q src\icon\directory.obj del /f /q src\icon\file.obj del /f /q src\icon\back.obj @@ -34,6 +33,9 @@ clean: del /f /q src\icon\up.obj del /f /q src\icon\computer.obj del /f /q src\icon\search.obj + del /f /q src\icon\down.obj + del /f /q src\icon\left.obj + del /f /q src\icon\right.obj del /f /q src\cursor\default.obj del /f /q src\cursor\cross.obj del /f /q src\cursor\text.obj @@ -60,8 +62,8 @@ clean: del /f /q src\backend\gdi.obj del /f /q src\Mw.dll -src\Mw.dll: src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\ds.obj external\image.obj external\truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj - $(LD) $(LDFLAGS) -e$@ src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\ds.obj external\image.obj external\truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib +src\Mw.dll: src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj + $(LD) $(LDFLAGS) -e$@ src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib implib src\Mw.lib src\Mw.dll .c.obj: diff --git a/NTMakefile b/NTMakefile index 43801f55..6b24fc36 100644 --- a/NTMakefile +++ b/NTMakefile @@ -18,15 +18,14 @@ clean: del /f /q src\color.obj del /f /q src\directory.obj del /f /q src\messagebox.obj - del /f /q external\ds.obj - del /f /q external\image.obj - del /f /q external\truetype.obj + del /f /q external\stb_ds.obj + del /f /q external\stb_image.obj + del /f /q external\stb_truetype.obj del /f /q src\icon\info.obj del /f /q src\icon\note.obj del /f /q src\icon\warning.obj del /f /q src\icon\error.obj del /f /q src\icon\news.obj - del /f /q src\icon\question.obj del /f /q src\icon\directory.obj del /f /q src\icon\file.obj del /f /q src\icon\back.obj @@ -34,6 +33,9 @@ clean: del /f /q src\icon\up.obj del /f /q src\icon\computer.obj del /f /q src\icon\search.obj + del /f /q src\icon\down.obj + del /f /q src\icon\left.obj + del /f /q src\icon\right.obj del /f /q src\cursor\default.obj del /f /q src\cursor\cross.obj del /f /q src\cursor\text.obj @@ -60,8 +62,8 @@ clean: del /f /q src\backend\gdi.obj del /f /q src\Mw.dll -src\Mw.dll: src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\ds.obj external\image.obj external\truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj - $(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\ds.obj external\image.obj external\truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib +src\Mw.dll: src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj + $(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\text\font.obj src\text\draw.obj src\text\boldfont.obj src\text\ttf.obj src\text\boldttf.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib .c.obj: diff --git a/WatMakefile b/WatMakefile index 79852d0e..a236b24e 100644 --- a/WatMakefile +++ b/WatMakefile @@ -17,15 +17,14 @@ clean: .SYMBOLIC %erase src/color.obj %erase src/directory.obj %erase src/messagebox.obj - %erase external/ds.obj - %erase external/image.obj - %erase external/truetype.obj + %erase external/stb_ds.obj + %erase external/stb_image.obj + %erase external/stb_truetype.obj %erase src/icon/info.obj %erase src/icon/note.obj %erase src/icon/warning.obj %erase src/icon/error.obj %erase src/icon/news.obj - %erase src/icon/question.obj %erase src/icon/directory.obj %erase src/icon/file.obj %erase src/icon/back.obj @@ -33,6 +32,9 @@ clean: .SYMBOLIC %erase src/icon/up.obj %erase src/icon/computer.obj %erase src/icon/search.obj + %erase src/icon/down.obj + %erase src/icon/left.obj + %erase src/icon/right.obj %erase src/cursor/default.obj %erase src/cursor/cross.obj %erase src/cursor/text.obj @@ -59,8 +61,8 @@ clean: .SYMBOLIC %erase src/backend/gdi.obj %erase src/Mw.dll -src/Mw.dll: src/core.obj src/string.obj src/draw.obj src/default.obj src/filechooser.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj src/directory.obj src/messagebox.obj external/ds.obj external/image.obj external/truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/question.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/text/font.obj src/text/draw.obj src/text/boldfont.obj src/text/ttf.obj src/text/boldttf.obj src/backend/gdi.obj - $(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/string.obj file src/draw.obj file src/default.obj file src/filechooser.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file src/directory.obj file src/messagebox.obj file external/ds.obj file external/image.obj file external/truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/question.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/text/font.obj file src/text/draw.obj file src/text/boldfont.obj file src/text/ttf.obj file src/text/boldttf.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib +src/Mw.dll: src/core.obj src/string.obj src/draw.obj src/default.obj src/filechooser.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj src/directory.obj src/messagebox.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/text/font.obj src/text/draw.obj src/text/boldfont.obj src/text/ttf.obj src/text/boldttf.obj src/backend/gdi.obj + $(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/string.obj file src/draw.obj file src/default.obj file src/filechooser.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file src/directory.obj file src/messagebox.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/text/font.obj file src/text/draw.obj file src/text/boldfont.obj file src/text/ttf.obj file src/text/boldttf.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib @@ -86,11 +88,11 @@ src/directory.obj: src/directory.c $(CC) $(CFLAGS) -fo=$@ $< src/messagebox.obj: src/messagebox.c $(CC) $(CFLAGS) -fo=$@ $< -external/ds.obj: external/ds.c +external/stb_ds.obj: external/stb_ds.c $(CC) $(CFLAGS) -fo=$@ $< -external/image.obj: external/image.c +external/stb_image.obj: external/stb_image.c $(CC) $(CFLAGS) -fo=$@ $< -external/truetype.obj: external/truetype.c +external/stb_truetype.obj: external/stb_truetype.c $(CC) $(CFLAGS) -fo=$@ $< src/icon/info.obj: src/icon/info.c $(CC) $(CFLAGS) -fo=$@ $< @@ -102,8 +104,6 @@ src/icon/error.obj: src/icon/error.c $(CC) $(CFLAGS) -fo=$@ $< src/icon/news.obj: src/icon/news.c $(CC) $(CFLAGS) -fo=$@ $< -src/icon/question.obj: src/icon/question.c - $(CC) $(CFLAGS) -fo=$@ $< src/icon/directory.obj: src/icon/directory.c $(CC) $(CFLAGS) -fo=$@ $< src/icon/file.obj: src/icon/file.c @@ -118,6 +118,12 @@ src/icon/computer.obj: src/icon/computer.c $(CC) $(CFLAGS) -fo=$@ $< src/icon/search.obj: src/icon/search.c $(CC) $(CFLAGS) -fo=$@ $< +src/icon/down.obj: src/icon/down.c + $(CC) $(CFLAGS) -fo=$@ $< +src/icon/left.obj: src/icon/left.c + $(CC) $(CFLAGS) -fo=$@ $< +src/icon/right.obj: src/icon/right.c + $(CC) $(CFLAGS) -fo=$@ $< src/cursor/default.obj: src/cursor/default.c $(CC) $(CFLAGS) -fo=$@ $< src/cursor/cross.obj: src/cursor/cross.c diff --git a/src/backend/x11.c b/src/backend/x11.c index 4523b79e..e2cbd466 100644 --- a/src/backend/x11.c +++ b/src/backend/x11.c @@ -414,7 +414,7 @@ void MwLLNextEvent(MwLL handle) { void MwLLSleep(int ms) { struct timespec ts; - ts.tv_sec = ms / 1000; + ts.tv_sec = ms / 1000; ts.tv_nsec = (ms % 1000) * 1000 * 1000; nanosleep(&ts, NULL); diff --git a/src/core.c b/src/core.c index 39bd52f3..3a61c21b 100644 --- a/src/core.c +++ b/src/core.c @@ -292,7 +292,7 @@ void MwLoop(MwWidget handle) { long wait = MwGetInteger(handle, MwNwaitMS); if(wait == MwDEFAULT) wait = MwWaitMS; while(!handle->close) { - int v = 0; + int v = 0; long t, t2; while(MwPending(handle)) { if((v = MwStep(handle)) != 0) break; @@ -304,10 +304,10 @@ void MwLoop(MwWidget handle) { } t = (tick + wait) - (t2 = MwLLGetTick()); - if(t > 0){ + if(t > 0) { MwLLSleep(t); tick += wait; - }else{ + } else { tick = t2; } } diff --git a/src/icon/error.c b/src/icon/error.c index d4ae742b..e394f748 100644 --- a/src/icon/error.c +++ b/src/icon/error.c @@ -24,6 +24,7 @@ unsigned int MwIconError[] = { 0x0000006F, 0x00000033, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -109,6 +110,7 @@ unsigned int MwIconError[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x00000058, 0x000000DD, 0x000000FF, @@ -297,6 +299,7 @@ unsigned int MwIconError[] = { 0x00000000, 0x00000000, 0x00000002, + 0x00784314, 0x000000E7, 0x552422FF, 0xCD6963FF, @@ -560,6 +563,7 @@ unsigned int MwIconError[] = { 0x2F0101FF, 0x000000E4, 0x00000001, + 0x00392157, 0x00000000, 0x00000000, 0x00000000, @@ -1323,6 +1327,7 @@ unsigned int MwIconError[] = { 0x000000FF, 0x0000009D, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -1370,6 +1375,7 @@ unsigned int MwIconError[] = { 0x000000FF, 0x0000009E, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -1502,6 +1508,7 @@ unsigned int MwIconError[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x000000AB, 0x010000FF, 0x6A1411FF, @@ -1517,6 +1524,7 @@ unsigned int MwIconError[] = { 0x000000FF, 0x000000A9, 0x00000001, + 0x00392157, 0x00000000, 0x00000000, 0x00000000, @@ -1919,6 +1927,7 @@ unsigned int MwIconError[] = { 0x00000066, 0x0000002C, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -1969,6 +1978,7 @@ unsigned int MwIconError[] = { 0x00000066, 0x0000002C, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -2019,6 +2029,7 @@ unsigned int MwIconError[] = { 0x00000066, 0x0000002C, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -2078,6 +2089,7 @@ unsigned int MwIconError[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x000000A9, 0x000000FF, 0x600806FF, diff --git a/src/icon/info.c b/src/icon/info.c index 40cddf6e..cef086c9 100644 --- a/src/icon/info.c +++ b/src/icon/info.c @@ -62,6 +62,7 @@ unsigned int MwIconInfo[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x00000076, 0x000000F2, 0x000001FF, @@ -74,6 +75,7 @@ unsigned int MwIconInfo[] = { 0x000000F1, 0x00000073, 0x00000001, + 0x00392157, 0x00000000, 0x00000000, 0x00000000, @@ -653,6 +655,7 @@ unsigned int MwIconInfo[] = { 0x000000FF, 0x0000006C, 0x00000001, + 0x00392157, 0x00000000, 0x00000000, 0x00000000, @@ -1448,6 +1451,7 @@ unsigned int MwIconInfo[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x00000065, 0x000000EE, 0x020305FF, @@ -1586,6 +1590,7 @@ unsigned int MwIconInfo[] = { 0x00000047, 0x00000024, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -1932,6 +1937,7 @@ unsigned int MwIconInfo[] = { 0x00000000, 0x00000000, 0x00000002, + 0x00784314, 0x00000055, 0x000000DF, 0x000000FF, @@ -2231,6 +2237,7 @@ unsigned int MwIconInfo[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x00000051, 0x000000D7, 0x000000FF, @@ -2281,6 +2288,7 @@ unsigned int MwIconInfo[] = { 0x00000000, 0x00000000, 0x00000002, + 0x00784314, 0x00000055, 0x000000DF, 0x000000F4, diff --git a/src/icon/news.c b/src/icon/news.c index c10b40e2..9f3b21cb 100644 --- a/src/icon/news.c +++ b/src/icon/news.c @@ -522,6 +522,7 @@ unsigned int MwIconNews[] = { 0x262624FF, 0x010101E0, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -781,6 +782,7 @@ unsigned int MwIconNews[] = { 0x00000000, 0x00000000, 0x00000002, + 0x00784314, 0x02020286, 0x010101EF, 0x010101FF, @@ -1440,6 +1442,7 @@ unsigned int MwIconNews[] = { 0x00000074, 0x00000046, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -1721,6 +1724,7 @@ unsigned int MwIconNews[] = { 0x00000074, 0x00000046, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -2144,6 +2148,7 @@ unsigned int MwIconNews[] = { 0x00000074, 0x0000004F, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -2191,6 +2196,7 @@ unsigned int MwIconNews[] = { 0x0000006C, 0x00000041, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -2237,6 +2243,7 @@ unsigned int MwIconNews[] = { 0x00000022, 0x00000014, 0x00000001, + 0x00392157, 0x00000000, 0x00000000, 0x00000000, diff --git a/src/icon/note.c b/src/icon/note.c index 1c66a404..9fcc4ffe 100644 --- a/src/icon/note.c +++ b/src/icon/note.c @@ -84,6 +84,7 @@ unsigned int MwIconNote[] = { 0x010000C3, 0x00000056, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -476,6 +477,7 @@ unsigned int MwIconNote[] = { 0x231D00FF, 0x010000D2, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -1454,6 +1456,7 @@ unsigned int MwIconNote[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x0200008D, 0x010000FF, 0x594F00FF, @@ -1481,6 +1484,7 @@ unsigned int MwIconNote[] = { 0x010000FF, 0x0200008B, 0x00000001, + 0x00392157, 0x00000000, 0x00000000, 0x00000000, @@ -1823,6 +1827,7 @@ unsigned int MwIconNote[] = { 0x0000000E, 0x00000008, 0x00000001, + 0x00392157, 0x00000000, 0x00000000, 0x00000000, @@ -1891,6 +1896,7 @@ unsigned int MwIconNote[] = { 0x00000000, 0x00000000, 0x00000002, + 0x00784314, 0x0000008E, 0x010000FF, 0x010000FF, @@ -1970,6 +1976,7 @@ unsigned int MwIconNote[] = { 0x00000012, 0x0000000A, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -2066,6 +2073,7 @@ unsigned int MwIconNote[] = { 0x00000012, 0x0000000A, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -2083,6 +2091,7 @@ unsigned int MwIconNote[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x00000047, 0x010000FF, 0x6F6F6FFF, @@ -2132,6 +2141,7 @@ unsigned int MwIconNote[] = { 0x00000000, 0x00000000, 0x00000001, + 0x00392157, 0x010000D3, 0x191818FF, 0xBFBFBFFF, @@ -2252,6 +2262,7 @@ unsigned int MwIconNote[] = { 0x0000000C, 0x00000008, 0x00000002, + 0x00784314, 0x00000000, 0x00000000, 0x00000000, @@ -2296,6 +2307,7 @@ unsigned int MwIconNote[] = { 0x00000005, 0x00000003, 0x00000001, + 0x00392157, 0x00000000, 0x00000000, 0x00000000, diff --git a/src/icon/search.c b/src/icon/search.c index a725e4fc..bfa07827 100644 --- a/src/icon/search.c +++ b/src/icon/search.c @@ -1,4 +1,4 @@ -/* $Id: icon.sh 488 2025-10-24 16:27:10Z nishi $ */ +/* $Id: icon.sh 505 2025-10-29 21:44:51Z nishi $ */ #include unsigned int MwIconSearch[] = { diff --git a/tools/icon.sh b/tools/icon.sh index ae55810d..31a261d9 100755 --- a/tools/icon.sh +++ b/tools/icon.sh @@ -23,14 +23,15 @@ for i in resource/icon/*.png; do OUT=src/icon/$LOWER.c NAME=`echo -n $LOWER | perl -e 'my $l = <>;$l =~ s/^(.)/uc($1)/e;print($l);'` NAME=MwIcon$NAME - WIDTH=`convert $i json:- 2>/dev/null | jq '.[0].image.geometry.width'` - HEIGHT=`convert $i json:- 2>/dev/null | jq '.[0].image.geometry.height'` + GEO=`convert $i json:- 2>/dev/null | jq -r '(.[0].image.geometry.width | tostring) + "x" + (.[0].image.geometry.height | tostring)'` + WIDTH=`echo $GEO | cut -dx -f1` + HEIGHT=`echo $GEO | cut -dx -f2` echo '/* $Id$ */' > $OUT echo '#include ' >> $OUT echo >> $OUT echo "unsigned int $NAME[] = {" >> $OUT echo " ($WIDTH << 16) | $HEIGHT," >> $OUT - convert $i txt:- 2>/dev/null | grep -oE '#[0-9a-fA-F]{8}' | sed 's/#/ 0x/' | sed -E 's/$/,/' >> $OUT + convert $i txt:- 2>/dev/null | grep -oE '[0-9a-fA-F]{8}' | xargs printf ' 0x%s,\n' >> $OUT echo " 0" >> $OUT echo "};" >> $OUT echo $NAME diff --git a/tools/update.sh b/tools/update.sh index 8276c85d..fc3dde02 100755 --- a/tools/update.sh +++ b/tools/update.sh @@ -4,6 +4,5 @@ MAKE=make if which gmake >/dev/null 2>&1; then MAKE=gmake fi -./tools/icon.sh ./tools/genmk.pl $MAKE format