Attachment #13374 for bug #25499

View | Details | Raw Unified | Return to bug 25499
Collapse All | Expand All

Lines 78-83 Link Here

(-)/root/new/sys/conf/options.i386 Fri Feb 23 01:11:16 2001 (+1 lines)
78	SC_KERNEL_CONS_REV_ATTR opt_syscons.h	78	SC_KERNEL_CONS_REV_ATTR opt_syscons.h
79	SC_MOUSE_CHAR opt_syscons.h	79	SC_MOUSE_CHAR opt_syscons.h
80	SC_NO_CUTPASTE opt_syscons.h	80	SC_NO_CUTPASTE opt_syscons.h
		81	SC_KEYBOARD_PASTE opt_syscons.h
81	SC_NO_FONT_LOADING opt_syscons.h	82	SC_NO_FONT_LOADING opt_syscons.h
82	SC_NO_HISTORY opt_syscons.h	83	SC_NO_HISTORY opt_syscons.h
83	SC_NO_SYSMOUSE opt_syscons.h	84	SC_NO_SYSMOUSE opt_syscons.h

Lines 88-93 Link Here

(-)/root/new/sys/dev/syscons/scmouse.c Thu Feb 22 23:47:29 2001 (+12 lines)
88	static void mouse_cut_line(scr_stat *scp);	88	static void mouse_cut_line(scr_stat *scp);
89	static void mouse_cut_extend(scr_stat *scp);	89	static void mouse_cut_extend(scr_stat *scp);
90	static void mouse_paste(scr_stat *scp);	90	static void mouse_paste(scr_stat *scp);
		91	#define SC_KEYBOARD_PASTE
		92	#ifdef SC_KEYBOARD_PASTE
		93	void keyboard_paste(scr_stat *scp);
		94	#endif /* SC_KEYBOARD_PASTE */
91	#endif /* SC_NO_CUTPASTE */	95	#endif /* SC_NO_CUTPASTE */
92		96
93	#ifndef SC_NO_CUTPASTE	97	#ifndef SC_NO_CUTPASTE
Lines 595-600 Link Here
595	if (scp->status & MOUSE_VISIBLE)	599	if (scp->status & MOUSE_VISIBLE)
596	sc_paste(scp, cut_buffer, strlen(cut_buffer));	600	sc_paste(scp, cut_buffer, strlen(cut_buffer));
597	}	601	}
		602
		603	#ifdef SC_KEYBOARD_PASTE
		604	void
		605	keyboard_paste(scr_stat *scp)
		606	{
		607	sc_paste(scp, cut_buffer, strlen(cut_buffer));
		608	}
		609	#endif /* SC_KEYBOARD_PASTE */
598		610
599	#endif /* SC_NO_CUTPASTE */	611	#endif /* SC_NO_CUTPASTE */
600		612




       }
       break;

#ifndef SC_NO_CUTPASTE
       case PASTE:
#ifdef SC_KEYBOARD_PASTE
       /* XXX need to set MOUSE_VISIBLE flag 'cause sc_paste
              will not operate withot it */
       i = scp->status;
       scp->status |= MOUSE_VISIBLE;
       keyboard_paste(scp);
       scp->status = i;
#endif
       return NOKEY;
       #else
       case PASTE:         /* DO NOTHING */
       return NOKEY;
#endif

       /* NON-LOCKING KEYS */
       case NOP:
       case LSH:  case RSH:  case LCTR: case RCTR:

Lines 548-553 Link Here

(-)/root/new/sys/dev/syscons/syscons.h Thu Feb 22 23:47:02 2001 (+6 lines)
548	void sc_remove_cutmarking(scr_stat *scp);	548	void sc_remove_cutmarking(scr_stat *scp);
549	void sc_remove_all_cutmarkings(sc_softc_t *scp);	549	void sc_remove_all_cutmarkings(sc_softc_t *scp);
550	void sc_remove_all_mouse(sc_softc_t *scp);	550	void sc_remove_all_mouse(sc_softc_t *scp);
		551	#ifdef SC_KEYBOARD_PASTE
		552	void keyboard_paste(scr_stat *scp);
		553	#endif /* SC_KEYBOARD_PASTE */
