[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.392 by root, Sat Jan 12 22:13:46 2008 UTC vs.
Revision 1.427 by root, Wed Nov 5 15:44:04 2008 UTC

…		…
279	}	279	}
280		280
281	iso14755buf = 0;	281	iso14755buf = 0;
282	}	282	}
283		283
284	int	284	static int
285	rxvt_term::hex_keyval (XKeyEvent &ev)	285	hex_keyval (XKeyEvent &ev)
286	{	286	{
287	// check wether this event corresponds to a hex digit	287	// check wether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	288	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	289	for (int index = 0; index < 8; index++)
290	{	290	{
…		…
298		298
299	return -1;	299	return -1;
300	}	300	}
301	#endif	301	#endif
302		302
		303	static inline KeySym
		304	translate_keypad (KeySym keysym, bool kp)
		305	{
		306	#ifdef XK_KP_Home
		307	static const KeySym keypadtrans[] = {
		308	XK_KP_7, // XK_KP_Home
		309	XK_KP_4, // XK_KP_Left
		310	XK_KP_8, // XK_KP_Up
		311	XK_KP_6, // XK_KP_Right
		312	XK_KP_2, // XK_KP_Down
		313	# ifndef UNSHIFTED_SCROLLKEYS
		314	XK_KP_9, // XK_KP_Prior
		315	XK_KP_3, // XK_KP_Next
		316	# else
		317	XK_Prior,
		318	XK_Next,
		319	# endif
		320	XK_KP_1, // XK_KP_End
		321	XK_KP_5, // XK_KP_Begin
		322	};
		323
		324	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		325	{
		326	unsigned int index = keysym - XK_KP_Home;
		327	keysym = kp ? keypadtrans[index] : XK_Home + index;
		328	}
		329	else if (keysym == XK_KP_Insert)
		330	keysym = kp ? XK_KP_0 : XK_Insert;
		331	# ifndef NO_DELETE_KEY
		332	else if (keysym == XK_KP_Delete)
		333	keysym = kp ? XK_KP_Decimal : XK_Delete;
		334	# endif
		335	#endif
		336	return keysym;
		337	}
		338
		339	static inline int
		340	map_function_key (KeySym keysym)
		341	{
		342	int param = 0;
		343
		344	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		345	{
		346	param = 11 + keysym - XK_F1;
		347	if (keysym >= XK_F17)
		348	param += 4;
		349	else if (keysym >= XK_F15)
		350	param += 3;
		351	else if (keysym >= XK_F11)
		352	param += 2;
		353	else if (keysym >= XK_F6)
		354	param += 1;
		355	}
		356	else
		357	switch (keysym)
		358	{
		359	case XK_Find:
		360	param = 1;
		361	break;
		362	case XK_Insert:
		363	param = 2;
		364	break;
		365	#ifdef DXK_Remove
		366	case DXK_Remove:
		367	#endif
		368	case XK_Execute:
		369	param = 3;
		370	break;
		371	case XK_Select:
		372	param = 4;
		373	break;
		374	#ifndef UNSHIFTED_SCROLLKEYS
		375	case XK_Prior:
		376	param = 5;
		377	break;
		378	case XK_Next:
		379	param = 6;
		380	break;
		381	case XK_Home:
		382	param = 7;
		383	break;
		384	case XK_End:
		385	param = 8;
		386	break;
		387	#endif
		388	case XK_Help:
		389	param = 28;
		390	break;
		391	case XK_Menu:
		392	param = 29;
		393	break;
		394	}
		395	return param;
		396	}
		397
303	void	398	void
304	rxvt_term::key_press (XKeyEvent &ev)	399	rxvt_term::key_press (XKeyEvent &ev)
305	{	400	{
306	int ctrl, meta, shft, len;	401	int ctrl, meta, shft, len;
307	unsigned int newlen;
308	KeySym keysym;	402	KeySym keysym;
309	int valid_keysym;	403	int valid_keysym;
310	char kbuf[KBUFSZ];	404	char kbuf[KBUFSZ];
311		405
312	#if ISO_14755	406	#if ISO_14755
…		…
325	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
326		420
327	if (numlock_state \|\| (ev.state & ModNumLockMask))	421	if (numlock_state \|\| (ev.state & ModNumLockMask))
328	{	422	{
329	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
330	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
331	}	425	}
332		426
333	kbuf[0] = 0;	427	kbuf[0] = 0;
334		428
335	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
547	}	641	}
548	#endif	642	#endif
549		643
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	645	{
		646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		647	unsigned int newlen = 1;
		648
		649	switch (translate_keypad (keysym, kp))
552	{	650	{
553	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	651	#ifndef NO_BACKSPACE_KEY
554	newlen = 1;	652	case XK_BackSpace:
555	#ifdef XK_KP_Home	653	if (priv_modes & PrivMode_HaveBackSpace)
556	static const KeySym keypadtrans[] = {	654	{
557	XK_KP_7, // XK_KP_Home	655	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558	XK_KP_4, // XK_KP_Left	656	^ !!ctrl) ? '\b' : '\177';
559	XK_KP_8, // XK_KP_Up	657	kbuf[1] = '\0';
560	XK_KP_6, // XK_KP_Right
561	XK_KP_2, // XK_KP_Down
562	#ifndef UNSHIFTED_SCROLLKEYS
563	XK_KP_9, // XK_KP_Prior
564	XK_KP_3, // XK_KP_Next
565	#else
566	XK_Prior,
567	XK_Next,
568	#endif
569	XK_KP_1, // XK_KP_End
570	XK_KP_5, // XK_KP_Begin
571	};	658	}
		659	else
		660	strcpy (kbuf, rs[Rs_backspace_key]);
		661	break;
		662	#endif
		663	#ifndef NO_DELETE_KEY
		664	case XK_Delete:
		665	strcpy (kbuf, rs[Rs_delete_key]);
		666	break;
		667	#endif
		668	case XK_Tab:
		669	if (shft)
		670	strcpy (kbuf, "\033[Z");
		671	else
		672	{
		673	#ifdef CTRL_TAB_MAKES_META
		674	if (ctrl)
		675	meta = 1;
		676	#endif
		677	#ifdef MOD4_TAB_MAKES_META
		678	if (ev.state & Mod4Mask)
		679	meta = 1;
		680	#endif
		681	newlen = 0;
		682	}
		683	break;
572		684
573	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	685	case XK_Up: /* "\033[A" */
		686	case XK_Down: /* "\033[B" */
		687	case XK_Right: /* "\033[C" */
		688	case XK_Left: /* "\033[D" */
		689	strcpy (kbuf, "\033[Z");
		690	kbuf[2] = "DACB"[keysym - XK_Left];
		691	/* do Shift first */
		692	if (shft)
		693	kbuf[2] = "dacb"[keysym - XK_Left];
		694	else if (ctrl)
		695	{
		696	kbuf[1] = 'O';
		697	kbuf[2] = "dacb"[keysym - XK_Left];
		698	}
		699	else if (priv_modes & PrivMode_aplCUR)
		700	kbuf[1] = 'O';
		701	break;
		702
		703	case XK_KP_Enter:
		704	/* allow shift to override */
		705	if (kp)
		706	{
		707	strcpy (kbuf, "\033OM");
		708	break;
		709	}
		710
		711	/* FALLTHROUGH */
		712
		713	case XK_Return:
		714	if (priv_modes & PrivMode_LFNL)
		715	{
		716	kbuf[0] = '\015';
		717	kbuf[1] = '\012';
		718	kbuf[2] = '\0';
		719	}
		720	else
		721	{
		722	kbuf[0] = '\015';
		723	kbuf[1] = '\0';
		724	}
		725	break;
		726
		727	case XK_KP_F1: /* "\033OP" */
		728	case XK_KP_F2: /* "\033OQ" */
		729	case XK_KP_F3: /* "\033OR" */
		730	case XK_KP_F4: /* "\033OS" */
		731	strcpy (kbuf, "\033OP");
		732	kbuf[2] += (keysym - XK_KP_F1);
		733	break;
		734
		735	case XK_KP_Multiply: /* "\033Oj" : "" /
		736	case XK_KP_Add: /* "\033Ok" : "+" */
		737	case XK_KP_Separator: /* "\033Ol" : "," */
		738	case XK_KP_Subtract: /* "\033Om" : "-" */
		739	case XK_KP_Decimal: /* "\033On" : "." */
		740	case XK_KP_Divide: /* "\033Oo" : "/" */
		741	case XK_KP_0: /* "\033Op" : "0" */
		742	case XK_KP_1: /* "\033Oq" : "1" */
		743	case XK_KP_2: /* "\033Or" : "2" */
		744	case XK_KP_3: /* "\033Os" : "3" */
		745	case XK_KP_4: /* "\033Ot" : "4" */
		746	case XK_KP_5: /* "\033Ou" : "5" */
		747	case XK_KP_6: /* "\033Ov" : "6" */
		748	case XK_KP_7: /* "\033Ow" : "7" */
		749	case XK_KP_8: /* "\033Ox" : "8" */
		750	case XK_KP_9: /* "\033Oy" : "9" */
		751	/* allow shift to override */
		752	if (kp)
		753	{
		754	strcpy (kbuf, "\033Oj");
		755	kbuf[2] += (keysym - XK_KP_Multiply);
		756	}
		757	else
		758	{
		759	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		760	kbuf[1] = '\0';
		761	}
		762	break;
		763
		764	default:
574	{	765	{
575	unsigned int index = keysym - XK_KP_Home;	766	int param = map_function_key (keysym);
576	keysym = kp ? keypadtrans[index] : XK_Home + index;	767	if (param > 0)
		768	sprintf (kbuf,"\033[%d~", param);
		769	else
		770	newlen = 0;
577	}	771	}
578	else if (keysym == XK_KP_Insert)
579	keysym = kp ? XK_KP_0 : XK_Insert;
580	#ifndef NO_DELETE_KEY
581	else if (keysym == XK_KP_Delete)
582	keysym = kp ? XK_KP_Decimal : XK_Delete;
583	#endif
584	#endif
585	switch (keysym)
586	{
587	#ifndef NO_BACKSPACE_KEY
588	case XK_BackSpace:
589	if (priv_modes & PrivMode_HaveBackSpace)
590	{
591	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592	^ !!ctrl) ? '\b' : '\177';
593	kbuf[1] = '\0';
594	}
595	else
596	strcpy (kbuf, rs[Rs_backspace_key]);
597	break;	772	break;
598	#endif
599	#ifndef NO_DELETE_KEY
600	case XK_Delete:
601	strcpy (kbuf, rs[Rs_delete_key]);
602	break;
603	#endif
604	case XK_Tab:
605	if (shft)
606	strcpy (kbuf, "\033[Z");
607	else
608	{
609	#ifdef CTRL_TAB_MAKES_META
610	if (ctrl)
611	meta = 1;
612	#endif
613	#ifdef MOD4_TAB_MAKES_META
614	if (ev.state & Mod4Mask)
615	meta = 1;
616	#endif
617	newlen = 0;
618	}
619	break;
620
621	case XK_Up: /* "\033[A" */
622	case XK_Down: /* "\033[B" */
623	case XK_Right: /* "\033[C" */
624	case XK_Left: /* "\033[D" */
625	strcpy (kbuf, "\033[Z");
626	kbuf[2] = "DACB"[keysym - XK_Left];
627	/* do Shift first */
628	if (shft)
629	kbuf[2] = "dacb"[keysym - XK_Left];
630	else if (ctrl)
631	{
632	kbuf[1] = 'O';
633	kbuf[2] = "dacb"[keysym - XK_Left];
634	}
635	else if (priv_modes & PrivMode_aplCUR)
636	kbuf[1] = 'O';
637	break;
638
639	#ifndef UNSHIFTED_SCROLLKEYS
640	case XK_Prior:
641	strcpy (kbuf, "\033[5~");
642	break;
643	case XK_Next:
644	strcpy (kbuf, "\033[6~");
645	break;
646	#endif
647	case XK_KP_Enter:
648	/* allow shift to override */
649	if (kp)
650	{
651	strcpy (kbuf, "\033OM");
652	break;
653	}
654
655	/* FALLTHROUGH */
656
657	case XK_Return:
658	if (priv_modes & PrivMode_LFNL)
659	{
660	kbuf[0] = '\015';
661	kbuf[1] = '\012';
662	kbuf[2] = '\0';
663	}
664	else
665	{
666	kbuf[0] = '\015';
667	kbuf[1] = '\0';
668	}
669	break;
670
671	case XK_KP_F1: /* "\033OP" */
672	case XK_KP_F2: /* "\033OQ" */
673	case XK_KP_F3: /* "\033OR" */
674	case XK_KP_F4: /* "\033OS" */
675	strcpy (kbuf, "\033OP");
676	kbuf[2] += (keysym - XK_KP_F1);
677	break;
678
679	case XK_KP_Multiply: /* "\033Oj" : "" /
680	case XK_KP_Add: /* "\033Ok" : "+" */
681	case XK_KP_Separator: /* "\033Ol" : "," */
682	case XK_KP_Subtract: /* "\033Om" : "-" */
683	case XK_KP_Decimal: /* "\033On" : "." */
684	case XK_KP_Divide: /* "\033Oo" : "/" */
685	case XK_KP_0: /* "\033Op" : "0" */
686	case XK_KP_1: /* "\033Oq" : "1" */
687	case XK_KP_2: /* "\033Or" : "2" */
688	case XK_KP_3: /* "\033Os" : "3" */
689	case XK_KP_4: /* "\033Ot" : "4" */
690	case XK_KP_5: /* "\033Ou" : "5" */
691	case XK_KP_6: /* "\033Ov" : "6" */
692	case XK_KP_7: /* "\033Ow" : "7" */
693	case XK_KP_8: /* "\033Ox" : "8" */
694	case XK_KP_9: /* "\033Oy" : "9" */
695	/* allow shift to override */
696	if (kp)
697	{
698	strcpy (kbuf, "\033Oj");
699	kbuf[2] += (keysym - XK_KP_Multiply);
700	}
701	else
702	{
703	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704	kbuf[1] = '\0';
705	}
706	break;
707
708	case XK_Find:
709	strcpy (kbuf, "\033[1~");
710	break;
711
712	case XK_Insert:
713	strcpy (kbuf, "\033[2~");
714	break;
715	#ifdef DXK_Remove /* support for DEC remove like key */
716	case DXK_Remove:
717	/* FALLTHROUGH */
718	#endif
719	case XK_Execute:
720	strcpy (kbuf, "\033[3~");
721	break;
722	case XK_Select:
723	strcpy (kbuf, "\033[4~");
724	break;
725	case XK_End:
726	strcpy (kbuf, KS_END);
727	break;
728	case XK_Home:
729	strcpy (kbuf, KS_HOME);
730	break;
731
732	#define FKEY(n, fkey) \
733	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735	case XK_F1: /* "\033[11~" */
736	case XK_F2: /* "\033[12~" */
737	case XK_F3: /* "\033[13~" */
738	case XK_F4: /* "\033[14~" */
739	case XK_F5: /* "\033[15~" */
740	FKEY (11, XK_F1);
741	break;
742	case XK_F6: /* "\033[17~" */
743	case XK_F7: /* "\033[18~" */
744	case XK_F8: /* "\033[19~" */
745	case XK_F9: /* "\033[20~" */
746	case XK_F10: /* "\033[21~" */
747	FKEY (17, XK_F6);
748	break;
749	case XK_F11: /* "\033[23~" */
750	case XK_F12: /* "\033[24~" */
751	case XK_F13: /* "\033[25~" */
752	case XK_F14: /* "\033[26~" */
753	FKEY (23, XK_F11);
754	break;
755	case XK_F15: /* "\033[28~" */
756	case XK_F16: /* "\033[29~" */
757	FKEY (28, XK_F15);
758	break;
759	case XK_Help: /* "\033[28~" */
760	FKEY (28, XK_Help);
761	break;
762	case XK_Menu: /* "\033[29~" */
763	FKEY (29, XK_Menu);
764	break;
765	case XK_F17: /* "\033[31~" */
766	case XK_F18: /* "\033[32~" */
767	case XK_F19: /* "\033[33~" */
768	case XK_F20: /* "\033[34~" */
769	case XK_F21: /* "\033[35~" */
770	case XK_F22: /* "\033[36~" */
771	case XK_F23: /* "\033[37~" */
772	case XK_F24: /* "\033[38~" */
773	case XK_F25: /* "\033[39~" */
774	case XK_F26: /* "\033[40~" */
775	case XK_F27: /* "\033[41~" */
776	case XK_F28: /* "\033[42~" */
777	case XK_F29: /* "\033[43~" */
778	case XK_F30: /* "\033[44~" */
779	case XK_F31: /* "\033[45~" */
780	case XK_F32: /* "\033[46~" */
781	case XK_F33: /* "\033[47~" */
782	case XK_F34: /* "\033[48~" */
783	case XK_F35: /* "\033[49~" */
784	FKEY (31, XK_F17);
785	break;
786	#undef FKEY
787	default:
788	newlen = 0;
789	break;
790	}
791
792	if (newlen)
793	len = strlen (kbuf);
794	}	773	}
		774
		775	if (newlen)
		776	len = strlen (kbuf);
795		777
796	/*	778	/*
797	* Pass meta for all function keys, if 'meta' option set	779	* Pass meta for all function keys, if 'meta' option set
798	*/	780	*/
799	#ifdef META8_OPTION	781	#ifdef META8_OPTION
…		…
1033	}	1015	}
1034	while (row < end_row);	1016	while (row < end_row);
1035	}	1017	}
1036		1018
1037	scr_refresh ();	1019	scr_refresh ();
1038	scrollbar_show (1);	1020	scrollBar.show (1);
1039	#ifdef USE_XIM	1021	#ifdef USE_XIM
1040	IMSendSpot ();	1022	IMSendSpot ();
1041	#endif	1023	#endif
1042	}	1024	}
1043		1025
…		…
1090		1072
1091	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1073	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092	void	1074	void
1093	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1075	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094	{	1076	{
1095	if ((scrollbar_isUp () \|\| scrollbar_isDn ())	1077	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1096	&& scr_page (scrollbar_isUp () ? UP : DN, 1))	1078	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097	{	1079	{
1098	want_refresh = 1;	1080	want_refresh = 1;
1099	refresh_check ();	1081	refresh_check ();
1100	}	1082	}
1101	else	1083	else
…		…
1145	{	1127	{
1146	// this should really be sched_yield(), but the linux guys thought	1128	// this should really be sched_yield(), but the linux guys thought
1147	// that giving a process calling sched_yield () less cpu time than	1129	// that giving a process calling sched_yield () less cpu time than
1148	// ones with high nice levels is a useful thing to do. It surely is is	1130	// ones with high nice levels is a useful thing to do. It surely is is
1149	// allowed by the sus... as is returning ENOSYS.	1131	// allowed by the sus... as is returning ENOSYS.
		1132	// since the linux guys additionally thought that breaking the only
		1133	// known workaroudn against their unusable sched_yield hack is cool,
		1134	// we just nanosleep a bit and hope for the best.
1150		1135
1151	struct timespec ts = { 0, 0 };	1136	struct timespec ts = { 0, 1000 };
1152	nanosleep (&ts, 0);	1137	nanosleep (&ts, 0);
1153		1138
1154	w.stop ();	1139	w.stop ();
1155	}	1140	}
1156		1141
…		…
1206	{	1191	{
1207	make_current ();	1192	make_current ();
1208		1193
1209	if (revents & ev::READ)	1194	if (revents & ev::READ)
1210	// loop, but don't allow a single term to monopolize us	1195	// loop, but don't allow a single term to monopolize us
1211	while (pty_fill ())	1196	for (int i = CBUFCNT; i-- && pty_fill (); )
1212	if (cmd_parse ())	1197	cmd_parse ();
1213	break;
1214		1198
1215	if (revents & ev::WRITE)	1199	if (revents & ev::WRITE)
1216	pty_write ();	1200	pty_write ();
1217		1201
1218	refresh_check ();	1202	refresh_check ();
…		…
1438	&& ev.xfocus.mode != NotifyGrab)	1422	&& ev.xfocus.mode != NotifyGrab)
1439	focus_out ();	1423	focus_out ();
1440	break;	1424	break;
1441		1425
1442	case ConfigureNotify:	1426	case ConfigureNotify:
1443	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1427	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1428	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445	szHint.width, szHint.height); */	1429	szHint.width, szHint.height);*/
1446	if (ev.xconfigure.window == parent[0])	1430	if (ev.xconfigure.window == parent[0])
1447	{	1431	{
1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1432	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449	;	1433	;
1450		1434
…		…
1455	}	1439	}
1456	else	1440	else
1457	{	1441	{
1458	#ifdef HAVE_BG_PIXMAP	1442	#ifdef HAVE_BG_PIXMAP
1459	if (bgPixmap.window_position_sensitive ())	1443	if (bgPixmap.window_position_sensitive ())
		1444	{
		1445	if (mapped)
1460	update_background ();	1446	update_background ();
		1447	else
		1448	bgPixmap.invalidate ();
		1449	}
1461	#endif	1450	#endif
1462	}	1451	}
1463		1452
1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1453	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465	}	1454	}
…		…
1485	case SelectionRequest:	1474	case SelectionRequest:
1486	selection_send (ev.xselectionrequest);	1475	selection_send (ev.xselectionrequest);
1487	break;	1476	break;
1488		1477
1489	case MapNotify:	1478	case MapNotify:
		1479	#ifdef HAVE_BG_PIXMAP
		1480	/* This is needed spcifically to fix the case of no window manager or a
		1481	* non-reparenting window manager. In those cases we never get first
		1482	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1483	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1484	* reparenting.
		1485	* We should not render background immidiately, as there could be several
		1486	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1487	* by scheduling background redraw as soon as we can, but giving a short
		1488	* bit of time for ConfigureNotifies to arrive.
		1489	* We should render background PRIOR to drawing any text, but AFTER all
		1490	* of ConfigureNotifys for the best results.
		1491	*/
		1492	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1493	update_background_ev.start (0.025);
		1494	#endif
