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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.395 by root, Sun Jan 20 13:45:21 2008 UTC vs.
Revision 1.434 by sf-exg, Wed Jan 6 10:29:14 2010 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
…		…
485	}	579	}
486	}	580	}
487		581
488	#if ENABLE_FRILLS \|\| ISO_14755	582	#if ENABLE_FRILLS \|\| ISO_14755
489	// ISO 14755 support	583	// ISO 14755 support
490	if (shft && ctrl)	584	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
491	{	585	{
492	int hv;	586	int hv;
493		587
494	if (iso14755buf & ISO_14755_51	588	if (iso14755buf & ISO_14755_51
495	&& (keysym == XK_space \|\| keysym == XK_KP_Space	589	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
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
…		…
1553	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1537	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554	;	1538	;
1555		1539
1556	if (scrollBar.state && ev.xany.window == scrollBar.win)	1540	if (scrollBar.state && ev.xany.window == scrollBar.win)
1557	{	1541	{
1558	scrollBar.setIdle ();	1542	scrollBar.state = STATE_IDLE;
1559	scrollbar_show (0);	1543	scrollBar.show (0);
1560	}	1544	}
1561	}	1545	}
1562	break;	1546	break;
1563		1547
1564	case MotionNotify:	1548	case MotionNotify:
…		…
1651	#ifdef MOUSE_THRESHOLD	1635	#ifdef MOUSE_THRESHOLD
1652	}	1636	}
1653	#endif	1637	#endif
1654	}	1638	}
1655	}	1639	}
1656	else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)	1640	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657	{	1641	{
1658	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1642	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659	MotionNotify, &ev))	1643	MotionNotify, &ev))
1660	;	1644	;
1661		1645
…		…
1663	&unused_root, &unused_child,	1647	&unused_root, &unused_child,
1664	&unused_root_x, &unused_root_y,	1648	&unused_root_x, &unused_root_y,
1665	&ev.xbutton.x, &ev.xbutton.y,	1649	&ev.xbutton.x, &ev.xbutton.y,
1666	&unused_mask);	1650	&unused_mask);
1667	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668	scrollbar_size ());	1652	scrollBar.size ());
1669	want_refresh = 1;	1653	want_refresh = 1;
1670	scrollbar_show (1);	1654	scrollBar.show (1);
1671	}	1655	}
1672	break;	1656	break;
1673	}	1657	}
1674		1658
1675	#if defined(CURSOR_BLINK)	1659	#if defined(CURSOR_BLINK)
…		…
1700	#endif	1684	#endif
1701		1685
1702	refresh_check ();	1686	refresh_check ();
1703	}	1687	}
1704		1688
		1689	#if ENABLE_FRILLS
		1690	void
		1691	rxvt_term::set_urgency (bool enable)
		1692	{
		1693	if (enable == urgency_hint)
		1694	return;
		1695
		1696	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1697	{
		1698	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1699	XSetWMHints (dpy, parent[0], h);
		1700	urgency_hint = enable;
		1701	}
		1702	}
		1703	#endif
		1704