551	#else	554	#else
552	#define sc_draw_mouse_image(scp)	555	#define sc_draw_mouse_image(scp)
553	#define sc_remove_mouse_image(scp)	556	#define sc_remove_mouse_image(scp)
Lines 555-560 Link Here
555	#define sc_remove_cutmarking(scp)	558	#define sc_remove_cutmarking(scp)
556	#define sc_remove_all_cutmarkings(scp)	559	#define sc_remove_all_cutmarkings(scp)
557	#define sc_remove_all_mouse(scp)	560	#define sc_remove_all_mouse(scp)
		561	#ifdef SC_KEYBOARD_PASTE
		562	#define keyboard_paste(scp)
		563	#endif
558	#endif /* SC_NO_CUTPASTE */	564	#endif /* SC_NO_CUTPASTE */
559	#ifndef SC_NO_SYSMOUSE	565	#ifndef SC_NO_SYSMOUSE
560	void sc_mouse_move(scr_stat *scp, int x, int y);	566	void sc_mouse_move(scr_stat *scp, int x, int y);

Lines 173-178 Link Here

(-)/root/new/sys/sys/kbio.h Fri Feb 23 01:14:14 2001 (+2 lines)
173	#define RALTA 0xa0 /* right alt key / alt lock */	173	#define RALTA 0xa0 /* right alt key / alt lock */
174	#define HALT 0xa1 /* halt machine */	174	#define HALT 0xa1 /* halt machine */
175	#define PDWN 0xa2 /* halt machine and power down */	175	#define PDWN 0xa2 /* halt machine and power down */
		176	#define PASTE 0xa3 /* paste from cut-paste buffer */
		177
176		178
177	#define F(x) ((x)+F_FN-1)	179	#define F(x) ((x)+F_FN-1)
178	#define S(x) ((x)+F_SCR-1)	180	#define S(x) ((x)+F_SCR-1)

Lines 202-207 Link Here

(-)/root/new/usr.sbin/kbdcontrol/kbdcontrol.c Thu Feb 22 22:55:29 2001 (+8 lines)
202	return HALT \| 0x100;	202	return HALT \| 0x100;
203	case TPDWN:	203	case TPDWN:
204	return PDWN \| 0x100;	204	return PDWN \| 0x100;
		205	case TPASTE:
		206	return PASTE \| 0x100;
205	case TACC:	207	case TACC:
206	if (ACC(number) > L_ACC)	208	if (ACC(number) > L_ACC)
207	return -1;	209	return -1;
Lines 439-444 Link Here
439	case PDWN \| 0x100:	441	case PDWN \| 0x100:
440	fprintf(fp, " pdwn ");	442	fprintf(fp, " pdwn ");
441	break;	443	break;
		444	case PASTE \| 0x100:
		445	fprintf(fp, " paste ");
		446	break;
