summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/mupdf_icon_antialias.icobin0 -> 15086 bytes
-rw-r--r--apps/mupdf_icon_bitmap.icobin0 -> 15598 bytes
-rw-r--r--apps/win_icon_app.icobin25214 -> 0 bytes
-rw-r--r--apps/win_icon_doc.icobin2238 -> 0 bytes
-rw-r--r--apps/win_res.rc3
-rw-r--r--apps/x11_icon.xbm29
-rw-r--r--apps/x11_main.c31
-rw-r--r--debian/mupdf.install1
-rw-r--r--debian/mupdf.pngbin0 -> 2885 bytes
-rw-r--r--debian/mupdf.xpm328
10 files changed, 65 insertions, 327 deletions
diff --git a/apps/mupdf_icon_antialias.ico b/apps/mupdf_icon_antialias.ico
new file mode 100644
index 00000000..1397f441
--- /dev/null
+++ b/apps/mupdf_icon_antialias.ico
Binary files differ
diff --git a/apps/mupdf_icon_bitmap.ico b/apps/mupdf_icon_bitmap.ico
new file mode 100644
index 00000000..d1b0dc9c
--- /dev/null
+++ b/apps/mupdf_icon_bitmap.ico
Binary files differ
diff --git a/apps/win_icon_app.ico b/apps/win_icon_app.ico
deleted file mode 100644
index d8b41fe2..00000000
--- a/apps/win_icon_app.ico
+++ /dev/null
Binary files differ
diff --git a/apps/win_icon_doc.ico b/apps/win_icon_doc.ico
deleted file mode 100644
index ecf22c4b..00000000
--- a/apps/win_icon_doc.ico
+++ /dev/null
Binary files differ
diff --git a/apps/win_res.rc b/apps/win_res.rc
index a77efb3c..71cb57f8 100644
--- a/apps/win_res.rc
+++ b/apps/win_res.rc
@@ -1,5 +1,4 @@
-IDI_ICONAPP ICON "win_icon_app.ico"
-IDI_ICONDOC ICON "win_icon_doc.ico"
+IDI_ICONAPP ICON "mupdf_icon_antialias.ico"
IDD_DLOGPASS DIALOG 50, 50, 204, 60
//STYLE DS_MODALFRAME | WS_POPUP
diff --git a/apps/x11_icon.xbm b/apps/x11_icon.xbm
deleted file mode 100644
index 85014e43..00000000
--- a/apps/x11_icon.xbm
+++ /dev/null
@@ -1,29 +0,0 @@
-#define gs_l_xbm_width 48
-#define gs_l_xbm_height 48
-#define gs_l_xbm_x_hot 0
-#define gs_l_xbm_y_hot 0
-static unsigned char gs_l_xbm_bits[] = {
- 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0xa0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00,
- 0x00, 0x00, 0x00, 0x3e, 0x03, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x07, 0x00,
- 0x00, 0xe0, 0xff, 0x0f, 0x07, 0x00, 0x00, 0xf8, 0xff, 0x81, 0x07, 0x00,
- 0x00, 0xfc, 0x1f, 0xc0, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0xf0, 0x1f, 0x00,
- 0x00, 0xff, 0x01, 0xf8, 0x1f, 0x00, 0x00, 0xff, 0x41, 0xfc, 0x3f, 0x00,
- 0x80, 0xff, 0xc8, 0xfc, 0x3f, 0x00, 0x80, 0xff, 0xd8, 0xf8, 0x3f, 0x00,
- 0x80, 0xff, 0x98, 0xf0, 0x3f, 0x00, 0x80, 0xff, 0x10, 0xe0, 0x3f, 0x00,
- 0x00, 0xff, 0x01, 0xc0, 0x3f, 0x00, 0x00, 0xff, 0x81, 0x81, 0x1f, 0x00,
- 0x00, 0xfe, 0x83, 0x83, 0x1f, 0x00, 0x00, 0xfc, 0x0f, 0x83, 0x0f, 0x00,
- 0x00, 0xf8, 0x1f, 0xc3, 0x03, 0x00, 0x00, 0xe0, 0x1f, 0xe0, 0x01, 0x00,
- 0x00, 0xf0, 0x1f, 0x38, 0x00, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0x00,
- 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00,
- 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0x00, 0x00,
- 0xc0, 0xff, 0xff, 0xff, 0x01, 0x00, 0xc0, 0xff, 0xff, 0xff, 0x0f, 0x00,
- 0x80, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x00,
- 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0xfc, 0xff, 0xff, 0xff, 0x03,
- 0x00, 0xc0, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x03,
- 0xc0, 0x3f, 0x00, 0x00, 0xff, 0x03, 0xe0, 0x0f, 0x00, 0x00, 0xfe, 0x03,
- 0xf0, 0x07, 0xfc, 0x00, 0xfc, 0x01, 0xf0, 0x07, 0x0e, 0x00, 0xff, 0x04,
- 0xf0, 0x07, 0x7e, 0xe0, 0x7f, 0x02, 0xf0, 0x0f, 0xfc, 0xff, 0x1f, 0x01,
- 0xe0, 0x1f, 0xf0, 0xff, 0xc3, 0x00, 0xc0, 0xff, 0x00, 0x00, 0x78, 0x00,
- 0x80, 0xff, 0x0f, 0xf8, 0x3f, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x07, 0x00,
- 0x00, 0xe0, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/apps/x11_main.c b/apps/x11_main.c
index 1ca6449e..2a9fd096 100644
--- a/apps/x11_main.c
+++ b/apps/x11_main.c
@@ -2,8 +2,6 @@
#include "mupdf.h"
#include "pdfapp.h"
-#include "x11_icon.xbm"
-
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
@@ -14,6 +12,20 @@
#include <sys/types.h>
#include <unistd.h>
+#define mupdf_icon_bitmap_16_width 16
+#define mupdf_icon_bitmap_16_height 16
+static unsigned char mupdf_icon_bitmap_16_bits[] = {
+ 0x00, 0x00, 0x00, 0x1e, 0x00, 0x2b, 0x80, 0x55, 0x8c, 0x62, 0x8c, 0x51,
+ 0x9c, 0x61, 0x1c, 0x35, 0x3c, 0x1f, 0x3c, 0x0f, 0xfc, 0x0f, 0xec, 0x0d,
+ 0xec, 0x0d, 0xcc, 0x0c, 0xcc, 0x0c, 0x00, 0x00 };
+
+#define mupdf_icon_bitmap_16_mask_width 16
+#define mupdf_icon_bitmap_16_mask_height 16
+static unsigned char mupdf_icon_bitmap_16_mask_bits[] = {
+ 0x00, 0x1e, 0x00, 0x3f, 0x80, 0x7f, 0xce, 0xff, 0xde, 0xff, 0xde, 0xff,
+ 0xfe, 0xff, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
+ 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xce, 0x1c };
+
#ifndef timeradd
#define timeradd(a, b, result) \
do { \
@@ -55,7 +67,7 @@ static Atom WM_DELETE_WINDOW;
static int x11fd;
static int xscr;
static Window xwin;
-static Pixmap xicon;
+static Pixmap xicon, xmask;
static GC xgc;
static XEvent xevt;
static int mapped = 0;
@@ -159,12 +171,19 @@ static void winopen(void)
wmhints = XAllocWMHints();
if (wmhints)
{
- wmhints->flags = IconPixmapHint;
+ wmhints->flags = IconPixmapHint | IconMaskHint;
xicon = XCreateBitmapFromData(xdpy, xwin,
- (char *) gs_l_xbm_bits, gs_l_xbm_width, gs_l_xbm_height);
- if (xicon)
+ (char*)mupdf_icon_bitmap_16_bits,
+ mupdf_icon_bitmap_16_width,
+ mupdf_icon_bitmap_16_height);
+ xmask = XCreateBitmapFromData(xdpy, xwin,
+ (char*)mupdf_icon_bitmap_16_mask_bits,
+ mupdf_icon_bitmap_16_mask_width,
+ mupdf_icon_bitmap_16_mask_height);
+ if (xicon && xmask)
{
wmhints->icon_pixmap = xicon;
+ wmhints->icon_mask = xmask;
XSetWMHints(xdpy, xwin, wmhints);
}
XFree(wmhints);
diff --git a/debian/mupdf.install b/debian/mupdf.install
index 15006a12..024f9f6a 100644
--- a/debian/mupdf.install
+++ b/debian/mupdf.install
@@ -1,4 +1,5 @@
debian/mupdf.xpm usr/share/pixmaps
+debian/mupdf.png usr/share/pixmaps
debian/mupdf.desktop usr/share/applications
debian/mupdf.applications usr/share/application-registry
debian/tmp/usr/bin/mupdf
diff --git a/debian/mupdf.png b/debian/mupdf.png
new file mode 100644
index 00000000..a46cec99
--- /dev/null
+++ b/debian/mupdf.png
Binary files differ
diff --git a/debian/mupdf.xpm b/debian/mupdf.xpm
index f1663519..899a644b 100644
--- a/debian/mupdf.xpm
+++ b/debian/mupdf.xpm
@@ -1,291 +1,39 @@
/* XPM */
-static char * mupdf_xpm[] = {
-"32 32 256 2",
-" c None",
-". c #FFFFFF",
-"+ c #EFEFEF",
-"@ c #F7F7F7",
-"# c #E7E7E7",
-"$ c #C6C6C6",
-"% c #9C9C9C",
-"& c #7B7B7B",
-"* c #636363",
-"= c #424242",
-"- c #212121",
-"; c #292929",
-"> c #4A4A4A",
-", c #737373",
-"' c #8C8C8C",
-") c #B5B5B5",
-"! c #BDBDBD",
-"~ c #181818",
-"{ c #393939",
-"] c #D6D6D6",
-"^ c #DEDEDE",
-"/ c #6B6B6B",
-"( c #313131",
-"_ c #A5A5A5",
-": c #ADADAD",
-"< c #CECECE",
-"[ c #848484",
-"} c #5A5A5A",
-"| c #525252",
-"1 c #949494",
-"2 c #E7EFF7",
-"3 c #D6DEEF",
-"4 c #7394BD",
-"5 c #185294",
-"6 c #94B5CE",
-"7 c #5A84B5",
-"8 c #185A94",
-"9 c #29639C",
-"0 c #295A9C",
-"a c #215A94",
-"b c #3973A5",
-"c c #C6D6E7",
-"d c #638CB5",
-"e c #8CA5C6",
-"f c #527BAD",
-"g c #EFF7F7",
-"h c #8CADC6",
-"i c #84A5C6",
-"j c #7B9CC6",
-"k c #4273AD",
-"l c #BDCEDE",
-"m c #7BA5C6",
-"n c #00000E",
-"o c #0600E7",
-"p c #DEE08F",
-"q c #B717FF",
-"r c #FF00F2",
-"s c #E71612",
-"t c #020004",
-"u c #477261",
-"v c #685820",
-"w c #696577",
-"x c #72202D",
-"y c #643A5C",
-"z c #736963",
-"A c #6E5C67",
-"B c #6F7374",
-"C c #342E67",
-"D c #66001F",
-"E c #E71608",
-"F c #D4109F",
-"G c #000000",
-"H c #020001",
-"I c #020001",
-"J c #000000",
-"K c #FFFF01",
-"L c #000000",
-"M c #000000",
-"N c #02006B",
-"O c #CC0402",
-"P c #640BA0",
-"Q c #020032",
-"R c #FFFF32",
-"S c #0000A8",
-"T c #E71600",
-"U c #010000",
-"V c #00002C",
-"W c #20E0A0",
-"X c #020000",
-"Y c #42E047",
-"Z c #CC0402",
-"` c #010001",
-" . c #EF1608",
-".. c #9F1701",
-"+. c #020048",
-"@. c #6A0BDF",
-"#. c #884F00",
-"$. c #0100E7",
-"%. c #010070",
-"&. c #F927A7",
-"*. c #000000",
-"=. c #000000",
-"-. c #0000A8",
-";. c #1F32A8",
-">. c #010002",
-",. c #A71747",
-"'. c #0000A0",
-"). c #000094",
-"!. c #020044",
-"~. c #AF8100",
-"{. c #AE81DC",
-"]. c #FBC328",
-"^. c #F7BF38",
-"/. c #598100",
-"(. c #00007D",
-"_. c #F7BF7E",
-":. c #AF177E",
-"<. c #AF1740",
-"[. c #0001EF",
-"}. c #FCE0F2",
-"|. c #0000F2",
-"1. c #0200EF",
-"2. c #160217",
-"3. c #010002",
-"4. c #BEE06A",
-"5. c #DF1788",
-"6. c #00C101",
-"7. c #EF1CB8",
-"8. c #DCE05C",
-"9. c #171D00",
-"0. c #B80D00",
-"a. c #060007",
-"b. c #400C06",
-"c. c #146BF2",
-"d. c #940601",
-"e. c #400CEE",
-"f. c #CE0300",
-"g. c #0000B8",
-"h. c #0600EF",
-"i. c #F20514",
-"j. c #0CE174",
-"k. c #CF1700",
-"l. c #0000B8",
-"m. c #0600E7",
-"n. c #686914",
-"o. c #0000F2",
-"p. c #020047",
-"q. c #00001E",
-"r. c #1C39CF",
-"s. c #000000",
-"t. c #B80D06",
-"u. c #949E01",
-"v. c #4CE119",
-"w. c #CF1709",
-"x. c #949E02",
-"y. c #EF3694",
-"z. c #020014",
-"A. c #000000",
-"B. c #00203C",
-"C. c #F98100",
-"D. c #F98121",
-"E. c #21C787",
-"F. c #146B94",
-"G. c #000027",
-"H. c #DF351F",
-"I. c #00001F",
-"J. c #67E1AA",
-"K. c #3737EF",
-"L. c #DF353E",
-"M. c #3737BF",
-"N. c #A9E152",
-"O. c #A73542",
-"P. c #146B94",
-"Q. c #B80D14",
-"R. c #000094",
-"S. c #0200BF",
-"T. c #42E2B6",
-"U. c #37378E",
-"V. c #A7356E",
-"W. c #0000BF",
-"X. c #949E00",
-"Y. c #0200FA",
-"Z. c #CF1761",
-"`. c #000035",
-" + c #E73501",
-".+ c #0000EA",
-"++ c #BF34BD",
-"@+ c #4812E7",
-"#+ c #02E9EF",
-"$+ c #146B94",
-"%+ c #000000",
-"&+ c #BF3401",
-"*+ c #8E15E7",
-"=+ c #A208F7",
-"-+ c #0C0000",
-";+ c #EAE2EF",
-">+ c #146B94",
-",+ c #0C0000",
-"'+ c #02E9EF",
-")+ c #000000",
-"!+ c #0C0000",
-"~+ c #02E9EF",
-"{+ c #000000",
-"]+ c #41351F",
-"^+ c #0C0084",
-"/+ c #000040",
-"(+ c #0200AF",
-"_+ c #1EE205",
-":+ c #BF3414",
-"<+ c #949E2C",
-"[+ c #2116E7",
-"}+ c #16E2EF",
-"|+ c #21C787",
-"1+ c #146B94",
-"2+ c #000027",
-"3+ c #DF351F",
-"4+ c #00001F",
-"5+ c #33E2AA",
-"6+ c #3737EF",
-"7+ c #DF353E",
-"8+ c #3737BF",
-"9+ c #67E243",
-"0+ c #E735C6",
-"a+ c #000000",
-"b+ c #146B94",
-"c+ c #C6E412",
-"d+ c #281847",
-"e+ c #BE1935",
-"f+ c #4720AF",
-"g+ c #1F041F",
-"h+ c #DE1300",
-"i+ c #0C0100",
-"j+ c #80E200",
-"k+ c #76E2FB",
-"l+ c #000014",
-"m+ c #22E8E0",
-"n+ c #DF3517",
-"o+ c #000017",
-"p+ c #8FE234",
-"q+ c #8737E8",
-"r+ c #DF3556",
-"s+ c #146B22",
-"t+ c #000017",
-"u+ c #5611DF",
-"v+ c #BBE2A3",
-"w+ c #873714",
-"x+ c #22E88B",
-"y+ c #873704",
-"z+ c #0000DF",
-"A+ c #E023DF",
-"B+ c #000097",
-"C+ c #D20497",
-"D+ c #000200",
-"E+ c #D20422",
-"F+ c #E023DF",
-"G+ c #171900",
-" @ # > + ",
-" - . ~ . ",
-" . . @ + ^ ! ! % { - . | , ",
-" . [ - - - - - - - ~ ' . . ; - ",
-" . [ - - - - - - ; % @ . . . % - ; . ",
-" . > - - - - - % . . . . . . > - - - > . ",
-" _ - - - - ~ @ . . . . . @ ~ - - - - - [ ",
-" . ~ - - - - < . g @ l j . & - - - - - - - . ",
-" . - - - - - @ . 7 2 l m . # - - - - - - - . ",
-" . - - - - - + . 2 a . g . . $ - - - - - - . ",
-" . ~ - - - - | . . . . . . . . + ~ - - - ( . ",
-" ] - - - - - % . . . b a . . . ! - - - @ ",
-" _ - - - - - = . . . 8 . . . ] - - ^ ",
-" . ( - - - - ~ . . 3 . . @ ~ { . ",
-" . # | - - - - - . . . + * 1 . . ",
-" ] - - - - > % # . . . . . . . ",
-" ! - - - - ' . . . . . . . . ",
-" . ~ - - - - - ; [ < # + @ . . . . . ",
-" . - - - - - - - - - - - - - ~ ~ ~ - } ] . ",
-" . ~ - - - - - - - - - - - - - - - - - - - = . ",
-" $ - - - - - - - - - - - - - - - - - - - - - $ ",
-" + = - - - - - - - - - - - - - - - - - - - - # ",
-" . . . $ ' } | | ( ; ; ~ ~ - - - - - - - - > . ",
-" . $ | = { , . . . . . . . . . . . # } - - - - - { . ",
-" . ; - - - < . . . . : / : @ . . . . . . > - - - - ' . ",
-" . - - - ; . . . . | ( . . . . . . . . @ ~ - - - - . . ",
-" . - - - - . . . . 1 - ~ / % $ ) _ / ; - - - - { . [ ",
-" . ; - - - ( . . . . # > ~ - - - - - - ~ ; ' @ $ > . ",
-" . ; - - - - ( ! @ . . . . . . . . . @ ! > ~ : . ",
-" . ^ ( - - - - - - ~ ~ - - ~ ~ ~ - - - _ . ",
-" . # % * = - ; - - - ; > ' # . . ",
-" "};
+static char * mupdf_icon_bitmap_32_xpm[] = {
+"32 32 4 1",
+" c None",
+". c #FFFFFF",
+"+ c #000000",
+"@ c #2572AC",
+" ",
+" ...... ",
+" ..++++++.. ",
+" .++++++++++. ",
+" .++++@@@@++++. ",
+" .+++@@@@@@@@+++. ",
+" .++@@@......@++. ",
+" ..... .+++@@@.....@@+++.",
+" .++++. .++@@@.....@@@@++.",
+" .++++. .++@@@.....@@@@++.",
+" .+++++. .++@@......@@@@++.",
+" .+++++. .++@@......@@@@++.",
+" .++++++. .+++...@...@@@+++.",
+" .++++++. .++...@...@@@++. ",
+" .+++++++. .+++.@@...@@+++. ",
+" .+++++++. .++++@...++++. ",
+" .++++++++. ..++++++++++. ",
+" .++++++++. .+..++++++.. ",
+" .++++.++++. .+++....... ",
+" .++++.++++. .++++.++++. ",
+" .++++..++++. .++++..+.++. ",
+" .++++..++++. .++++....... ",
+" .++++. .++++.++++. .+.++. ",
+" .++++. .++++.++++. .+.++. ",
+" .++++. .+++++++. .+.++. ",
+" .++++. .+++++++. .+.++. ",
+" .++++. .+++++. .+.++. ",
+" .++++. .+++++. .+.++. ",
+" .++++. .+++. .+.++. ",
+" .++++. .+++. .++++. ",
+" ...... ... ...... ",
+" "};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:23:48 +0000