1705	void	1705	void
1706	rxvt_term::focus_in ()	1706	rxvt_term::focus_in ()
1707	{	1707	{
1708	if (!focus)	1708	if (!focus)
1709	{	1709	{
1710	focus = 1;	1710	focus = 1;
1711	want_refresh = 1;	1711	want_refresh = 1;
1712
1713	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714		1712
1715	#if USE_XIM	1713	#if USE_XIM
1716	if (Input_Context != NULL)	1714	if (Input_Context != NULL)
1717	{	1715	{
1718	IMSetPosition ();	1716	IMSetPosition ();
…		…
1730	scr_recolour ();	1728	scr_recolour ();
1731	}	1729	}
1732	#endif	1730	#endif
1733	#if ENABLE_FRILLS	1731	#if ENABLE_FRILLS
1734	if (option (Opt_urgentOnBell))	1732	if (option (Opt_urgentOnBell))
1735	{	1733	set_urgency (0);
1736	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737	{
1738	h->flags &= ~XUrgencyHint;
1739	XSetWMHints (dpy, parent[0], h);
1740	}
1741	}
1742	#endif	1734	#endif
		1735
		1736	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743	}	1737	}
1744	}	1738	}
1745		1739
1746	void	1740	void
1747	rxvt_term::focus_out ()	1741	rxvt_term::focus_out ()
…		…
1749	if (focus)	1743	if (focus)
1750	{	1744	{
1751	focus = 0;	1745	focus = 0;
1752	want_refresh = 1;	1746	want_refresh = 1;
1753		1747
1754	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1748	#if ENABLE_FRILLS
1755		1749	if (option (Opt_urgentOnBell))
		1750	set_urgency (0);
		1751	#endif
1756	#if ENABLE_FRILLS \|\| ISO_14755	1752	#if ENABLE_FRILLS \|\| ISO_14755
1757	if (iso14755buf)	1753	if (iso14755buf)
1758	{	1754	{
1759	iso14755buf = 0;	1755	iso14755buf = 0;
1760	# if ISO_14755	1756	# if ISO_14755
…		…
1777	{	1773	{
1778	pix_colors = pix_colors_unfocused;	1774	pix_colors = pix_colors_unfocused;
1779	scr_recolour ();	1775	scr_recolour ();
1780	}	1776	}
1781	#endif	1777	#endif
		1778
		1779	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782	}	1780	}
1783	}	1781	}
1784		1782
1785	void	1783	void
1786	rxvt_term::update_fade_color (unsigned int idx)	1784	rxvt_term::update_fade_color (unsigned int idx)
…		…
1947	/*	1945	/*
1948	* Scrollbar window processing of button press	1946	* Scrollbar window processing of button press
1949	*/	1947	*/
1950	if (scrollBar.state && ev.window == scrollBar.win)	1948	if (scrollBar.state && ev.window == scrollBar.win)
1951	{	1949	{
1952	scrollBar.setIdle ();	1950	page_dirn direction = NO_DIR;
		1951
		1952	if (scrollBar.upButton (ev.y))
		1953	direction = UP; /* up */
		1954	else if (scrollBar.dnButton (ev.y))
		1955	direction = DN; /* down */
		1956
		1957	scrollBar.state = STATE_IDLE;
1953	/*	1958	/*
1954	* Rxvt-style scrollbar:	1959	* Rxvt-style scrollbar:
1955	* move up if mouse is above slider	1960	* move up if mouse is above slider
1956	* move dn if mouse is below slider	1961	* move dn if mouse is below slider
1957	*	1962	*
…		…
1966	/*	1971	/*
1967	* Mouse report disabled scrollbar:	1972	* Mouse report disabled scrollbar:
1968	* arrow buttons - send up/down	1973	* arrow buttons - send up/down
1969	* click on scrollbar - send pageup/down	1974	* click on scrollbar - send pageup/down
1970	*/	1975	*/
1971	if ((scrollBar.style == R_SB_NEXT	1976	if (direction == UP)
1972	&& scrollbarnext_upButton (ev.y))
1973	\|\| (scrollBar.style == R_SB_RXVT
1974	&& scrollbarrxvt_upButton (ev.y)))
1975	tt_printf ("\033[A");	1977	tt_printf ("\033[A");
1976	else if ((scrollBar.style == R_SB_NEXT	1978	else if (direction == DN)
1977	&& scrollbarnext_dnButton (ev.y))
1978	\|\| (scrollBar.style == R_SB_RXVT
1979	&& scrollbarrxvt_dnButton (ev.y)))
1980	tt_printf ("\033[B");	1979	tt_printf ("\033[B");
1981	else	1980	else
1982	switch (ev.button)	1981	switch (ev.button)
1983	{	1982	{
1984	case Button2:	1983	case Button2:
…		…
1992	break;	1991	break;
1993	}	1992	}
1994	}	1993	}
1995	else	1994	else
1996	#endif /* NO_SCROLLBAR_REPORT */	1995	#endif /* NO_SCROLLBAR_REPORT */
1997
1998	{
1999	char upordown = 0;
2000
2001	if (scrollBar.style == R_SB_NEXT)
2002	{	1996	{
2003	if (scrollbarnext_upButton (ev.y))	1997	if (direction != NO_DIR)
2004	upordown = -1; /* up */
2005	else if (scrollbarnext_dnButton (ev.y))
2006	upordown = 1; /* down */
2007	}
2008	else if (scrollBar.style == R_SB_RXVT)
2009	{
2010	if (scrollbarrxvt_upButton (ev.y))
2011	upordown = -1; /* up */
2012	else if (scrollbarrxvt_dnButton (ev.y))
2013	upordown = 1; /* down */
2014	}
2015
2016	if (upordown)
2017	{	1998	{
2018	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1999	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019	if (!cont_scroll_ev.is_active ())	2000	if (!cont_scroll_ev.is_active ())
2020	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2001	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021	#endif	2002	#endif
2022	if (scr_page (upordown < 0 ? UP : DN, 1))	2003	if (scr_page (direction, 1))
2023	{	2004	{
2024	if (upordown < 0)	2005	if (direction == UP)
2025	scrollBar.setUp ();	2006	scrollBar.state = STATE_UP;
2026	else	2007	else
2027	scrollBar.setDn ();	2008	scrollBar.state = STATE_DOWN;
2028	}	2009	}
2029	}	2010	}
2030	else	2011	else
2031	switch (ev.button)	2012	switch (ev.button)
2032	{	2013	{
…		…
2045	}	2026	}
2046		2027
2047	if (scrollBar.style == R_SB_XTERM	2028	if (scrollBar.style == R_SB_XTERM
2048	\|\| scrollbar_above_slider (ev.y)	2029	\|\| scrollbar_above_slider (ev.y)
2049	\|\| scrollbar_below_slider (ev.y))	2030	\|\| scrollbar_below_slider (ev.y))
2050	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2031	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2051		2032
2052	scrollBar.setMotion ();	2033	scrollBar.state = STATE_MOTION;
2053	break;	2034	break;
2054		2035
2055	case Button1:	2036	case Button1:
2056	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2037	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057	csrO = ev.y - scrollBar.top;	2038	csrO = ev.y - scrollBar.top;
…		…
2071	scr_page (DN, nrow - 1);	2052	scr_page (DN, nrow - 1);
2072	# else	2053	# else
2073	scr_page (DN, nrow / 4);	2054	scr_page (DN, nrow / 4);
2074	# endif	2055	# endif
2075	else	2056	else
2076	scrollBar.setMotion ();	2057	scrollBar.state = STATE_MOTION;
2077	}	2058	}
2078	else	2059	else
2079	{	2060	{
2080	scr_page ((ev.button == Button1 ? DN : UP),	2061	scr_page ((ev.button == Button1 ? DN : UP),
2081	(nrow	2062	(nrow
2082	* scrollbar_position (ev.y)	2063	* scrollbar_position (ev.y)
2083	/ scrollbar_size ()));	2064	/ scrollBar.size ()));
2084	}	2065	}
2085		2066
2086	break;	2067	break;
2087	}	2068	}
2088	}	2069	}
…		…
2098		2079
2099	csrO = 0; /* reset csr Offset */	2080	csrO = 0; /* reset csr Offset */
2100	if (!bypass_keystate)	2081	if (!bypass_keystate)
2101	reportmode = !! (priv_modes & PrivMode_mouse_report);	2082	reportmode = !! (priv_modes & PrivMode_mouse_report);
2102		2083
2103	if (scrollbar_isUpDn ())	2084	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2104	{	2085	{
2105	scrollBar.setIdle ();	2086	scrollBar.state = STATE_IDLE;
2106	scrollbar_show (0);	2087	scrollBar.show (0);
2107	}	2088	}
2108		2089
2109	#ifdef SELECTION_SCROLLING	2090	#ifdef SELECTION_SCROLLING
2110	sel_scroll_ev.stop();	2091	sel_scroll_ev.stop();
2111	#endif	2092	#endif
…		…
2194	}	2175	}
2195	else	2176	else
2196	# endif	2177	# endif
2197	{	2178	{
2198	scr_page (v, i);	2179	scr_page (v, i);
2199	scrollbar_show (1);	2180	scrollBar.show (1);
2200	}	2181	}
2201	}	2182	}
2202	break;	2183	break;
2203	#endif	2184	#endif
2204	}	2185	}
2205	}	2186	}
2206	}	2187	}
2207		2188
2208	/}}} /	2189	/}}} /
2209		2190
2210	bool	2191	void
2211	rxvt_term::cmd_parse ()	2192	rxvt_term::cmd_parse ()
2212	{	2193	{
2213	bool flag = false;
2214	wchar_t ch = NOCHAR;	2194	wchar_t ch = NOCHAR;
2215	char *seq_begin; // remember start of esc-sequence here	2195	char *seq_begin; // remember start of esc-sequence here
2216		2196
2217	for (;;)	2197	for (;;)
2218	{	2198	{
2219	if (ch == NOCHAR)	2199	if (expect_false (ch == NOCHAR))
2220	{	2200	{
2221	seq_begin = cmdbuf_ptr;	2201	seq_begin = cmdbuf_ptr;
2222	ch = next_char ();	2202	ch = next_char ();
2223		2203
2224	if (ch == NOCHAR)	2204	if (ch == NOCHAR)
2225	break;	2205	break;
2226	}	2206	}
2227		2207
2228	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2208	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2229	{	2209	{
2230	if (!seen_input)	2210	if (expect_false (!seen_input))
2231	{	2211	{
2232	seen_input = 1;	2212	seen_input = 1;
2233	// many badly-written programs (e.g. jed) contain a race condition:	2213	// many badly-written programs (e.g. jed) contain a race condition:
2234	// they first read the screensize and then install a SIGWINCH handler.	2214	// they first read the screensize and then install a SIGWINCH handler.
2235	// some window managers resize the window early, and these programs	2215	// some window managers resize the window early, and these programs
…		…
2248	wchar_t *str = buf;	2228	wchar_t *str = buf;
2249	wchar_t *eol = str + min (ncol, UBUFSIZ);	2229	wchar_t *eol = str + min (ncol, UBUFSIZ);
2250		2230
2251	for (;;)	2231	for (;;)
2252	{	2232	{
2253	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2233	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254	break;	2234	break;
2255		2235
2256	*str++ = ch;	2236	*str++ = ch;
2257		2237
2258	if (ch == C0_LF \|\| str >= eol)	2238	if (expect_false (ch == C0_LF \|\| str >= eol))
2259	{	2239	{
2260	if (ch == C0_LF)	2240	if (ch == C0_LF)
2261	nlines++;	2241	nlines++;
2262		2242
2263	refresh_count++;	2243	refresh_count++;
…		…
2312	* What the heck we'll cheat and only refresh less than every page-full.	2292	* What the heck we'll cheat and only refresh less than every page-full.
2313	* if skipScroll is enabled.	2293	* if skipScroll is enabled.
2314	*/	2294	*/
2315	if (refreshnow)	2295	if (refreshnow)
2316	{	2296	{
2317	flag = true;
2318	scr_refresh ();	2297	scr_refresh ();
2319	want_refresh = 1;	2298	want_refresh = 1;
2320	}	2299	}
2321
2322	}	2300	}
2323	else	2301	else
2324	{	2302	{
2325	try	2303	try
2326	{	2304	{
…		…
2334	}	2312	}
2335		2313
2336	ch = NOCHAR;	2314	ch = NOCHAR;
2337	}	2315	}
2338	}	2316	}
2339
2340	return flag;
2341	}	2317	}
2342		2318
2343	// read the next character	2319	// read the next character
2344	wchar_t	2320	wchar_t
2345	rxvt_term::next_char () NOTHROW	2321	rxvt_term::next_char () NOTHROW
2346	{	2322	{
2347	while (cmdbuf_ptr < cmdbuf_endp)	2323	while (cmdbuf_ptr < cmdbuf_endp)
2348	{	2324	{
2349	// assume 7-bit to be ascii ALWAYS	2325	// assume 7-bit to be ascii ALWAYS
2350	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2326	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2351	return *cmdbuf_ptr++;	2327	return *cmdbuf_ptr++;
2352		2328
2353	wchar_t wc;	2329	wchar_t wc;
2354	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2330	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355		2331
…		…
2359	cmdbuf_ptr = cmdbuf_endp;	2335	cmdbuf_ptr = cmdbuf_endp;
2360	break;	2336	break;
2361	}	2337	}
2362		2338
2363	if (len == (size_t)-1)	2339	if (len == (size_t)-1)
		2340	{
		2341	mbstate.reset (); // reset now undefined conversion state
2364	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2342	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2343	}
2365		2344
2366	// assume wchar == unicode	2345	// assume wchar == unicode
2367	cmdbuf_ptr += len;	2346	cmdbuf_ptr += len;
2368	return wc & UNICODE_MASK;	2347	return wc & UNICODE_MASK;
2369	}	2348	}
…		…
2413	/----------------------------------------------------------------------/	2392	/----------------------------------------------------------------------/
2414	#ifdef PRINTPIPE	2393	#ifdef PRINTPIPE
2415	FILE *	2394	FILE *
2416	rxvt_term::popen_printer ()	2395	rxvt_term::popen_printer ()
2417	{	2396	{
2418	FILE *stream = popen (rs[Rs_print_pipe], "w");	2397	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419		2398
2420	if (stream == NULL)	2399	if (stream == NULL)
2421	rxvt_warn ("can't open printer pipe, not printing.\n");	2400	rxvt_warn ("can't open printer pipe, not printing.\n");
2422		2401
2423	return stream;	2402	return stream;
…		…
2434	* simulate attached vt100 printer	2413	* simulate attached vt100 printer
2435	*/	2414	*/
2436	void	2415	void
2437	rxvt_term::process_print_pipe ()	2416	rxvt_term::process_print_pipe ()
2438	{	2417	{
2439	int done;	2418	FILE *fd = popen_printer ();
2440	FILE *fd;
2441		2419
2442	if ((fd = popen_printer ()) == NULL)	2420	if (!fd)
2443	return;	2421	return;
2444		2422
2445	/*	2423	/*
2446	* Send all input to the printer until either ESC[4i or ESC[?4i	2424	* Send all input to the printer until either ESC[4i or ESC[?4i
2447	* is received.	2425	* is received.
2448	*/	2426	*/
2449	for (done = 0; !done;)	2427	for (int done = 0; !done; )
2450	{	2428	{
2451	unsigned char buf[8];	2429	unsigned char buf[8];
2452	unicode_t ch;	2430	unicode_t ch;
2453	unsigned int i, len;	2431	unsigned int i, len;
2454		2432
…		…
2599	break;	2577	break;
2600	case 'Z': /* identify the terminal type */	2578	case 'Z': /* identify the terminal type */
2601	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2579	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602	break;	2580	break;
2603	case '<': /* turn off VT52 mode */	2581	case '<': /* turn off VT52 mode */
2604	PrivMode (0, PrivMode_vt52);	2582	set_privmode (PrivMode_vt52, 0);
2605	break;	2583	break;
2606	case 'F': /* use special graphics character set */	2584	case 'F': /* use special graphics character set */
2607	case 'G': /* use regular character set */	2585	case 'G': /* use regular character set */
2608	/* unimplemented */	2586	/* unimplemented */
2609	break;	2587	break;
…		…
2663	scr_forwardindex ();	2641	scr_forwardindex ();
2664	break;	2642	break;
2665	#endif	2643	#endif
2666	case '=':	2644	case '=':
2667	case '>':	2645	case '>':
2668	PrivMode ((ch == '='), PrivMode_aplKP);	2646	set_privmode (PrivMode_aplKP, ch == '=');
2669	break;	2647	break;
2670		2648
2671	case C1_40:	2649	case C1_40:
2672	cmd_getc ();	2650	cmd_getc ();
2673	break;	2651	break;
…		…
2712	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2690	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713	case C1_SCI: /* ESC Z */	2691	case C1_SCI: /* ESC Z */
2714	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2692	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715	break; /* steal obsolete ESC [ c */	2693	break; /* steal obsolete ESC [ c */
2716		2694
2717	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2695	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718	case C1_CSI: /* ESC [ */	2696	case C1_CSI: /* ESC [ */
2719	process_csi_seq ();	2697	process_csi_seq ();
2720	break;	2698	break;
2721		2699
2722	/* 8.3.90: OPERATING SYSTEM COMMAND */	2700	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723	case C1_OSC: /* ESC ] */	2701	case C1_OSC: /* ESC ] */
2724	process_osc_seq ();	2702	process_osc_seq ();
2725	break;	2703	break;
2726		2704
2727	/* 8.3.106: RESET TO INITIAL STATE */	2705	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728	case 'c':	2706	case 'c':
2729	mbstate.reset ();	2707	mbstate.reset ();
2730	scr_poweron ();	2708	scr_poweron ();
2731	scrollbar_show (1);	2709	scrollBar.show (1);
2732	break;	2710	break;
2733		2711
2734	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2712	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735	case 'n':	2713	case 'n':
2736	scr_charset_choose (2);	2714	scr_charset_choose (2);
…		…
2787		2765
2788	nargs = 0;	2766	nargs = 0;
2789		2767
2790	priv = 0;	2768	priv = 0;
2791	ch = cmd_getc ();	2769	ch = cmd_getc ();
2792	if (ch >= '<' && ch <= '?')	2770	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2793	{	2771	{
2794	/* '<' '=' '>' '?' */	2772	/* '<' '=' '>' '?' '!' */
2795	priv = ch;	2773	priv = ch;
2796	ch = cmd_getc ();	2774	ch = cmd_getc ();
2797	}	2775	}
2798		2776
2799	/* read any numerical arguments */	2777	/* read any numerical arguments */
…		…
2853		2831
2854	case '?':	2832	case '?':
2855	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2833	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2856	process_terminal_mode (ch, priv, nargs, arg);	2834	process_terminal_mode (ch, priv, nargs, arg);
2857	break;	2835	break;
		2836
		2837	case '!':
		2838	if (ch == CSI_70)
		2839	{
		2840	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2841	scr_soft_reset ();
		2842
		2843	static const int pm_h[] = { 7, 25 };
		2844	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2845
		2846	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2847	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2858	}	2848	}
		2849	break;
		2850	}
		2851
2859	return;	2852	return;
2860	}	2853	}
2861		2854
2862	switch (ch)	2855	switch (ch)
2863	{	2856	{
…		…
3292		3285
3293	/*	3286	/*
3294	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3287	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3295	*/	3288	*/
3296	void	3289	void
3297	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3290	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3298	{	3291	{
3299	int color;	3292	int color;
3300	char buf, name;	3293	char buf, name;
3301	bool query = str[0] == '?' && !str[1];	3294	bool query = str[0] == '?' && !str[1];
3302	int saveop = op;	3295	int saveop = op;
…		…
3343		3336
3344	XFree (value);	3337	XFree (value);
3345	}	3338	}
3346	else	3339	else
3347	{	3340	{
3348	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3341	char *eq = strchr (str, '=');
3349		3342
3350	if (eq)	3343	if (eq)
3351	{	3344	{
3352	*eq = 0;	3345	*eq = 0;
3353	set_utf8_property (display->atom (str), eq + 1);	3346	set_utf8_property (display->atom (str), eq + 1);
…		…
3409	break;	3402	break;
3410	case URxvt_Color_IT:	3403	case URxvt_Color_IT:
3411	process_color_seq (op, Color_IT, str, resp);	3404	process_color_seq (op, Color_IT, str, resp);
3412	break;	3405	break;
3413	#endif	3406	#endif
		3407	case URxvt_Color_border:
		3408	process_color_seq (op, Color_border, str, resp);
		3409	break;
3414	#if ENABLE_TRANSPARENCY	3410	#if ENABLE_TRANSPARENCY
3415	case URxvt_Color_tint:	3411	case URxvt_Color_tint:
3416	process_color_seq (op, Color_tint, str, resp);	3412	process_color_seq (op, Color_tint, str, resp);
3417	{	3413	{
3418	bool changed = false;	3414	bool changed = false;
…		…
3542	break;	3538	break;
3543	#endif	3539	#endif
3544		3540
3545	#if ENABLE_PERL	3541	#if ENABLE_PERL
3546	case URxvt_perl:	3542	case URxvt_perl:
3547	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3543	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3548	; // no responses yet
3549	break;	3544	break;
3550	#endif	3545	#endif
3551	}	3546	}
3552	}	3547	}
3553	/----------------------------------------------------------------------/	3548	/----------------------------------------------------------------------/
…		…
3576	{	3571	{
3577	if (mode == 'r')	3572	if (mode == 'r')
3578	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3573	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579	else	3574	else
3580	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3575	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581	PrivMode (state, bit);	3576	set_privmode (bit, state);
3582	}	3577	}
3583		3578
3584	return state;	3579	return state;
3585	}	3580	}
3586		3581
…		…
3594	static const struct	3589	static const struct
3595	{	3590	{
3596	const int argval;	3591	const int argval;
3597	const unsigned long bit;	3592	const unsigned long bit;
3598	} argtopriv[] = {	3593	} argtopriv[] = {
3599	{ 1, PrivMode_aplCUR },	3594	{ 1, PrivMode_aplCUR }, // DECCKM
3600	{ 2, PrivMode_vt52 },	3595	{ 2, PrivMode_vt52 },
3601	{ 3, PrivMode_132 },	3596	{ 3, PrivMode_132 }, // DECCOLM
3602	{ 4, PrivMode_smoothScroll },	3597	{ 4, PrivMode_smoothScroll }, // DECSCLM
3603	{ 5, PrivMode_rVideo },	3598	{ 5, PrivMode_rVideo }, // DECSCNM
3604	{ 6, PrivMode_relOrigin },	3599	{ 6, PrivMode_relOrigin }, // DECOM
3605	{ 7, PrivMode_Autowrap },	3600	{ 7, PrivMode_Autowrap }, // DECAWM
3606	// 8, bi-directional support mode	3601	// 8, auto-repeat keys // DECARM
3607	{ 9, PrivMode_MouseX10 },	3602	{ 9, PrivMode_MouseX10 },
3608	// 18, 19 printing-related	3603	// 18 end FF to printer after print screen
		3604	// 19 Print screen prints full screen/scorll region
3609	{ 25, PrivMode_VisibleCursor },	3605	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3610	#ifdef scrollBar_esc	3606	#ifdef scrollBar_esc
3611	{ scrollBar_esc, PrivMode_scrollBar },	3607	{ scrollBar_esc, PrivMode_scrollBar },
3612	#endif	3608	#endif
3613	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3609	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3610	// 38, tektronix mode // DECTEK
3614	{ 40, PrivMode_132OK },	3611	{ 40, PrivMode_132OK },
3615	// 41 xterm more fixes NYI	3612	// 41 xterm more fixes NYI
3616	// 45 margin bell NYI	3613	// 45 margin bell NYI
3617	// 46 start logging	3614	// 46 start logging
3618	{ 47, PrivMode_Screen },	3615	{ 47, PrivMode_Screen },
3619	{ 66, PrivMode_aplKP },	3616	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3620	#ifndef NO_BACKSPACE_KEY	3617	#ifndef NO_BACKSPACE_KEY
3621	{ 67, PrivMode_BackSpace },	3618	{ 67, PrivMode_BackSpace }, // DECBKM
3622	#endif	3619	#endif
3623	{ 1000, PrivMode_MouseX11 },	3620	{ 1000, PrivMode_MouseX11 },
3624	{ 1002, PrivMode_MouseBtnEvent },	3621	{ 1002, PrivMode_MouseBtnEvent },
3625	{ 1003, PrivMode_MouseAnyEvent },	3622	{ 1003, PrivMode_MouseAnyEvent },
3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3623	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3630	// 1037 send DEL for keypad delete NYI	3627	// 1037 send DEL for keypad delete NYI
3631	{ 1047, PrivMode_Screen },	3628	{ 1047, PrivMode_Screen },
3632	// 1048 save and restore cursor	3629	// 1048 save and restore cursor
3633	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3630	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3631	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3632	{ 2004, PrivMode_BracketPaste },
3635	};	3633	};
3636		3634
3637	if (nargs == 0)	3635	if (nargs == 0)
3638	return;	3636	return;
3639		3637
…		…
3664		3662
3665	scr_touch (true);	3663	scr_touch (true);
3666	break;	3664	break;
3667	#endif	3665	#endif
3668	case 1048: /* alternative cursor save */	3666	case 1048: /* alternative cursor save */
3669	case 1049:
3670	if (option (Opt_secondaryScreen))	3667	if (option (Opt_secondaryScreen))
3671	if (mode == 0)	3668	if (mode == 0)
3672	scr_cursor (RESTORE);	3669	scr_cursor (RESTORE);
3673	else if (mode == 1)	3670	else if (mode == 1)
3674	scr_cursor (SAVE);	3671	scr_cursor (SAVE);
…		…
3683	case 2: /* VT52 mode */	3680	case 2: /* VT52 mode */
3684	/* oddball mode. should be set regardless of set/reset	3681	/* oddball mode. should be set regardless of set/reset
3685	* parameter. Return from VT52 mode with an ESC < from	3682	* parameter. Return from VT52 mode with an ESC < from
3686	* within VT52 mode	3683	* within VT52 mode
3687	*/	3684	*/
3688	PrivMode (1, PrivMode_vt52);	3685	set_privmode (PrivMode_vt52, 1);
3689	break;	3686	break;
3690	case 3: /* 80/132 */	3687	case 3: /* 80/132 */
3691	if (priv_modes & PrivMode_132OK)	3688	if (priv_modes & PrivMode_132OK)
3692	{
3693	scr_poweron ();
3694	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3689	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3695	}
3696	break;	3690	break;
3697	case 4: /* smooth scrolling */	3691	case 4: /* smooth scrolling */
3698	set_option (Opt_jumpScroll, !state);	3692	set_option (Opt_jumpScroll, !state);
3699	break;	3693	break;
3700	case 5: /* reverse video */	3694	case 5: /* reverse video */
…		…
3711	if (state) /* orthogonal */	3705	if (state) /* orthogonal */
3712	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3706	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3713	break;	3707	break;
3714	#ifdef scrollBar_esc	3708	#ifdef scrollBar_esc
3715	case scrollBar_esc:	3709	case scrollBar_esc:
3716	if (scrollbar_mapping (state))	3710	if (scrollBar.map (state))
3717	{	3711	{
3718	resize_all_windows (0, 0, 0);	3712	resize_all_windows (0, 0, 0);
3719	scr_touch (true);	3713	scr_touch (true);
3720	}	3714	}
3721	break;	3715	break;
…		…
3742	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3736	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3743	vt_emask_mouse = PointerMotionMask;	3737	vt_emask_mouse = PointerMotionMask;
3744	}	3738	}
3745	else	3739	else
3746	vt_emask_mouse = NoEventMask;	3740	vt_emask_mouse = NoEventMask;
		3741
3747	vt_select_input ();	3742	vt_select_input ();
3748	break;	3743	break;
3749	case 1010: /* scroll to bottom on TTY output inhibit */	3744	case 1010: /* scroll to bottom on TTY output inhibit */
3750	set_option (Opt_scrollTtyOutput, !state);	3745	set_option (Opt_scrollTtyOutput, !state);
3751	break;	3746	break;
3752	case 1011: /* scroll to bottom on key press */	3747	case 1011: /* scroll to bottom on key press */
3753	set_option (Opt_scrollTtyKeypress, state);	3748	set_option (Opt_scrollTtyKeypress, state);
3754	break;	3749	break;
3755	case 1047: /* secondary screen w/ clearing last */	3750	case 1047: /* secondary screen w/ clearing last */
3756	if (option (Opt_secondaryScreen))	3751	if (option (Opt_secondaryScreen))
3757	if (current_screen != PRIMARY)	3752	if (!state)
3758	scr_erase_screen (2);	3753	scr_erase_screen (2);
		3754
3759	scr_change_screen (state);	3755	scr_change_screen (state);
3760	break;	3756	break;
3761	case 1049: /* secondary screen w/ clearing first */	3757	case 1049: /* secondary screen w/ clearing first */
		3758	if (option (Opt_secondaryScreen))
		3759	if (state)
		3760	scr_cursor (SAVE);
		3761
3762	scr_change_screen (state);	3762	scr_change_screen (state);
		3763
3763	if (option (Opt_secondaryScreen))	3764	if (option (Opt_secondaryScreen))
3764	if (current_screen != PRIMARY)	3765	if (state)
3765	scr_erase_screen (2);	3766	scr_erase_screen (2);
		3767	else
		3768	scr_cursor (RESTORE);
3766	break;	3769	break;
3767	default:	3770	default:
3768	break;	3771	break;
3769	}	3772	}
3770	}	3773	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.395 by root, Sun Jan 20 13:45:21 2008 UTC vs. Revision 1.434 by sf-exg, Wed Jan 6 10:29:14 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.395 by root, Sun Jan 20 13:45:21 2008 UTC vs.
Revision 1.434 by sf-exg, Wed Jan 6 10:29:14 2010 UTC