442	default:	447	default:
443	if (value & 0x100) {	448	if (value & 0x100) {
444	if (val >= F_FN && val <= L_FN)	449	if (val >= F_FN && val <= L_FN)
Lines 637-642 Link Here
637	break;	642	break;
638	case PDWN:	643	case PDWN:
639	printf(" PDWN, ");	644	printf(" PDWN, ");
		645	break;
		646	case PASTE:
		647	printf("PASTE, ");
640	break;	648	break;
641	default:	649	default:
642	if (value >= F_FN && value <= L_FN)	650	if (value >= F_FN && value <= L_FN)

Lines 63-68 Link Here

(-)/root/new/usr.sbin/kbdcontrol/lex.h Thu Feb 22 22:56:21 2001 (+1 lines)
63	#define TRALTA 288	63	#define TRALTA 288
64	#define THALT 289	64	#define THALT 289
65	#define TPDWN 290	65	#define TPDWN 290
		66	#define TPASTE 291
66		67
67	extern int number;	68	extern int number;
68	extern char letter;	69	extern char letter;

Lines 70-75 Link Here

(-)/root/new/usr.sbin/kbdcontrol/lex.l Thu Feb 22 22:56:03 2001 (-1 / +1 lines)
70	ralta { return TRALTA; }	70	ralta { return TRALTA; }
71	halt { return THALT; }	71	halt { return THALT; }
72	pdwn { return TPDWN; }	72	pdwn { return TPDWN; }
		73	paste { return TPASTE; }
73		74
74	NUL\|nul { number = 0; return TNUM; }	75	NUL\|nul { number = 0; return TNUM; }
75	SOH\|soh { number = 1; return TNUM; }	76	SOH\|soh { number = 1; return TNUM; }
76	-cut here--

Return to bug 25499

Lines 3061-3066 Link Here

(-)/root/new/sys/dev/syscons/syscons.c Fri Feb 23 01:14:49 2001 (+16 lines)
3061	}	3061	}
3062	break;	3062	break;
3063		3063
		3064	#ifndef SC_NO_CUTPASTE
		3065	case PASTE:
		3066	#ifdef SC_KEYBOARD_PASTE
		3067	/* XXX need to set MOUSE_VISIBLE flag 'cause sc_paste
		3068	will not operate withot it */
		3069	i = scp->status;
		3070	scp->status \|= MOUSE_VISIBLE;
		3071	keyboard_paste(scp);
		3072	scp->status = i;
		3073	#endif
		3074	return NOKEY;
		3075	#else
		3076	case PASTE: /* DO NOTHING */
		3077	return NOKEY;
		3078	#endif
		3079
3064	/* NON-LOCKING KEYS */	3080	/* NON-LOCKING KEYS */
3065	case NOP:	3081	case NOP:
3066	case LSH: case RSH: case LCTR: case RCTR:	3082	case LSH: case RSH: case LCTR: case RCTR:

Lines 95-101 Link Here

(-)/root/new/share/syscons/keymaps/ru.koi8-r.kbd Fri Feb 23 00:19:29 2001 (-2 / +2 lines)
95	089 cr cr nl nl 141 141 138 138 O	95	089 cr cr nl nl 141 141 138 138 O
96	090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O	96	090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O
97	091 '/' '/' nop nop 175 175 nop nop O	97	091 '/' '/' nop nop 175 175 nop nop O
98	092 nscr nscr debug debug nop nop nop nop O	98	092 nscr pscr debug debug nop nop nop nop O
99	093 ralt ralt ralt ralt ralt ralt ralt ralt O	99	093 ralt ralt ralt ralt ralt ralt ralt ralt O
100	094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O	100	094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O
101	095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O	101	095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O
Lines 105-111 Link Here
105	099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O	105	099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O
106	100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O	106	100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O
107	101 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 O	107	101 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 O
108	102 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O	108	102 fkey60 paste fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O
109	103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O	109	103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O
110	104 slock saver slock saver susp nop susp nop O	110	104 slock saver slock saver susp nop susp nop O
111	105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O	111	105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O

Lines 95-101 Link Here

(-)/root/new/share/syscons/keymaps/us.pc-ctrl.kbd Fri Feb 23 00:18:16 2001 (-2 / +2 lines)
95	089 cr cr nl nl cr cr nl nl O	95	089 cr cr nl nl cr cr nl nl O
96	090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O	96	090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O
97	091 '/' '/' '/' '/' '/' '/' '/' '/' N	97	091 '/' '/' '/' '/' '/' '/' '/' '/' N
98	092 nscr nscr debug debug nop nop nop nop O	98	092 nscr pscr debug debug nop nop nop nop O
99	093 ralt ralt ralt ralt ralt ralt ralt ralt O	99	093 ralt ralt ralt ralt ralt ralt ralt ralt O
100	094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O	100	094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O
101	095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O	101	095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O
Lines 105-111 Link Here
105	099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O	105	099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O
106	100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O	106	100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O
107	102 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O	107	102 fkey60 paste fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O
108	103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O	108	103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O
109	104 slock saver slock saver susp nop susp nop O	109	104 slock saver slock saver susp nop susp nop O
110	105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O	110	105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O