1490	mapped = 1;	1495	mapped = 1;
1491	#ifdef TEXT_BLINK	1496	#ifdef TEXT_BLINK
1492	text_blink_ev.start ();	1497	text_blink_ev.start ();
1493	#endif	1498	#endif
1494	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1499	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
…		…
1532	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1537	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1533	;	1538	;
1534		1539
1535	if (scrollBar.state && ev.xany.window == scrollBar.win)	1540	if (scrollBar.state && ev.xany.window == scrollBar.win)
1536	{	1541	{
1537	scrollBar.setIdle ();	1542	scrollBar.state = STATE_IDLE;
1538	scrollbar_show (0);	1543	scrollBar.show (0);
1539	}	1544	}
1540	}	1545	}
1541	break;	1546	break;
1542		1547
1543	case MotionNotify:	1548	case MotionNotify:
…		…
1630	#ifdef MOUSE_THRESHOLD	1635	#ifdef MOUSE_THRESHOLD
1631	}	1636	}
1632	#endif	1637	#endif
1633	}	1638	}
1634	}	1639	}
1635	else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)	1640	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1636	{	1641	{
1637	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1642	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1638	MotionNotify, &ev))	1643	MotionNotify, &ev))
1639	;	1644	;
1640		1645
…		…
1642	&unused_root, &unused_child,	1647	&unused_root, &unused_child,
1643	&unused_root_x, &unused_root_y,	1648	&unused_root_x, &unused_root_y,
1644	&ev.xbutton.x, &ev.xbutton.y,	1649	&ev.xbutton.x, &ev.xbutton.y,
1645	&unused_mask);	1650	&unused_mask);
1646	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1647	scrollbar_size ());	1652	scrollBar.size ());
1648	want_refresh = 1;	1653	want_refresh = 1;
1649	scrollbar_show (1);	1654	scrollBar.show (1);
1650	}	1655	}
1651	break;	1656	break;
1652	}	1657	}
1653		1658
1654	#if defined(CURSOR_BLINK)	1659	#if defined(CURSOR_BLINK)
…		…
1680		1685
1681	refresh_check ();	1686	refresh_check ();
1682	}	1687	}
1683		1688
1684	void	1689	void
		1690	rxvt_term::set_urgency (bool enable)
		1691	{
		1692	if (enable == urgency_hint)
		1693	return;
		1694
		1695	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1696	{
		1697	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1698	XSetWMHints (dpy, parent[0], h);
		1699	urgency_hint = enable;
		1700	}
		1701	}
		1702
		1703	void
1685	rxvt_term::focus_in ()	1704	rxvt_term::focus_in ()
1686	{	1705	{
1687	if (!focus)	1706	if (!focus)
1688	{	1707	{
1689	focus = 1;	1708	focus = 1;
1690	want_refresh = 1;	1709	want_refresh = 1;
1691
1692	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1693		1710
1694	#if USE_XIM	1711	#if USE_XIM
1695	if (Input_Context != NULL)	1712	if (Input_Context != NULL)
1696	{	1713	{
1697	IMSetPosition ();	1714	IMSetPosition ();
…		…
1709	scr_recolour ();	1726	scr_recolour ();
1710	}	1727	}
1711	#endif	1728	#endif
1712	#if ENABLE_FRILLS	1729	#if ENABLE_FRILLS
1713	if (option (Opt_urgentOnBell))	1730	if (option (Opt_urgentOnBell))
1714	{	1731	set_urgency (0);
1715	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1716	{
1717	h->flags &= ~XUrgencyHint;
1718	XSetWMHints (dpy, parent[0], h);
1719	}
1720	}
1721	#endif	1732	#endif
		1733
		1734	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722	}	1735	}
1723	}	1736	}
1724		1737
1725	void	1738	void
1726	rxvt_term::focus_out ()	1739	rxvt_term::focus_out ()
…		…
1728	if (focus)	1741	if (focus)
1729	{	1742	{
1730	focus = 0;	1743	focus = 0;
1731	want_refresh = 1;	1744	want_refresh = 1;
1732		1745
1733	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1746	#if ENABLE_FRILLS
1734		1747	if (option (Opt_urgentOnBell))
		1748	set_urgency (0);
		1749	#endif
1735	#if ENABLE_FRILLS \|\| ISO_14755	1750	#if ENABLE_FRILLS \|\| ISO_14755
1736	if (iso14755buf)	1751	if (iso14755buf)
1737	{	1752	{
1738	iso14755buf = 0;	1753	iso14755buf = 0;
1739	# if ISO_14755	1754	# if ISO_14755
…		…
1756	{	1771	{
1757	pix_colors = pix_colors_unfocused;	1772	pix_colors = pix_colors_unfocused;
1758	scr_recolour ();	1773	scr_recolour ();
1759	}	1774	}
1760	#endif	1775	#endif
		1776
		1777	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761	}	1778	}
1762	}	1779	}
1763		1780
1764	void	1781	void
1765	rxvt_term::update_fade_color (unsigned int idx)	1782	rxvt_term::update_fade_color (unsigned int idx)
…		…
1926	/*	1943	/*
1927	* Scrollbar window processing of button press	1944	* Scrollbar window processing of button press
1928	*/	1945	*/
1929	if (scrollBar.state && ev.window == scrollBar.win)	1946	if (scrollBar.state && ev.window == scrollBar.win)
1930	{	1947	{
1931	scrollBar.setIdle ();	1948	page_dirn direction = NO_DIR;
		1949
		1950	if (scrollBar.upButton (ev.y))
		1951	direction = UP; /* up */
		1952	else if (scrollBar.dnButton (ev.y))
		1953	direction = DN; /* down */
		1954
		1955	scrollBar.state = STATE_IDLE;
1932	/*	1956	/*
1933	* Rxvt-style scrollbar:	1957	* Rxvt-style scrollbar:
1934	* move up if mouse is above slider	1958	* move up if mouse is above slider
1935	* move dn if mouse is below slider	1959	* move dn if mouse is below slider
1936	*	1960	*
…		…
1945	/*	1969	/*
1946	* Mouse report disabled scrollbar:	1970	* Mouse report disabled scrollbar:
1947	* arrow buttons - send up/down	1971	* arrow buttons - send up/down
1948	* click on scrollbar - send pageup/down	1972	* click on scrollbar - send pageup/down
1949	*/	1973	*/
1950	if ((scrollBar.style == R_SB_NEXT	1974	if (direction == UP)
1951	&& scrollbarnext_upButton (ev.y))
1952	\|\| (scrollBar.style == R_SB_RXVT
1953	&& scrollbarrxvt_upButton (ev.y)))
1954	tt_printf ("\033[A");	1975	tt_printf ("\033[A");
1955	else if ((scrollBar.style == R_SB_NEXT	1976	else if (direction == DN)
1956	&& scrollbarnext_dnButton (ev.y))
1957	\|\| (scrollBar.style == R_SB_RXVT
1958	&& scrollbarrxvt_dnButton (ev.y)))
1959	tt_printf ("\033[B");	1977	tt_printf ("\033[B");
1960	else	1978	else
1961	switch (ev.button)	1979	switch (ev.button)
1962	{	1980	{
1963	case Button2:	1981	case Button2:
…		…
1971	break;	1989	break;
1972	}	1990	}
1973	}	1991	}
1974	else	1992	else
1975	#endif /* NO_SCROLLBAR_REPORT */	1993	#endif /* NO_SCROLLBAR_REPORT */
1976
1977	{
1978	char upordown = 0;
1979
1980	if (scrollBar.style == R_SB_NEXT)
1981	{	1994	{
1982	if (scrollbarnext_upButton (ev.y))	1995	if (direction != NO_DIR)
1983	upordown = -1; /* up */
1984	else if (scrollbarnext_dnButton (ev.y))
1985	upordown = 1; /* down */
1986	}
1987	else if (scrollBar.style == R_SB_RXVT)
1988	{
1989	if (scrollbarrxvt_upButton (ev.y))
1990	upordown = -1; /* up */
1991	else if (scrollbarrxvt_dnButton (ev.y))
1992	upordown = 1; /* down */
1993	}
1994
1995	if (upordown)
1996	{	1996	{
1997	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1997	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998	if (!cont_scroll_ev.is_active ())	1998	if (!cont_scroll_ev.is_active ())
1999	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	1999	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000	#endif	2000	#endif
2001	if (scr_page (upordown < 0 ? UP : DN, 1))	2001	if (scr_page (direction, 1))
2002	{	2002	{
2003	if (upordown < 0)	2003	if (direction == UP)
2004	scrollBar.setUp ();	2004	scrollBar.state = STATE_UP;
2005	else	2005	else
2006	scrollBar.setDn ();	2006	scrollBar.state = STATE_DOWN;
2007	}	2007	}
2008	}	2008	}
2009	else	2009	else
2010	switch (ev.button)	2010	switch (ev.button)
2011	{	2011	{
…		…
2024	}	2024	}
2025		2025
2026	if (scrollBar.style == R_SB_XTERM	2026	if (scrollBar.style == R_SB_XTERM
2027	\|\| scrollbar_above_slider (ev.y)	2027	\|\| scrollbar_above_slider (ev.y)
2028	\|\| scrollbar_below_slider (ev.y))	2028	\|\| scrollbar_below_slider (ev.y))
2029	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2029	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2030		2030
2031	scrollBar.setMotion ();	2031	scrollBar.state = STATE_MOTION;
2032	break;	2032	break;
2033		2033
2034	case Button1:	2034	case Button1:
2035	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2035	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2036	csrO = ev.y - scrollBar.top;	2036	csrO = ev.y - scrollBar.top;
…		…
2050	scr_page (DN, nrow - 1);	2050	scr_page (DN, nrow - 1);
2051	# else	2051	# else
2052	scr_page (DN, nrow / 4);	2052	scr_page (DN, nrow / 4);
2053	# endif	2053	# endif
2054	else	2054	else
2055	scrollBar.setMotion ();	2055	scrollBar.state = STATE_MOTION;
2056	}	2056	}
2057	else	2057	else
2058	{	2058	{
2059	scr_page ((ev.button == Button1 ? DN : UP),	2059	scr_page ((ev.button == Button1 ? DN : UP),
2060	(nrow	2060	(nrow
2061	* scrollbar_position (ev.y)	2061	* scrollbar_position (ev.y)
2062	/ scrollbar_size ()));	2062	/ scrollBar.size ()));
2063	}	2063	}
2064		2064
2065	break;	2065	break;
2066	}	2066	}
2067	}	2067	}
…		…
2077		2077
2078	csrO = 0; /* reset csr Offset */	2078	csrO = 0; /* reset csr Offset */
2079	if (!bypass_keystate)	2079	if (!bypass_keystate)
2080	reportmode = !! (priv_modes & PrivMode_mouse_report);	2080	reportmode = !! (priv_modes & PrivMode_mouse_report);
2081		2081
2082	if (scrollbar_isUpDn ())	2082	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2083	{	2083	{
2084	scrollBar.setIdle ();	2084	scrollBar.state = STATE_IDLE;
2085	scrollbar_show (0);	2085	scrollBar.show (0);
2086	}	2086	}
2087		2087
2088	#ifdef SELECTION_SCROLLING	2088	#ifdef SELECTION_SCROLLING
2089	sel_scroll_ev.stop();	2089	sel_scroll_ev.stop();
2090	#endif	2090	#endif
…		…
2173	}	2173	}
2174	else	2174	else
2175	# endif	2175	# endif
2176	{	2176	{
2177	scr_page (v, i);	2177	scr_page (v, i);
2178	scrollbar_show (1);	2178	scrollBar.show (1);
2179	}	2179	}
2180	}	2180	}
2181	break;	2181	break;
2182	#endif	2182	#endif
2183	}	2183	}
2184	}	2184	}
2185	}	2185	}
2186		2186
2187	/}}} /	2187	/}}} /
2188		2188
2189	bool	2189	void
2190	rxvt_term::cmd_parse ()	2190	rxvt_term::cmd_parse ()
2191	{	2191	{
2192	bool flag = false;
2193	wchar_t ch = NOCHAR;	2192	wchar_t ch = NOCHAR;
2194	char *seq_begin; // remember start of esc-sequence here	2193	char *seq_begin; // remember start of esc-sequence here
2195		2194
2196	for (;;)	2195	for (;;)
2197	{	2196	{
2198	if (ch == NOCHAR)	2197	if (expect_false (ch == NOCHAR))
2199	{	2198	{
2200	seq_begin = cmdbuf_ptr;	2199	seq_begin = cmdbuf_ptr;
2201	ch = next_char ();	2200	ch = next_char ();
2202		2201
2203	if (ch == NOCHAR)	2202	if (ch == NOCHAR)
2204	break;	2203	break;
2205	}	2204	}
2206		2205
2207	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2206	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2208	{	2207	{
2209	if (!seen_input)	2208	if (expect_false (!seen_input))
2210	{	2209	{
2211	seen_input = 1;	2210	seen_input = 1;
2212	// many badly-written programs (e.g. jed) contain a race condition:	2211	// many badly-written programs (e.g. jed) contain a race condition:
2213	// they first read the screensize and then install a SIGWINCH handler.	2212	// they first read the screensize and then install a SIGWINCH handler.
2214	// some window managers resize the window early, and these programs	2213	// some window managers resize the window early, and these programs
…		…
2227	wchar_t *str = buf;	2226	wchar_t *str = buf;
2228	wchar_t *eol = str + min (ncol, UBUFSIZ);	2227	wchar_t *eol = str + min (ncol, UBUFSIZ);
2229		2228
2230	for (;;)	2229	for (;;)
2231	{	2230	{
2232	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2231	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2233	break;	2232	break;
2234		2233
2235	*str++ = ch;	2234	*str++ = ch;
2236		2235
2237	if (ch == C0_LF \|\| str >= eol)	2236	if (expect_false (ch == C0_LF \|\| str >= eol))
2238	{	2237	{
2239	if (ch == C0_LF)	2238	if (ch == C0_LF)
2240	nlines++;	2239	nlines++;
2241		2240
2242	refresh_count++;	2241	refresh_count++;
…		…
2291	* What the heck we'll cheat and only refresh less than every page-full.	2290	* What the heck we'll cheat and only refresh less than every page-full.
2292	* if skipScroll is enabled.	2291	* if skipScroll is enabled.
2293	*/	2292	*/
2294	if (refreshnow)	2293	if (refreshnow)
2295	{	2294	{
2296	flag = true;
2297	scr_refresh ();	2295	scr_refresh ();
2298	want_refresh = 1;	2296	want_refresh = 1;
2299	}	2297	}
2300
2301	}	2298	}
2302	else	2299	else
2303	{	2300	{
2304	try	2301	try
2305	{	2302	{
…		…
2313	}	2310	}
2314		2311
2315	ch = NOCHAR;	2312	ch = NOCHAR;
2316	}	2313	}
2317	}	2314	}
2318
2319	return flag;
2320	}	2315	}
2321		2316
2322	// read the next character	2317	// read the next character
2323	wchar_t	2318	wchar_t
2324	rxvt_term::next_char () NOTHROW	2319	rxvt_term::next_char () NOTHROW
2325	{	2320	{
2326	while (cmdbuf_ptr < cmdbuf_endp)	2321	while (cmdbuf_ptr < cmdbuf_endp)
2327	{	2322	{
2328	// assume 7-bit to be ascii ALWAYS	2323	// assume 7-bit to be ascii ALWAYS
2329	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2324	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2330	return *cmdbuf_ptr++;	2325	return *cmdbuf_ptr++;
2331		2326
2332	wchar_t wc;	2327	wchar_t wc;
2333	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2328	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2334		2329
…		…
2338	cmdbuf_ptr = cmdbuf_endp;	2333	cmdbuf_ptr = cmdbuf_endp;
2339	break;	2334	break;
2340	}	2335	}
2341		2336
2342	if (len == (size_t)-1)	2337	if (len == (size_t)-1)
		2338	{
		2339	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2343	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2340	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2341	}
2344		2342
2345	// assume wchar == unicode	2343	// assume wchar == unicode
2346	cmdbuf_ptr += len;	2344	cmdbuf_ptr += len;
2347	return wc & UNICODE_MASK;	2345	return wc & UNICODE_MASK;
2348	}	2346	}
…		…
2392	/----------------------------------------------------------------------/	2390	/----------------------------------------------------------------------/
2393	#ifdef PRINTPIPE	2391	#ifdef PRINTPIPE
2394	FILE *	2392	FILE *
2395	rxvt_term::popen_printer ()	2393	rxvt_term::popen_printer ()
2396	{	2394	{
2397	FILE *stream = popen (rs[Rs_print_pipe], "w");	2395	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2398		2396
2399	if (stream == NULL)	2397	if (stream == NULL)
2400	rxvt_warn ("can't open printer pipe, not printing.\n");	2398	rxvt_warn ("can't open printer pipe, not printing.\n");
2401		2399
2402	return stream;	2400	return stream;
…		…
2413	* simulate attached vt100 printer	2411	* simulate attached vt100 printer
2414	*/	2412	*/
2415	void	2413	void
2416	rxvt_term::process_print_pipe ()	2414	rxvt_term::process_print_pipe ()
2417	{	2415	{
2418	int done;	2416	FILE *fd = popen_printer ();
2419	FILE *fd;
2420		2417
2421	if ((fd = popen_printer ()) == NULL)	2418	if (!fd)
2422	return;	2419	return;
2423		2420
2424	/*	2421	/*
2425	* Send all input to the printer until either ESC[4i or ESC[?4i	2422	* Send all input to the printer until either ESC[4i or ESC[?4i
2426	* is received.	2423	* is received.
2427	*/	2424	*/
2428	for (done = 0; !done;)	2425	for (int done = 0; !done; )
2429	{	2426	{
2430	unsigned char buf[8];	2427	unsigned char buf[8];
2431	unicode_t ch;	2428	unicode_t ch;
2432	unsigned int i, len;	2429	unsigned int i, len;
2433		2430
…		…
2578	break;	2575	break;
2579	case 'Z': /* identify the terminal type */	2576	case 'Z': /* identify the terminal type */
2580	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2577	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581	break;	2578	break;
2582	case '<': /* turn off VT52 mode */	2579	case '<': /* turn off VT52 mode */
2583	PrivMode (0, PrivMode_vt52);	2580	set_privmode (PrivMode_vt52, 0);
2584	break;	2581	break;
2585	case 'F': /* use special graphics character set */	2582	case 'F': /* use special graphics character set */
2586	case 'G': /* use regular character set */	2583	case 'G': /* use regular character set */
2587	/* unimplemented */	2584	/* unimplemented */
2588	break;	2585	break;
…		…
2642	scr_forwardindex ();	2639	scr_forwardindex ();
2643	break;	2640	break;
2644	#endif	2641	#endif
2645	case '=':	2642	case '=':
2646	case '>':	2643	case '>':
2647	PrivMode ((ch == '='), PrivMode_aplKP);	2644	set_privmode (PrivMode_aplKP, ch == '=');
2648	break;	2645	break;
2649		2646
2650	case C1_40:	2647	case C1_40:
2651	cmd_getc ();	2648	cmd_getc ();
2652	break;	2649	break;
…		…
2691	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2688	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692	case C1_SCI: /* ESC Z */	2689	case C1_SCI: /* ESC Z */
2693	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2690	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694	break; /* steal obsolete ESC [ c */	2691	break; /* steal obsolete ESC [ c */
2695		2692
2696	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2693	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697	case C1_CSI: /* ESC [ */	2694	case C1_CSI: /* ESC [ */
2698	process_csi_seq ();	2695	process_csi_seq ();
2699	break;	2696	break;
2700		2697
2701	/* 8.3.90: OPERATING SYSTEM COMMAND */	2698	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702	case C1_OSC: /* ESC ] */	2699	case C1_OSC: /* ESC ] */
2703	process_osc_seq ();	2700	process_osc_seq ();
2704	break;	2701	break;
2705		2702
2706	/* 8.3.106: RESET TO INITIAL STATE */	2703	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707	case 'c':	2704	case 'c':
2708	mbstate.reset ();	2705	mbstate.reset ();
2709	scr_poweron ();	2706	scr_poweron ();
2710	scrollbar_show (1);	2707	scrollBar.show (1);
2711	break;	2708	break;
2712		2709
2713	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2710	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2714	case 'n':	2711	case 'n':
2715	scr_charset_choose (2);	2712	scr_charset_choose (2);
…		…
2766		2763
2767	nargs = 0;	2764	nargs = 0;
2768		2765
2769	priv = 0;	2766	priv = 0;
2770	ch = cmd_getc ();	2767	ch = cmd_getc ();
2771	if (ch >= '<' && ch <= '?')	2768	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2772	{	2769	{
2773	/* '<' '=' '>' '?' */	2770	/* '<' '=' '>' '?' '!' */
2774	priv = ch;	2771	priv = ch;
2775	ch = cmd_getc ();	2772	ch = cmd_getc ();
2776	}	2773	}
2777		2774
2778	/* read any numerical arguments */	2775	/* read any numerical arguments */
…		…
2827	// versions.	2824	// versions.
2828	//	2825	//
2829	tt_printf ("\033[>%d;95;0c", 'U');	2826	tt_printf ("\033[>%d;95;0c", 'U');
2830	}	2827	}
2831	break;	2828	break;
		2829
2832	case '?':	2830	case '?':
2833	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2831	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2834	process_terminal_mode (ch, priv, nargs, arg);	2832	process_terminal_mode (ch, priv, nargs, arg);
2835	break;	2833	break;
		2834
		2835	case '!':
		2836	if (ch == CSI_70)
		2837	{
		2838	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2839	scr_soft_reset ();
		2840
		2841	static const int pm_h[] = { 7, 25 };
		2842	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2843
		2844	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2845	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2836	}	2846	}
		2847	break;
		2848	}
		2849
2837	return;	2850	return;
2838	}	2851	}
2839		2852
2840	switch (ch)	2853	switch (ch)
2841	{	2854	{
…		…
3352	*buf++ = '\0';	3365	*buf++ = '\0';
3353		3366
3354	process_color_seq (op, color, name, resp);	3367	process_color_seq (op, color, name, resp);
3355	}	3368	}
3356	break;	3369	break;
		3370	case Rxvt_restoreFG:
3357	case XTerm_Color00:	3371	case XTerm_Color00:
3358	process_color_seq (op, Color_fg, str, resp);	3372	process_color_seq (op, Color_fg, str, resp);
3359	break;	3373	break;
		3374	case Rxvt_restoreBG:
3360	case XTerm_Color01:	3375	case XTerm_Color01:
3361	process_color_seq (op, Color_bg, str, resp);	3376	process_color_seq (op, Color_bg, str, resp);
3362	break;	3377	break;
3363	#ifndef NO_CURSORCOLOR	3378	#ifndef NO_CURSORCOLOR
3364	case XTerm_Color_cursor:	3379	case XTerm_Color_cursor:
…		…
3385	break;	3400	break;
3386	case URxvt_Color_IT:	3401	case URxvt_Color_IT:
3387	process_color_seq (op, Color_IT, str, resp);	3402	process_color_seq (op, Color_IT, str, resp);
3388	break;	3403	break;
3389	#endif	3404	#endif
		3405	case URxvt_Color_border:
		3406	process_color_seq (op, Color_border, str, resp);
		3407	break;
3390	#if ENABLE_TRANSPARENCY	3408	#if ENABLE_TRANSPARENCY
3391	case URxvt_Color_tint:	3409	case URxvt_Color_tint:
3392	process_color_seq (op, Color_tint, str, resp);	3410	process_color_seq (op, Color_tint, str, resp);
3393	{	3411	{
3394	bool changed = false;	3412	bool changed = false;
…		…
3443	update_background ();	3461	update_background ();
3444	}	3462	}
3445	break;	3463	break;
3446	#endif	3464	#endif
3447		3465
3448	case Rxvt_restoreFG:
3449	set_window_color (Color_fg, str);
3450	break;
3451	case Rxvt_restoreBG:
3452	set_window_color (Color_bg, str);
3453	break;
3454
3455	case XTerm_logfile:	3466	case XTerm_logfile:
3456	// TODO, when secure mode?	3467	// TODO, when secure mode?
3457	break;	3468	break;
3458		3469
3459	#if 0	3470	#if 0
…		…
3525	break;	3536	break;
3526	#endif	3537	#endif
3527		3538
3528	#if ENABLE_PERL	3539	#if ENABLE_PERL
3529	case URxvt_perl:	3540	case URxvt_perl:
3530	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3541	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3531	; // no responses yet
3532	break;	3542	break;
3533	#endif	3543	#endif
3534	}	3544	}
3535	}	3545	}
3536	/----------------------------------------------------------------------/	3546	/----------------------------------------------------------------------/
…		…
3559	{	3569	{
3560	if (mode == 'r')	3570	if (mode == 'r')
3561	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3571	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562	else	3572	else
3563	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3573	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564	PrivMode (state, bit);	3574	set_privmode (bit, state);
3565	}	3575	}
3566		3576
3567	return state;	3577	return state;
3568	}	3578	}
3569		3579
…		…
3577	static const struct	3587	static const struct
3578	{	3588	{
3579	const int argval;	3589	const int argval;
3580	const unsigned long bit;	3590	const unsigned long bit;
3581	} argtopriv[] = {	3591	} argtopriv[] = {
3582	{ 1, PrivMode_aplCUR },	3592	{ 1, PrivMode_aplCUR }, // DECCKM
3583	{ 2, PrivMode_vt52 },	3593	{ 2, PrivMode_vt52 },
3584	{ 3, PrivMode_132 },	3594	{ 3, PrivMode_132 }, // DECCOLM
3585	{ 4, PrivMode_smoothScroll },	3595	{ 4, PrivMode_smoothScroll }, // DECSCLM
3586	{ 5, PrivMode_rVideo },	3596	{ 5, PrivMode_rVideo }, // DECSCNM
3587	{ 6, PrivMode_relOrigin },	3597	{ 6, PrivMode_relOrigin }, // DECOM
3588	{ 7, PrivMode_Autowrap },	3598	{ 7, PrivMode_Autowrap }, // DECAWM
3589	// 8, bi-directional support mode	3599	// 8, auto-repeat keys // DECARM
3590	{ 9, PrivMode_MouseX10 },	3600	{ 9, PrivMode_MouseX10 },
3591	// 18, 19 printing-related	3601	// 18 end FF to printer after print screen
		3602	// 19 Print screen prints full screen/scorll region
3592	{ 25, PrivMode_VisibleCursor },	3603	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3593	#ifdef scrollBar_esc	3604	#ifdef scrollBar_esc
3594	{ scrollBar_esc, PrivMode_scrollBar },	3605	{ scrollBar_esc, PrivMode_scrollBar },
3595	#endif	3606	#endif
3596	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3607	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3608	// 38, tektronix mode // DECTEK
3597	{ 40, PrivMode_132OK },	3609	{ 40, PrivMode_132OK },
3598	// 41 xterm more fixes NYI	3610	// 41 xterm more fixes NYI
3599	// 45 margin bell NYI	3611	// 45 margin bell NYI
3600	// 46 start logging	3612	// 46 start logging
3601	{ 47, PrivMode_Screen },	3613	{ 47, PrivMode_Screen },
3602	{ 66, PrivMode_aplKP },	3614	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3603	#ifndef NO_BACKSPACE_KEY	3615	#ifndef NO_BACKSPACE_KEY
3604	{ 67, PrivMode_BackSpace },	3616	{ 67, PrivMode_BackSpace }, // DECBKM
3605	#endif	3617	#endif
3606	{ 1000, PrivMode_MouseX11 },	3618	{ 1000, PrivMode_MouseX11 },
3607	{ 1002, PrivMode_MouseBtnEvent },	3619	{ 1002, PrivMode_MouseBtnEvent },
3608	{ 1003, PrivMode_MouseAnyEvent },	3620	{ 1003, PrivMode_MouseAnyEvent },
3609	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3621	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3613	// 1037 send DEL for keypad delete NYI	3625	// 1037 send DEL for keypad delete NYI
3614	{ 1047, PrivMode_Screen },	3626	{ 1047, PrivMode_Screen },
3615	// 1048 save and restore cursor	3627	// 1048 save and restore cursor
3616	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3628	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3617	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3629	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3630	{ 2004, PrivMode_BracketPaste },
3618	};	3631	};
3619		3632
3620	if (nargs == 0)	3633	if (nargs == 0)
3621	return;	3634	return;
3622		3635
…		…
3666	case 2: /* VT52 mode */	3679	case 2: /* VT52 mode */
3667	/* oddball mode. should be set regardless of set/reset	3680	/* oddball mode. should be set regardless of set/reset
3668	* parameter. Return from VT52 mode with an ESC < from	3681	* parameter. Return from VT52 mode with an ESC < from
3669	* within VT52 mode	3682	* within VT52 mode
3670	*/	3683	*/
3671	PrivMode (1, PrivMode_vt52);	3684	set_privmode (PrivMode_vt52, 1);
3672	break;	3685	break;
3673	case 3: /* 80/132 */	3686	case 3: /* 80/132 */
3674	if (priv_modes & PrivMode_132OK)	3687	if (priv_modes & PrivMode_132OK)
3675	{
3676	scr_poweron ();
3677	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3688	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3678	}
3679	break;	3689	break;
3680	case 4: /* smooth scrolling */	3690	case 4: /* smooth scrolling */
3681	set_option (Opt_jumpScroll, !state);	3691	set_option (Opt_jumpScroll, !state);
3682	break;	3692	break;
3683	case 5: /* reverse video */	3693	case 5: /* reverse video */
…		…
3694	if (state) /* orthogonal */	3704	if (state) /* orthogonal */
3695	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3705	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3696	break;	3706	break;
3697	#ifdef scrollBar_esc	3707	#ifdef scrollBar_esc
3698	case scrollBar_esc:	3708	case scrollBar_esc:
3699	if (scrollbar_mapping (state))	3709	if (scrollBar.map (state))
3700	{	3710	{
3701	resize_all_windows (0, 0, 0);	3711	resize_all_windows (0, 0, 0);
3702	scr_touch (true);	3712	scr_touch (true);
3703	}	3713	}
3704	break;	3714	break;
…		…
3725	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3735	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3726	vt_emask_mouse = PointerMotionMask;	3736	vt_emask_mouse = PointerMotionMask;
3727	}	3737	}
3728	else	3738	else
3729	vt_emask_mouse = NoEventMask;	3739	vt_emask_mouse = NoEventMask;
		3740
3730	vt_select_input ();	3741	vt_select_input ();
3731	break;	3742	break;
3732	case 1010: /* scroll to bottom on TTY output inhibit */	3743	case 1010: /* scroll to bottom on TTY output inhibit */
3733	set_option (Opt_scrollTtyOutput, !state);	3744	set_option (Opt_scrollTtyOutput, !state);
3734	break;	3745	break;
…		…
3737	break;	3748	break;
3738	case 1047: /* secondary screen w/ clearing last */	3749	case 1047: /* secondary screen w/ clearing last */
3739	if (option (Opt_secondaryScreen))	3750	if (option (Opt_secondaryScreen))
3740	if (current_screen != PRIMARY)	3751	if (current_screen != PRIMARY)
3741	scr_erase_screen (2);	3752	scr_erase_screen (2);
		3753
3742	scr_change_screen (state);	3754	scr_change_screen (state);
3743	break;	3755	break;
3744	case 1049: /* secondary screen w/ clearing first */	3756	case 1049: /* secondary screen w/ clearing first */
3745	scr_change_screen (state);	3757	scr_change_screen (state);
3746	if (option (Opt_secondaryScreen))	3758	if (option (Opt_secondaryScreen))

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.392 by root, Sat Jan 12 22:13:46 2008 UTC vs. Revision 1.427 by root, Wed Nov 5 15:44:04 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.392 by root, Sat Jan 12 22:13:46 2008 UTC vs.
Revision 1.427 by root, Wed Nov 5 15:44:04 2008 UTC