diff options
| author | Geoff Voelker <voelker@cs.washington.edu> | 1996-01-25 03:13:39 +0000 |
|---|---|---|
| committer | Geoff Voelker <voelker@cs.washington.edu> | 1996-01-25 03:13:39 +0000 |
| commit | 3c190163d271e86a274d97c20bd6e6f88b18a08a (patch) | |
| tree | 512e1e9e3be5a8a3f2490e9c9e2fd5f043c1e195 /src/w32term.h | |
| parent | dd118a073d7800973c5a7e3e74e541c6dc626392 (diff) | |
| download | emacs-3c190163d271e86a274d97c20bd6e6f88b18a08a.tar.gz emacs-3c190163d271e86a274d97c20bd6e6f88b18a08a.tar.bz2 emacs-3c190163d271e86a274d97c20bd6e6f88b18a08a.zip | |
backout 1996-01-21T00:22:24Z!voelker@cs.washington.edu
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 52 |
1 files changed, 6 insertions, 46 deletions
diff --git a/src/w32term.h b/src/w32term.h index 7bf953fd036..a5301896541 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -75,23 +75,6 @@ struct win32_bitmap_record /* Record some info about this pixmap. */ int height, width, depth; }; - -/* Palette book-keeping stuff for mapping requested colors into the - system palette. Keep a ref-counted list of requested colors and - regenerate the app palette whenever the requested list changes. */ - -extern Lisp_Object Vwin32_enable_palette; - -struct win32_palette_entry { - struct win32_palette_entry * next; - PALETTEENTRY entry; -#if 0 - unsigned refcount; -#endif -}; - -extern void win32_regenerate_palette(struct frame *f); - /* For each display (currently only one on win32), we have a structure that records information about it. */ @@ -119,15 +102,6 @@ struct win32_display_info /* The cursor to use for vertical scroll bars. */ Cursor vertical_scroll_bar_cursor; - /* color palette information */ - int has_palette; - struct win32_palette_entry * p_colors_in_use; - unsigned n_colors_in_use; - HPALETTE h_palette; - - /* deferred action flags checked when starting frame update */ - int regen_palette; - /* A table of all the fonts we have already loaded. */ struct font_info *font_table; @@ -213,9 +187,6 @@ extern struct win32_display_info *win32_term_init (); struct win32_output { - /* Original palette (used to deselect real palette after drawing) */ - HPALETTE h_old_palette; - /* Position of the Win32 window (x and y offsets in root window). */ int left_pos; int top_pos; @@ -577,6 +548,10 @@ win32_fill_area (f,hdc,f->output_data.win32->background_pixel,x,y,nx,ny) extern XFontStruct *win32_load_font (); extern void win32_unload_font (); +extern HDC map_mode(); + +#define my_get_dc(hwnd) (map_mode (GetDC (hwnd))) + #define WM_EMACS_START (WM_USER + 1) #define WM_EMACS_KILL (WM_EMACS_START + 0x00) #define WM_EMACS_CREATEWINDOW (WM_EMACS_START + 0x01) @@ -603,26 +578,11 @@ typedef struct Win32Msg { RECT rect; } Win32Msg; -/* Identifiers for array of critical sections; we need one for - serializing access to hand-crafter message queue, and another - for preventing palette changes during GDI calls. */ -enum win32_critical_section { - CRIT_MSG, /* message queue */ - CRIT_GDI, /* GDI calls */ - CRIT_TOTAL /* num of critical sections */ -}; - -extern CRITICAL_SECTION critsect[CRIT_TOTAL]; - extern void init_crit (); +extern void enter_crit (); +extern void leave_crit (); extern void delete_crit (); -#define enter_crit(index) EnterCriticalSection (&critsect[index]) -#define leave_crit(index) LeaveCriticalSection (&critsect[index]) - -extern HDC GetFrameDC (struct frame * f); -extern int ReleaseFrameDC (struct frame * f, HDC hDC); - extern BOOL get_next_msg (); extern BOOL post_msg (); extern void wait_for_sync (); |