patch-2.1.109 linux/include/linux/selection.h

Next file: linux/include/linux/soundcard.h
Previous file: linux/include/linux/proc_fs.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.108/linux/include/linux/selection.h linux/include/linux/selection.h
@@ -4,6 +4,11 @@
  * Interface between console.c, tty_io.c, vt.c, vc_screen.c and selection.c
  */
 
+#ifndef _LINUX_SELECTION_H_
+#define _LINUX_SELECTION_H_
+
+#include <linux/vt_buffer.h>
+
 extern int sel_cons;
 
 extern void clear_selection(void);
@@ -21,22 +26,11 @@
 
 extern int console_blanked;
 
-extern unsigned long video_font_height;
-extern unsigned long video_scan_lines;
-extern unsigned long default_font_height;
-extern int video_font_is_default;
-
 extern unsigned char color_table[];
 extern int default_red[];
 extern int default_grn[];
 extern int default_blu[];
 
-extern unsigned short __real_origin;
-extern unsigned short __origin;
-extern unsigned char has_wrapped;
-
-extern unsigned short *vc_scrbuf[MAX_NR_CONSOLES];
-
 extern void do_unblank_screen(void);
 extern unsigned short *screen_pos(int currcons, int w_offset, int viewed);
 extern unsigned short screen_word(int currcons, int offset, int viewed);
@@ -44,48 +38,7 @@
 extern void complement_pos(int currcons, int offset);
 extern void invert_screen(int currcons, int offset, int count, int shift);
 
-#define reverse_video_char(a)	(((a) & 0x88) | ((((a) >> 4) | ((a) << 4)) & 0x77))
-#define reverse_video_short(a)	(((a) & 0x88ff) | \
-	(((a) & 0x7000) >> 4) | (((a) & 0x0700) << 4))
-/* this latter line used to have masks 0xf000 and 0x0f00, but selection
-   requires a self-inverse operation; moreover, the old version looks wrong */
-#define reverse_video_short_mono(a)	((a) ^ 0x800)
-#define complement_video_short(a)	((a) ^ (can_do_color ? 0x7700 : 0x800))
-
 extern void getconsxy(int currcons, char *p);
 extern void putconsxy(int currcons, char *p);
 
-
-/* how to access screen memory */
-
-static inline void scr_writew(unsigned short val, unsigned short *addr)
-{
-	/* simply store the value in the "shadow screen" memory */
-	*addr = val;
-}
-
-static inline unsigned short scr_readw(unsigned short * addr)
-{
-	return *addr;
-}
-
-static inline void memsetw(void * s, unsigned short c, unsigned int count)
-{
-	unsigned short * addr = (unsigned short *) s;
-
-	count /= 2;
-	while (count) {
-		count--;
-		scr_writew(c, addr++);
-	}
-}
-
-static inline void memcpyw(unsigned short *to, unsigned short *from,
-			   unsigned int count)
-{
-	count /= 2;
-	while (count) {
-		count--;
-		scr_writew(scr_readw(from++), to++);
-	}
-}
+#endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov