mirror of
https://github.com/HEYAHONG/PDCurses.git
synced 2025-05-08 21:48:47 +08:00
Renamed files to fit in 8.3, be (slightly) more informative.
This commit is contained in:
parent
f791b1fc8b
commit
07ab134f06
@ -3,7 +3,7 @@
|
||||
based on the pc8x16s.bdf font from the vgafonts.tar.gz package, by
|
||||
"Myrlin". */
|
||||
|
||||
unsigned char deffont[] =
|
||||
unsigned char font437[] =
|
||||
{
|
||||
0x42, 0x4d, 0x3e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
|
||||
0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
|
@ -1,6 +1,6 @@
|
||||
#define little_icon_width 32
|
||||
#define little_icon_height 32
|
||||
static unsigned char little_icon_bits[] = {
|
||||
#define icon32_width 32
|
||||
#define icon32_height 32
|
||||
static unsigned char icon32_bits[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0xfc, 0x30, 0x00, 0x00, 0xfc, 0x31, 0x00, 0x00, 0x8c, 0x33, 0x00,
|
||||
0x00, 0x0c, 0x33, 0x00, 0x00, 0x0c, 0x33, 0x00, 0x00, 0x8c, 0x33, 0x00,
|
@ -1,6 +1,6 @@
|
||||
#define big_icon_width 64
|
||||
#define big_icon_height 64
|
||||
static unsigned char big_icon_bits[] = {
|
||||
#define icon64_width 64
|
||||
#define icon64_height 64
|
||||
static unsigned char icon64_bits[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
@ -1,7 +1,7 @@
|
||||
/* The PDCurses logo as #include'able BMP (from little_icon.xbm),
|
||||
/* The PDCurses logo as #include'able BMP (from icon32.xbm),
|
||||
for use by SDL. */
|
||||
|
||||
unsigned char deficon[] =
|
||||
unsigned char iconbmp[] =
|
||||
{
|
||||
0x42, 0x4d, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
|
||||
0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
|
@ -57,7 +57,7 @@ not relying on correct values for the ACS_* macros.
|
||||
The font can be set via the environment variable PDC_FONT. If it's not
|
||||
set, PDCurses looks for a file named "pdcfont.bmp" in the current
|
||||
directory at the time of initscr(). If neither is found, it uses the
|
||||
built-in default font encoded in deffont.h.
|
||||
built-in default font encoded in font437.h.
|
||||
|
||||
|
||||
### 16-bit mode
|
||||
@ -94,8 +94,8 @@ Icons
|
||||
|
||||
The icon (used with SDL_WM_SetIcon() -- not used for the executable
|
||||
file) can be set via the environment variable PDC_ICON, and falls back
|
||||
to "pdcicon.bmp", and then to the built-in icon from deficon.h. The
|
||||
built-in icon is the PDCurses logo, as seen in ../x11/little_icon.xbm.
|
||||
to "pdcicon.bmp", and then to the built-in icon from iconbmp.h. The
|
||||
built-in icon is the PDCurses logo, as seen in ../common/icon32.xbm.
|
||||
|
||||
If pdc_screen is preinitialized (see below), PDCurses does not attempt
|
||||
to set the icon.
|
||||
|
@ -4,9 +4,9 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#ifndef PDC_WIDE
|
||||
#include "../common/deffont.h"
|
||||
#include "../common/font437.h"
|
||||
#endif
|
||||
#include "../common/deficon.h"
|
||||
#include "../common/iconbmp.h"
|
||||
|
||||
#ifdef PDC_WIDE
|
||||
# ifndef PDC_FONT_PATH
|
||||
@ -190,7 +190,7 @@ int PDC_scr_open(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (!pdc_font)
|
||||
pdc_font = SDL_LoadBMP_RW(SDL_RWFromMem(deffont, sizeof(deffont)), 0);
|
||||
pdc_font = SDL_LoadBMP_RW(SDL_RWFromMem(font437, sizeof(font437)), 0);
|
||||
|
||||
if (!pdc_font)
|
||||
{
|
||||
@ -234,8 +234,8 @@ int PDC_scr_open(int argc, char **argv)
|
||||
pdc_icon = SDL_LoadBMP(iname ? iname : "pdcicon.bmp");
|
||||
|
||||
if (!pdc_icon)
|
||||
pdc_icon = SDL_LoadBMP_RW(SDL_RWFromMem(deficon,
|
||||
sizeof(deficon)), 0);
|
||||
pdc_icon = SDL_LoadBMP_RW(SDL_RWFromMem(iconbmp,
|
||||
sizeof(iconbmp)), 0);
|
||||
|
||||
if (pdc_icon)
|
||||
SDL_WM_SetIcon(pdc_icon, NULL);
|
||||
|
@ -64,7 +64,7 @@ not relying on correct values for the ACS_* macros.
|
||||
The font can be set via the environment variable PDC_FONT. If it's not
|
||||
set, PDCurses looks for a file named "pdcfont.bmp" in the current
|
||||
directory at the time of initscr(). If neither is found, it uses the
|
||||
built-in default font encoded in deffont.h.
|
||||
built-in default font encoded in font437.h.
|
||||
|
||||
|
||||
### 16-bit mode
|
||||
@ -107,8 +107,8 @@ Icons
|
||||
|
||||
The icon (used with SDL_SetWindowIcon() -- not used for the executable
|
||||
file) can be set via the environment variable PDC_ICON, and falls back
|
||||
to "pdcicon.bmp", and then to the built-in icon from deficon.h. The
|
||||
built-in icon is the PDCurses logo, as seen in ../x11/little_icon.xbm.
|
||||
to "pdcicon.bmp", and then to the built-in icon from iconbmp.h. The
|
||||
built-in icon is the PDCurses logo, as seen in ../common/icon32.xbm.
|
||||
|
||||
If pdc_screen is preinitialized (see below), PDCurses does not attempt
|
||||
to set the icon.
|
||||
|
@ -4,9 +4,9 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#ifndef PDC_WIDE
|
||||
# include "../common/deffont.h"
|
||||
# include "../common/font437.h"
|
||||
#endif
|
||||
#include "../common/deficon.h"
|
||||
#include "../common/iconbmp.h"
|
||||
|
||||
#ifdef PDC_WIDE
|
||||
# ifndef PDC_FONT_PATH
|
||||
@ -200,7 +200,7 @@ int PDC_scr_open(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (!pdc_font)
|
||||
pdc_font = SDL_LoadBMP_RW(SDL_RWFromMem(deffont, sizeof(deffont)), 0);
|
||||
pdc_font = SDL_LoadBMP_RW(SDL_RWFromMem(font437, sizeof(font437)), 0);
|
||||
|
||||
if (!pdc_font)
|
||||
{
|
||||
@ -244,8 +244,8 @@ int PDC_scr_open(int argc, char **argv)
|
||||
pdc_icon = SDL_LoadBMP(iname ? iname : "pdcicon.bmp");
|
||||
|
||||
if (!pdc_icon)
|
||||
pdc_icon = SDL_LoadBMP_RW(SDL_RWFromMem(deficon,
|
||||
sizeof(deficon)), 0);
|
||||
pdc_icon = SDL_LoadBMP_RW(SDL_RWFromMem(iconbmp,
|
||||
sizeof(iconbmp)), 0);
|
||||
}
|
||||
|
||||
if (pdc_own_window)
|
||||
|
24
x11/x11.c
24
x11/x11.c
@ -46,8 +46,8 @@ XCursesAppData xc_app_data;
|
||||
|
||||
/* Default icons for XCurses applications. */
|
||||
|
||||
#include "../common/big_icon.xbm"
|
||||
#include "../common/little_icon.xbm"
|
||||
#include "../common/icon64.xbm"
|
||||
#include "../common/icon32.xbm"
|
||||
|
||||
static void _selection_off(void);
|
||||
static void _display_cursor(int, int, int, int);
|
||||
@ -888,25 +888,25 @@ static void _get_icon(void)
|
||||
icon_size[i].width_inc, icon_size[i].height_inc));
|
||||
}
|
||||
|
||||
if (max_width >= big_icon_width && max_height >= big_icon_height)
|
||||
if (max_width >= icon64_width && max_height >= icon64_height)
|
||||
{
|
||||
icon_bitmap_width = big_icon_width;
|
||||
icon_bitmap_height = big_icon_height;
|
||||
bitmap_bits = (unsigned char *)big_icon_bits;
|
||||
icon_bitmap_width = icon64_width;
|
||||
icon_bitmap_height = icon64_height;
|
||||
bitmap_bits = (unsigned char *)icon64_bits;
|
||||
}
|
||||
else
|
||||
{
|
||||
icon_bitmap_width = little_icon_width;
|
||||
icon_bitmap_height = little_icon_height;
|
||||
bitmap_bits = (unsigned char *)little_icon_bits;
|
||||
icon_bitmap_width = icon32_width;
|
||||
icon_bitmap_height = icon32_height;
|
||||
bitmap_bits = (unsigned char *)icon32_bits;
|
||||
}
|
||||
|
||||
}
|
||||
else /* use small icon */
|
||||
{
|
||||
icon_bitmap_width = little_icon_width;
|
||||
icon_bitmap_height = little_icon_height;
|
||||
bitmap_bits = (unsigned char *)little_icon_bits;
|
||||
icon_bitmap_width = icon32_width;
|
||||
icon_bitmap_height = icon32_height;
|
||||
bitmap_bits = (unsigned char *)icon32_bits;
|
||||
}
|
||||
|
||||
XFree(icon_size);
|
||||
|
Loading…
x
Reference in New Issue
Block a user