ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC vs.
Revision 1.431 by root, Tue Feb 24 11:51:51 2009 UTC

…		…
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
		31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31	*	32	*
32	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	36	* (at your option) any later version.
…		…
198	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
199	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
200		201
201	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
202		203
203	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
204	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
205		206
206	if (y >= 0)	207	if (y >= 0)
207	{	208	{
208	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
220	ch = *chr++;	221	ch = *chr++;
221		222
222	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
223	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
224	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
225	# if !UNICODE3	226	# if !UNICODE_3
226	if (ch >= 0x10000)	227	if (ch >= 0x10000)
227	ch = 0xfffd;	228	ch = 0xfffd;
228	# endif	229	# endif
229	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
230		231
…		…
278	}	279	}
279		280
280	iso14755buf = 0;	281	iso14755buf = 0;
281	}	282	}
282		283
283	int	284	static int
284	rxvt_term::hex_keyval (XKeyEvent &ev)	285	hex_keyval (XKeyEvent &ev)
285	{	286	{
286	// check wether this event corresponds to a hex digit	287	// check wether this event corresponds to a hex digit
287	// if the modifiers had not been pressed.	288	// if the modifiers had not been pressed.
288	for (int index = 0; index < 8; index++)	289	for (int index = 0; index < 8; index++)
289	{	290	{
…		…
297		298
298	return -1;	299	return -1;
299	}	300	}
300	#endif	301	#endif
301		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
302	void	398	void
303	rxvt_term::key_press (XKeyEvent &ev)	399	rxvt_term::key_press (XKeyEvent &ev)
304	{	400	{
305	int ctrl, meta, shft, len;	401	int ctrl, meta, shft, len;
306	unsigned int newlen;
307	KeySym keysym;	402	KeySym keysym;
308	int valid_keysym;	403	int valid_keysym;
309	char kbuf[KBUFSZ];	404	char kbuf[KBUFSZ];
310		405
311	#if ISO_14755	406	#if ISO_14755
…		…
324	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
325		420
326	if (numlock_state || (ev.state & ModNumLockMask))	421	if (numlock_state || (ev.state & ModNumLockMask))
327	{	422	{
328	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
329	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
330	}	425	}
331		426
332	kbuf[0] = 0;	427	kbuf[0] = 0;
333		428
334	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
546	}	641	}
547	#endif	642	#endif
548		643
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	645	{
		646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		647	unsigned int newlen = 1;
		648
		649	switch (translate_keypad (keysym, kp))
551	{	650	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	651	#ifndef NO_BACKSPACE_KEY
553	newlen = 1;	652	case XK_BackSpace:
554	#ifdef XK_KP_Home	653	if (priv_modes & PrivMode_HaveBackSpace)
555	static const KeySym keypadtrans[] = {	654	{
556	XK_KP_7, // XK_KP_Home	655	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557	XK_KP_4, // XK_KP_Left	656	^ !!ctrl) ? '\b' : '\177';
558	XK_KP_8, // XK_KP_Up	657	kbuf[1] = '\0';
559	XK_KP_6, // XK_KP_Right
560	XK_KP_2, // XK_KP_Down
561	#ifndef UNSHIFTED_SCROLLKEYS
562	XK_KP_9, // XK_KP_Prior
563	XK_KP_3, // XK_KP_Next
564	#else
565	XK_Prior,
566	XK_Next,
567	#endif
568	XK_KP_1, // XK_KP_End
569	XK_KP_5, // XK_KP_Begin
570	};	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;
571		684
572	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:
573	{	765	{
574	unsigned int index = keysym - XK_KP_Home;	766	int param = map_function_key (keysym);
575	keysym = kp ? keypadtrans[index] : XK_Home + index;	767	if (param > 0)
		768	sprintf (kbuf,"\033[%d~", param);
		769	else
		770	newlen = 0;
576	}	771	}
577	else if (keysym == XK_KP_Insert)
578	keysym = kp ? XK_KP_0 : XK_Insert;
579	#ifndef NO_DELETE_KEY
580	else if (keysym == XK_KP_Delete)
581	keysym = kp ? XK_KP_Decimal : XK_Delete;
582	#endif
583	#endif
584	switch (keysym)
585	{
586	#ifndef NO_BACKSPACE_KEY
587	case XK_BackSpace:
588	if (priv_modes & PrivMode_HaveBackSpace)
589	{
590	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591	^ !!ctrl) ? '\b' : '\177';
592	kbuf[1] = '\0';
593	}
594	else
595	strcpy (kbuf, rs[Rs_backspace_key]);
596	break;	772	break;
597	#endif
598	#ifndef NO_DELETE_KEY
599	case XK_Delete:
600	strcpy (kbuf, rs[Rs_delete_key]);
601	break;
602	#endif
603	case XK_Tab:
604	if (shft)
605	strcpy (kbuf, "\033[Z");
606	else
607	{
608	#ifdef CTRL_TAB_MAKES_META
609	if (ctrl)
610	meta = 1;
611	#endif
612	#ifdef MOD4_TAB_MAKES_META
613	if (ev.state & Mod4Mask)
614	meta = 1;
615	#endif
616	newlen = 0;
617	}
618	break;
619
620	case XK_Up: /* "\033[A" */
621	case XK_Down: /* "\033[B" */
622	case XK_Right: /* "\033[C" */
623	case XK_Left: /* "\033[D" */
624	strcpy (kbuf, "\033[Z");
625	kbuf[2] = "DACB"[keysym - XK_Left];
626	/* do Shift first */
627	if (shft)
628	kbuf[2] = "dacb"[keysym - XK_Left];
629	else if (ctrl)
630	{
631	kbuf[1] = 'O';
632	kbuf[2] = "dacb"[keysym - XK_Left];
633	}
634	else if (priv_modes & PrivMode_aplCUR)
635	kbuf[1] = 'O';
636	break;
637
638	#ifndef UNSHIFTED_SCROLLKEYS
639	case XK_Prior:
640	strcpy (kbuf, "\033[5~");
641	break;
642	case XK_Next:
643	strcpy (kbuf, "\033[6~");
644	break;
645	#endif
646	case XK_KP_Enter:
647	/* allow shift to override */
648	if (kp)
649	{
650	strcpy (kbuf, "\033OM");
651	break;
652	}
653
654	/* FALLTHROUGH */
655
656	case XK_Return:
657	if (priv_modes & PrivMode_LFNL)
658	{
659	kbuf[0] = '\015';
660	kbuf[1] = '\012';
661	kbuf[2] = '\0';
662	}
663	else
664	{
665	kbuf[0] = '\015';
666	kbuf[1] = '\0';
667	}
668	break;
669
670	case XK_KP_F1: /* "\033OP" */
671	case XK_KP_F2: /* "\033OQ" */
672	case XK_KP_F3: /* "\033OR" */
673	case XK_KP_F4: /* "\033OS" */
674	strcpy (kbuf, "\033OP");
675	kbuf[2] += (keysym - XK_KP_F1);
676	break;
677
678	case XK_KP_Multiply: /* "\033Oj" : "*" */
679	case XK_KP_Add: /* "\033Ok" : "+" */
680	case XK_KP_Separator: /* "\033Ol" : "," */
681	case XK_KP_Subtract: /* "\033Om" : "-" */
682	case XK_KP_Decimal: /* "\033On" : "." */
683	case XK_KP_Divide: /* "\033Oo" : "/" */
684	case XK_KP_0: /* "\033Op" : "0" */
685	case XK_KP_1: /* "\033Oq" : "1" */
686	case XK_KP_2: /* "\033Or" : "2" */
687	case XK_KP_3: /* "\033Os" : "3" */
688	case XK_KP_4: /* "\033Ot" : "4" */
689	case XK_KP_5: /* "\033Ou" : "5" */
690	case XK_KP_6: /* "\033Ov" : "6" */
691	case XK_KP_7: /* "\033Ow" : "7" */
692	case XK_KP_8: /* "\033Ox" : "8" */
693	case XK_KP_9: /* "\033Oy" : "9" */
694	/* allow shift to override */
695	if (kp)
696	{
697	strcpy (kbuf, "\033Oj");
698	kbuf[2] += (keysym - XK_KP_Multiply);
699	}
700	else
701	{
702	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703	kbuf[1] = '\0';
704	}
705	break;
706
707	case XK_Find:
708	strcpy (kbuf, "\033[1~");
709	break;
710
711	case XK_Insert:
712	strcpy (kbuf, "\033[2~");
713	break;
714	#ifdef DXK_Remove /* support for DEC remove like key */
715	case DXK_Remove:
716	/* FALLTHROUGH */
717	#endif
718	case XK_Execute:
719	strcpy (kbuf, "\033[3~");
720	break;
721	case XK_Select:
722	strcpy (kbuf, "\033[4~");
723	break;
724	case XK_End:
725	strcpy (kbuf, KS_END);
726	break;
727	case XK_Home:
728	strcpy (kbuf, KS_HOME);
729	break;
730
731	#define FKEY(n, fkey) \
732	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734	case XK_F1: /* "\033[11~" */
735	case XK_F2: /* "\033[12~" */
736	case XK_F3: /* "\033[13~" */
737	case XK_F4: /* "\033[14~" */
738	case XK_F5: /* "\033[15~" */
739	FKEY (11, XK_F1);
740	break;
741	case XK_F6: /* "\033[17~" */
742	case XK_F7: /* "\033[18~" */
743	case XK_F8: /* "\033[19~" */
744	case XK_F9: /* "\033[20~" */
745	case XK_F10: /* "\033[21~" */
746	FKEY (17, XK_F6);
747	break;
748	case XK_F11: /* "\033[23~" */
749	case XK_F12: /* "\033[24~" */
750	case XK_F13: /* "\033[25~" */
751	case XK_F14: /* "\033[26~" */
752	FKEY (23, XK_F11);
753	break;
754	case XK_F15: /* "\033[28~" */
755	case XK_F16: /* "\033[29~" */
756	FKEY (28, XK_F15);
757	break;
758	case XK_Help: /* "\033[28~" */
759	FKEY (28, XK_Help);
760	break;
761	case XK_Menu: /* "\033[29~" */
762	FKEY (29, XK_Menu);
763	break;
764	case XK_F17: /* "\033[31~" */
765	case XK_F18: /* "\033[32~" */
766	case XK_F19: /* "\033[33~" */
767	case XK_F20: /* "\033[34~" */
768	case XK_F21: /* "\033[35~" */
769	case XK_F22: /* "\033[36~" */
770	case XK_F23: /* "\033[37~" */
771	case XK_F24: /* "\033[38~" */
772	case XK_F25: /* "\033[39~" */
773	case XK_F26: /* "\033[40~" */
774	case XK_F27: /* "\033[41~" */
775	case XK_F28: /* "\033[42~" */
776	case XK_F29: /* "\033[43~" */
777	case XK_F30: /* "\033[44~" */
778	case XK_F31: /* "\033[45~" */
779	case XK_F32: /* "\033[46~" */
780	case XK_F33: /* "\033[47~" */
781	case XK_F34: /* "\033[48~" */
782	case XK_F35: /* "\033[49~" */
783	FKEY (31, XK_F17);
784	break;
785	#undef FKEY
786	default:
787	newlen = 0;
788	break;
789	}
790
791	if (newlen)
792	len = strlen (kbuf);
793	}	773	}
		774
		775	if (newlen)
		776	len = strlen (kbuf);
794		777
795	/*	778	/*
796	* Pass meta for all function keys, if 'meta' option set	779	* Pass meta for all function keys, if 'meta' option set
797	*/	780	*/
798	#ifdef META8_OPTION	781	#ifdef META8_OPTION
…		…
1032	}	1015	}
1033	while (row < end_row);	1016	while (row < end_row);
1034	}	1017	}
1035		1018
1036	scr_refresh ();	1019	scr_refresh ();
1037	scrollbar_show (1);	1020	scrollBar.show (1);
1038	#ifdef USE_XIM	1021	#ifdef USE_XIM
1039	IMSendSpot ();	1022	IMSendSpot ();
1040	#endif	1023	#endif
1041	}	1024	}
1042		1025
…		…
1078	{	1061	{
1079	if (scr_refresh_rend (RS_Blink, RS_Blink))	1062	if (scr_refresh_rend (RS_Blink, RS_Blink))
1080	{	1063	{
1081	hidden_text = !hidden_text;	1064	hidden_text = !hidden_text;
1082	want_refresh = 1;	1065	want_refresh = 1;
1083	refresh_check ();	1066	refresh_check ();
1084	}	1067	}
1085	else	1068	else
1086	w.stop ();	1069	w.stop ();
1087	}	1070	}
1088	#endif	1071	#endif
1089		1072
1090	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1073	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091	void	1074	void
1092	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1075	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093	{	1076	{
1094	if ((scrollbar_isUp () || scrollbar_isDn ())	1077	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095	&& scr_page (scrollbar_isUp () ? UP : DN, 1))	1078	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096	{	1079	{
1097	want_refresh = 1;	1080	want_refresh = 1;
1098	refresh_check ();	1081	refresh_check ();
1099	}	1082	}
1100	else	1083	else
…		…
1144	{	1127	{
1145	// this should really be sched_yield(), but the linux guys thought	1128	// this should really be sched_yield(), but the linux guys thought
1146	// that giving a process calling sched_yield () less cpu time than	1129	// that giving a process calling sched_yield () less cpu time than
1147	// 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
1148	// 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.
1149		1135
1150	struct timespec ts = { 0, 0 };	1136	struct timespec ts = { 0, 1000 };
1151	nanosleep (&ts, 0);	1137	nanosleep (&ts, 0);
1152		1138
1153	w.stop ();	1139	w.stop ();
1154	}	1140	}
1155		1141
…		…
1205	{	1191	{
1206	make_current ();	1192	make_current ();
1207		1193
1208	if (revents & ev::READ)	1194	if (revents & ev::READ)
1209	// loop, but don't allow a single term to monopolize us	1195	// loop, but don't allow a single term to monopolize us
1210	while (pty_fill ())	1196	for (int i = CBUFCNT; i-- && pty_fill (); )
1211	if (cmd_parse ())	1197	cmd_parse ();
1212	break;
1213		1198
1214	if (revents & ev::WRITE)	1199	if (revents & ev::WRITE)
1215	pty_write ();	1200	pty_write ();
		1201
		1202	refresh_check ();
1216	}	1203	}
1217		1204
1218	void	1205	void
1219	rxvt_term::pointer_unblank ()	1206	rxvt_term::pointer_unblank ()
1220	{	1207	{
…		…
1435	&& ev.xfocus.mode != NotifyGrab)	1422	&& ev.xfocus.mode != NotifyGrab)
1436	focus_out ();	1423	focus_out ();
1437	break;	1424	break;
1438		1425
1439	case ConfigureNotify:	1426	case ConfigureNotify:
1440	/* 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",
1441	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,
1442	szHint.width, szHint.height); */	1429	szHint.width, szHint.height);*/
1443	if (ev.xconfigure.window == parent[0])	1430	if (ev.xconfigure.window == parent[0])
1444	{	1431	{
1445	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1432	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1446	;	1433	;
1447		1434
…		…
1452	}	1439	}
1453	else	1440	else
1454	{	1441	{
1455	#ifdef HAVE_BG_PIXMAP	1442	#ifdef HAVE_BG_PIXMAP
1456	if (bgPixmap.window_position_sensitive ())	1443	if (bgPixmap.window_position_sensitive ())
		1444	{
		1445	if (mapped)
1457	update_background ();	1446	update_background ();
		1447	else
		1448	bgPixmap.invalidate ();
		1449	}
1458	#endif	1450	#endif
1459	}	1451	}
		1452
1460	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1453	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1461	}	1454	}
1462	break;	1455	break;
1463		1456
1464	case PropertyNotify:	1457	case PropertyNotify:
…		…
1481	case SelectionRequest:	1474	case SelectionRequest:
1482	selection_send (ev.xselectionrequest);	1475	selection_send (ev.xselectionrequest);
1483	break;	1476	break;
1484		1477
1485	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
1486	mapped = 1;	1495	mapped = 1;
1487	#ifdef TEXT_BLINK	1496	#ifdef TEXT_BLINK
1488	text_blink_ev.start ();	1497	text_blink_ev.start ();
1489	#endif	1498	#endif
1490	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1499	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
…		…
1526	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1535	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1527	;	1536	;
1528	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1537	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1529	;	1538	;
1530		1539
1531	if (isScrollbarWindow (ev.xany.window))	1540	if (scrollBar.state && ev.xany.window == scrollBar.win)
1532	{	1541	{
1533	scrollBar.setIdle ();	1542	scrollBar.state = STATE_IDLE;
1534	scrollbar_show (0);	1543	scrollBar.show (0);
1535	}	1544	}
1536	}	1545	}
1537	break;	1546	break;
1538		1547
1539	case MotionNotify:	1548	case MotionNotify:
…		…
1626	#ifdef MOUSE_THRESHOLD	1635	#ifdef MOUSE_THRESHOLD
1627	}	1636	}
1628	#endif	1637	#endif
1629	}	1638	}
1630	}	1639	}
1631	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1640	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1632	{	1641	{
1633	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1642	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1634	MotionNotify, &ev))	1643	MotionNotify, &ev))
1635	;	1644	;
1636		1645
…		…
1638	&unused_root, &unused_child,	1647	&unused_root, &unused_child,
1639	&unused_root_x, &unused_root_y,	1648	&unused_root_x, &unused_root_y,
1640	&ev.xbutton.x, &ev.xbutton.y,	1649	&ev.xbutton.x, &ev.xbutton.y,
1641	&unused_mask);	1650	&unused_mask);
1642	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643	scrollbar_size ());	1652	scrollBar.size ());
1644	want_refresh = 1;	1653	want_refresh = 1;
1645	scrollbar_show (1);	1654	scrollBar.show (1);
1646	}	1655	}
1647	break;	1656	break;
1648	}	1657	}
1649		1658
1650	#if defined(CURSOR_BLINK)	1659	#if defined(CURSOR_BLINK)
…		…
1675	#endif	1684	#endif
1676		1685
1677	refresh_check ();	1686	refresh_check ();
1678	}	1687	}
1679		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
1680	void	1705	void
1681	rxvt_term::focus_in ()	1706	rxvt_term::focus_in ()
1682	{	1707	{
1683	if (!focus)	1708	if (!focus)
1684	{	1709	{
1685	focus = 1;	1710	focus = 1;
1686	want_refresh = 1;	1711	want_refresh = 1;
1687
1688	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1689		1712
1690	#if USE_XIM	1713	#if USE_XIM
1691	if (Input_Context != NULL)	1714	if (Input_Context != NULL)
1692	{	1715	{
1693	IMSetPosition ();	1716	IMSetPosition ();
…		…
1705	scr_recolour ();	1728	scr_recolour ();
1706	}	1729	}
1707	#endif	1730	#endif
1708	#if ENABLE_FRILLS	1731	#if ENABLE_FRILLS
1709	if (option (Opt_urgentOnBell))	1732	if (option (Opt_urgentOnBell))
1710	{	1733	set_urgency (0);
1711	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1712	{
1713	h->flags &= ~XUrgencyHint;
1714	XSetWMHints (dpy, parent[0], h);
1715	}
1716	}
1717	#endif	1734	#endif
		1735
		1736	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718	}	1737	}
1719	}	1738	}
1720		1739
1721	void	1740	void
1722	rxvt_term::focus_out ()	1741	rxvt_term::focus_out ()
…		…
1724	if (focus)	1743	if (focus)
1725	{	1744	{
1726	focus = 0;	1745	focus = 0;
1727	want_refresh = 1;	1746	want_refresh = 1;
1728		1747
1729	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1748	#if ENABLE_FRILLS
1730		1749	if (option (Opt_urgentOnBell))
		1750	set_urgency (0);
		1751	#endif
1731	#if ENABLE_FRILLS || ISO_14755	1752	#if ENABLE_FRILLS || ISO_14755
1732	if (iso14755buf)	1753	if (iso14755buf)
1733	{	1754	{
1734	iso14755buf = 0;	1755	iso14755buf = 0;
1735	# if ISO_14755	1756	# if ISO_14755
…		…
1752	{	1773	{
1753	pix_colors = pix_colors_unfocused;	1774	pix_colors = pix_colors_unfocused;
1754	scr_recolour ();	1775	scr_recolour ();
1755	}	1776	}
1756	#endif	1777	#endif
		1778
		1779	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1757	}	1780	}
1758	}	1781	}
1759		1782
1760	void	1783	void
1761	rxvt_term::update_fade_color (unsigned int idx)	1784	rxvt_term::update_fade_color (unsigned int idx)
…		…
1792	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1815	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1793	{	1816	{
1794	bgPixmap.set_root_pixmap ();	1817	bgPixmap.set_root_pixmap ();
1795	update_background ();	1818	update_background ();
1796	}	1819	}
		1820
1797	break;	1821	break;
1798	}	1822	}
1799	# endif	1823	# endif
1800		1824
1801	refresh_check ();	1825	refresh_check ();
…		…
1919	}	1943	}
1920		1944
1921	/*	1945	/*
1922	* Scrollbar window processing of button press	1946	* Scrollbar window processing of button press
1923	*/	1947	*/
1924	if (isScrollbarWindow (ev.window))	1948	if (scrollBar.state && ev.window == scrollBar.win)
1925	{	1949	{
1926	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;
1927	/*	1958	/*
1928	* Rxvt-style scrollbar:	1959	* Rxvt-style scrollbar:
1929	* move up if mouse is above slider	1960	* move up if mouse is above slider
1930	* move dn if mouse is below slider	1961	* move dn if mouse is below slider
1931	*	1962	*
…		…
1940	/*	1971	/*
1941	* Mouse report disabled scrollbar:	1972	* Mouse report disabled scrollbar:
1942	* arrow buttons - send up/down	1973	* arrow buttons - send up/down
1943	* click on scrollbar - send pageup/down	1974	* click on scrollbar - send pageup/down
1944	*/	1975	*/
1945	if ((scrollBar.style == R_SB_NEXT	1976	if (direction == UP)
1946	&& scrollbarnext_upButton (ev.y))
1947	|| (scrollBar.style == R_SB_RXVT
1948	&& scrollbarrxvt_upButton (ev.y)))
1949	tt_printf ("\033[A");	1977	tt_printf ("\033[A");
1950	else if ((scrollBar.style == R_SB_NEXT	1978	else if (direction == DN)
1951	&& scrollbarnext_dnButton (ev.y))
1952	|| (scrollBar.style == R_SB_RXVT
1953	&& scrollbarrxvt_dnButton (ev.y)))
1954	tt_printf ("\033[B");	1979	tt_printf ("\033[B");
1955	else	1980	else
1956	switch (ev.button)	1981	switch (ev.button)
1957	{	1982	{
1958	case Button2:	1983	case Button2:
…		…
1966	break;	1991	break;
1967	}	1992	}
1968	}	1993	}
1969	else	1994	else
1970	#endif /* NO_SCROLLBAR_REPORT */	1995	#endif /* NO_SCROLLBAR_REPORT */
1971
1972	{
1973	char upordown = 0;
1974
1975	if (scrollBar.style == R_SB_NEXT)
1976	{	1996	{
1977	if (scrollbarnext_upButton (ev.y))	1997	if (direction != NO_DIR)
1978	upordown = -1; /* up */
1979	else if (scrollbarnext_dnButton (ev.y))
1980	upordown = 1; /* down */
1981	}
1982	else if (scrollBar.style == R_SB_RXVT)
1983	{
1984	if (scrollbarrxvt_upButton (ev.y))
1985	upordown = -1; /* up */
1986	else if (scrollbarrxvt_dnButton (ev.y))
1987	upordown = 1; /* down */
1988	}
1989
1990	if (upordown)
1991	{	1998	{
1992	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1999	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1993	if (!cont_scroll_ev.is_active ())	2000	if (!cont_scroll_ev.is_active ())
1994	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2001	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1995	#endif	2002	#endif
1996	if (scr_page (upordown < 0 ? UP : DN, 1))	2003	if (scr_page (direction, 1))
1997	{	2004	{
1998	if (upordown < 0)	2005	if (direction == UP)
1999	scrollBar.setUp ();	2006	scrollBar.state = STATE_UP;
2000	else	2007	else
2001	scrollBar.setDn ();	2008	scrollBar.state = STATE_DOWN;
2002	}	2009	}
2003	}	2010	}
2004	else	2011	else
2005	switch (ev.button)	2012	switch (ev.button)
2006	{	2013	{
2007	case Button2:	2014	case Button2:
2008	switch (scrollbar_align)	2015	switch (scrollBar.align)
2009	{	2016	{
2010	case R_SB_ALIGN_TOP:	2017	case R_SB_ALIGN_TOP:
2011	csrO = 0;	2018	csrO = 0;
2012	break;	2019	break;
2013	case R_SB_ALIGN_CENTRE:	2020	case R_SB_ALIGN_CENTRE:
…		…
2019	}	2026	}
2020		2027
2021	if (scrollBar.style == R_SB_XTERM	2028	if (scrollBar.style == R_SB_XTERM
2022	|| scrollbar_above_slider (ev.y)	2029	|| scrollbar_above_slider (ev.y)
2023	|| scrollbar_below_slider (ev.y))	2030	|| scrollbar_below_slider (ev.y))
2024	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2031	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2025		2032
2026	scrollBar.setMotion ();	2033	scrollBar.state = STATE_MOTION;
2027	break;	2034	break;
2028		2035
2029	case Button1:	2036	case Button1:
2030	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2037	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2031	csrO = ev.y - scrollBar.top;	2038	csrO = ev.y - scrollBar.top;
2032	/* FALLTHROUGH */	2039	/* FALLTHROUGH */
2033		2040
2034	case Button3:	2041	case Button3:
2035	if (scrollBar.style != R_SB_XTERM)	2042	if (scrollBar.style != R_SB_XTERM)
…		…
2045	scr_page (DN, nrow - 1);	2052	scr_page (DN, nrow - 1);
2046	# else	2053	# else
2047	scr_page (DN, nrow / 4);	2054	scr_page (DN, nrow / 4);
2048	# endif	2055	# endif
2049	else	2056	else
2050	scrollBar.setMotion ();	2057	scrollBar.state = STATE_MOTION;
2051	}	2058	}
2052	else	2059	else
2053	{	2060	{
2054	scr_page ((ev.button == Button1 ? DN : UP),	2061	scr_page ((ev.button == Button1 ? DN : UP),
2055	(nrow	2062	(nrow
2056	* scrollbar_position (ev.y)	2063	* scrollbar_position (ev.y)
2057	/ scrollbar_size ()));	2064	/ scrollBar.size ()));
2058	}	2065	}
2059		2066
2060	break;	2067	break;
2061	}	2068	}
2062	}	2069	}
…		…
2072		2079
2073	csrO = 0; /* reset csr Offset */	2080	csrO = 0; /* reset csr Offset */
2074	if (!bypass_keystate)	2081	if (!bypass_keystate)
2075	reportmode = !! (priv_modes & PrivMode_mouse_report);	2082	reportmode = !! (priv_modes & PrivMode_mouse_report);
2076		2083
2077	if (scrollbar_isUpDn ())	2084	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2078	{	2085	{
2079	scrollBar.setIdle ();	2086	scrollBar.state = STATE_IDLE;
2080	scrollbar_show (0);	2087	scrollBar.show (0);
2081	}	2088	}
2082		2089
2083	#ifdef SELECTION_SCROLLING	2090	#ifdef SELECTION_SCROLLING
2084	sel_scroll_ev.stop();	2091	sel_scroll_ev.stop();
2085	#endif	2092	#endif
…		…
2165		2172
2166	if (!slip_wheel_ev.is_active ())	2173	if (!slip_wheel_ev.is_active ())
2167	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2174	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168	}	2175	}
2169	else	2176	else
		2177	# endif
2170	{	2178	{
2171	# endif
2172	scr_page (v, i);	2179	scr_page (v, i);
2173	scrollbar_show (1);	2180	scrollBar.show (1);
2174	# ifdef MOUSE_SLIP_WHEELING
2175	}	2181	}
2176	# endif
2177	}	2182	}
2178	break;	2183	break;
2179	#endif	2184	#endif
2180	}	2185	}
2181	}	2186	}
2182	}	2187	}
2183		2188
2184	/*}}} */	2189	/*}}} */
2185		2190
2186	bool	2191	void
2187	rxvt_term::cmd_parse ()	2192	rxvt_term::cmd_parse ()
2188	{	2193	{
2189	bool flag = false;
2190	wchar_t ch = NOCHAR;	2194	wchar_t ch = NOCHAR;
2191	char *seq_begin; // remember start of esc-sequence here	2195	char *seq_begin; // remember start of esc-sequence here
2192		2196
2193	for (;;)	2197	for (;;)
2194	{	2198	{
2195	if (ch == NOCHAR)	2199	if (expect_false (ch == NOCHAR))
2196	{	2200	{
2197	seq_begin = cmdbuf_ptr;	2201	seq_begin = cmdbuf_ptr;
2198	ch = next_char ();	2202	ch = next_char ();
2199		2203
2200	if (ch == NOCHAR)	2204	if (ch == NOCHAR)
2201	break;	2205	break;
2202	}	2206	}
2203		2207
2204	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))
2205	{	2209	{
2206	if (!seen_input)	2210	if (expect_false (!seen_input))
2207	{	2211	{
2208	seen_input = 1;	2212	seen_input = 1;
2209	// many badly-written programs (e.g. jed) contain a race condition:	2213	// many badly-written programs (e.g. jed) contain a race condition:
2210	// they first read the screensize and then install a SIGWINCH handler.	2214	// they first read the screensize and then install a SIGWINCH handler.
2211	// some window managers resize the window early, and these programs	2215	// some window managers resize the window early, and these programs
…		…
2224	wchar_t *str = buf;	2228	wchar_t *str = buf;
2225	wchar_t *eol = str + min (ncol, UBUFSIZ);	2229	wchar_t *eol = str + min (ncol, UBUFSIZ);
2226		2230
2227	for (;;)	2231	for (;;)
2228	{	2232	{
2229	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)))
2230	break;	2234	break;
2231		2235
2232	*str++ = ch;	2236	*str++ = ch;
2233		2237
2234	if (ch == C0_LF || str >= eol)	2238	if (expect_false (ch == C0_LF || str >= eol))
2235	{	2239	{
2236	if (ch == C0_LF)	2240	if (ch == C0_LF)
2237	nlines++;	2241	nlines++;
2238		2242
2239	refresh_count++;	2243	refresh_count++;
…		…
2288	* 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.
2289	* if skipScroll is enabled.	2293	* if skipScroll is enabled.
2290	*/	2294	*/
2291	if (refreshnow)	2295	if (refreshnow)
2292	{	2296	{
2293	flag = true;
2294	scr_refresh ();	2297	scr_refresh ();
2295	want_refresh = 1;	2298	want_refresh = 1;
2296	}	2299	}
2297
2298	}	2300	}
2299	else	2301	else
2300	{	2302	{
2301	try	2303	try
2302	{	2304	{
…		…
2310	}	2312	}
2311		2313
2312	ch = NOCHAR;	2314	ch = NOCHAR;
2313	}	2315	}
2314	}	2316	}
2315
2316	refresh_check ();
2317
2318	return flag;
2319	}	2317	}
2320		2318
2321	// read the next character	2319	// read the next character
2322	wchar_t	2320	wchar_t
2323	rxvt_term::next_char () NOTHROW	2321	rxvt_term::next_char () NOTHROW
2324	{	2322	{
2325	while (cmdbuf_ptr < cmdbuf_endp)	2323	while (cmdbuf_ptr < cmdbuf_endp)
2326	{	2324	{
2327	// assume 7-bit to be ascii ALWAYS	2325	// assume 7-bit to be ascii ALWAYS
2328	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2326	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2329	return *cmdbuf_ptr++;	2327	return *cmdbuf_ptr++;
2330		2328
2331	wchar_t wc;	2329	wchar_t wc;
2332	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);
2333		2331
…		…
2337	cmdbuf_ptr = cmdbuf_endp;	2335	cmdbuf_ptr = cmdbuf_endp;
2338	break;	2336	break;
2339	}	2337	}
2340		2338
2341	if (len == (size_t)-1)	2339	if (len == (size_t)-1)
		2340	{
		2341	mbstate.reset (); // reset now undefined conversion state
2342	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	}
2343		2344
2344	// assume wchar == unicode	2345	// assume wchar == unicode
2345	cmdbuf_ptr += len;	2346	cmdbuf_ptr += len;
2346	return wc & UNICODE_MASK;	2347	return wc & UNICODE_MASK;
2347	}	2348	}
…		…
2391	/*----------------------------------------------------------------------*/	2392	/*----------------------------------------------------------------------*/
2392	#ifdef PRINTPIPE	2393	#ifdef PRINTPIPE
2393	FILE *	2394	FILE *
2394	rxvt_term::popen_printer ()	2395	rxvt_term::popen_printer ()
2395	{	2396	{
2396	FILE *stream = popen (rs[Rs_print_pipe], "w");	2397	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2397		2398
2398	if (stream == NULL)	2399	if (stream == NULL)
2399	rxvt_warn ("can't open printer pipe, not printing.\n");	2400	rxvt_warn ("can't open printer pipe, not printing.\n");
2400		2401
2401	return stream;	2402	return stream;
…		…
2412	* simulate attached vt100 printer	2413	* simulate attached vt100 printer
2413	*/	2414	*/
2414	void	2415	void
2415	rxvt_term::process_print_pipe ()	2416	rxvt_term::process_print_pipe ()
2416	{	2417	{
2417	int done;	2418	FILE *fd = popen_printer ();
2418	FILE *fd;
2419		2419
2420	if ((fd = popen_printer ()) == NULL)	2420	if (!fd)
2421	return;	2421	return;
2422		2422
2423	/*	2423	/*
2424	* 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
2425	* is received.	2425	* is received.
2426	*/	2426	*/
2427	for (done = 0; !done;)	2427	for (int done = 0; !done; )
2428	{	2428	{
2429	unsigned char buf[8];	2429	unsigned char buf[8];
2430	unicode_t ch;	2430	unicode_t ch;
2431	unsigned int i, len;	2431	unsigned int i, len;
2432		2432
…		…
2577	break;	2577	break;
2578	case 'Z': /* identify the terminal type */	2578	case 'Z': /* identify the terminal type */
2579	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2579	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580	break;	2580	break;
2581	case '<': /* turn off VT52 mode */	2581	case '<': /* turn off VT52 mode */
2582	PrivMode (0, PrivMode_vt52);	2582	set_privmode (PrivMode_vt52, 0);
2583	break;	2583	break;
2584	case 'F': /* use special graphics character set */	2584	case 'F': /* use special graphics character set */
2585	case 'G': /* use regular character set */	2585	case 'G': /* use regular character set */
2586	/* unimplemented */	2586	/* unimplemented */
2587	break;	2587	break;
…		…
2641	scr_forwardindex ();	2641	scr_forwardindex ();
2642	break;	2642	break;
2643	#endif	2643	#endif
2644	case '=':	2644	case '=':
2645	case '>':	2645	case '>':
2646	PrivMode ((ch == '='), PrivMode_aplKP);	2646	set_privmode (PrivMode_aplKP, ch == '=');
2647	break;	2647	break;
2648		2648
2649	case C1_40:	2649	case C1_40:
2650	cmd_getc ();	2650	cmd_getc ();
2651	break;	2651	break;
…		…
2690	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2690	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2691	case C1_SCI: /* ESC Z */	2691	case C1_SCI: /* ESC Z */
2692	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2692	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2693	break; /* steal obsolete ESC [ c */	2693	break; /* steal obsolete ESC [ c */
2694		2694
2695	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2695	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2696	case C1_CSI: /* ESC [ */	2696	case C1_CSI: /* ESC [ */
2697	process_csi_seq ();	2697	process_csi_seq ();
2698	break;	2698	break;
2699		2699
2700	/* 8.3.90: OPERATING SYSTEM COMMAND */	2700	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2701	case C1_OSC: /* ESC ] */	2701	case C1_OSC: /* ESC ] */
2702	process_osc_seq ();	2702	process_osc_seq ();
2703	break;	2703	break;
2704		2704
2705	/* 8.3.106: RESET TO INITIAL STATE */	2705	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2706	case 'c':	2706	case 'c':
2707	mbstate.reset ();	2707	mbstate.reset ();
2708	scr_poweron ();	2708	scr_poweron ();
2709	scrollbar_show (1);	2709	scrollBar.show (1);
2710	break;	2710	break;
2711		2711
2712	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2712	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2713	case 'n':	2713	case 'n':
2714	scr_charset_choose (2);	2714	scr_charset_choose (2);
…		…
2765		2765
2766	nargs = 0;	2766	nargs = 0;
2767		2767
2768	priv = 0;	2768	priv = 0;
2769	ch = cmd_getc ();	2769	ch = cmd_getc ();
2770	if (ch >= '<' && ch <= '?')	2770	if ((ch >= '<' && ch <= '?') || ch == '!')
2771	{	2771	{
2772	/* '<' '=' '>' '?' */	2772	/* '<' '=' '>' '?' '!' */
2773	priv = ch;	2773	priv = ch;
2774	ch = cmd_getc ();	2774	ch = cmd_getc ();
2775	}	2775	}
2776		2776
2777	/* read any numerical arguments */	2777	/* read any numerical arguments */
…		…
2826	// versions.	2826	// versions.
2827	//	2827	//
2828	tt_printf ("\033[>%d;95;0c", 'U');	2828	tt_printf ("\033[>%d;95;0c", 'U');
2829	}	2829	}
2830	break;	2830	break;
		2831
2831	case '?':	2832	case '?':
2832	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2833	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833	process_terminal_mode (ch, priv, nargs, arg);	2834	process_terminal_mode (ch, priv, nargs, arg);
2834	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);
2835	}	2848	}
		2849	break;
		2850	}
		2851
2836	return;	2852	return;
2837	}	2853	}
2838		2854
2839	switch (ch)	2855	switch (ch)
2840	{	2856	{
…		…
3351	*buf++ = '\0';	3367	*buf++ = '\0';
3352		3368
3353	process_color_seq (op, color, name, resp);	3369	process_color_seq (op, color, name, resp);
3354	}	3370	}
3355	break;	3371	break;
		3372	case Rxvt_restoreFG:
3356	case XTerm_Color00:	3373	case XTerm_Color00:
3357	process_color_seq (op, Color_fg, str, resp);	3374	process_color_seq (op, Color_fg, str, resp);
3358	break;	3375	break;
		3376	case Rxvt_restoreBG:
3359	case XTerm_Color01:	3377	case XTerm_Color01:
3360	process_color_seq (op, Color_bg, str, resp);	3378	process_color_seq (op, Color_bg, str, resp);
3361	break;	3379	break;
3362	#ifndef NO_CURSORCOLOR	3380	#ifndef NO_CURSORCOLOR
3363	case XTerm_Color_cursor:	3381	case XTerm_Color_cursor:
…		…
3384	break;	3402	break;
3385	case URxvt_Color_IT:	3403	case URxvt_Color_IT:
3386	process_color_seq (op, Color_IT, str, resp);	3404	process_color_seq (op, Color_IT, str, resp);
3387	break;	3405	break;
3388	#endif	3406	#endif
		3407	case URxvt_Color_border:
		3408	process_color_seq (op, Color_border, str, resp);
		3409	break;
3389	#if ENABLE_TRANSPARENCY	3410	#if ENABLE_TRANSPARENCY
3390	case URxvt_Color_tint:	3411	case URxvt_Color_tint:
3391	process_color_seq (op, Color_tint, str, resp);	3412	process_color_seq (op, Color_tint, str, resp);
3392	{	3413	{
3393	bool changed = false;	3414	bool changed = false;
		3415
3394	if (ISSET_PIXCOLOR (Color_tint))	3416	if (ISSET_PIXCOLOR (Color_tint))
3395	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3417	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396	else	3418	else
3397	changed = bgPixmap.unset_tint ();	3419	changed = bgPixmap.unset_tint ();
		3420
3398	if (changed)	3421	if (changed)
3399	update_background ();	3422	update_background ();
3400	}	3423	}
3401		3424
3402	break;	3425	break;
…		…
3425	changed++;	3448	changed++;
3426	str = strchr (str, ';');	3449	str = strchr (str, ';');
3427	if (str == NULL)	3450	if (str == NULL)
3428	bgPixmap.set_defaultGeometry ();	3451	bgPixmap.set_defaultGeometry ();
3429	}	3452	}
		3453
3430	while (str)	3454	while (str)
3431	{	3455	{
3432	str++;	3456	str++;
3433	if (bgPixmap.set_geometry (str))	3457	if (bgPixmap.set_geometry (str))
3434	changed++;	3458	changed++;
3435	str = strchr (str, ';');	3459	str = strchr (str, ';');
3436	}	3460	}
		3461
3437	if (changed)	3462	if (changed)
3438	update_background ();	3463	update_background ();
3439	}	3464	}
3440	break;	3465	break;
3441	#endif	3466	#endif
3442
3443	case Rxvt_restoreFG:
3444	set_window_color (Color_fg, str);
3445	break;
3446	case Rxvt_restoreBG:
3447	set_window_color (Color_bg, str);
3448	break;
3449		3467
3450	case XTerm_logfile:	3468	case XTerm_logfile:
3451	// TODO, when secure mode?	3469	// TODO, when secure mode?
3452	break;	3470	break;
3453		3471
…		…
3520	break;	3538	break;
3521	#endif	3539	#endif
3522		3540
3523	#if ENABLE_PERL	3541	#if ENABLE_PERL
3524	case URxvt_perl:	3542	case URxvt_perl:
3525	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));
3526	; // no responses yet
3527	break;	3544	break;
3528	#endif	3545	#endif
3529	}	3546	}
3530	}	3547	}
3531	/*----------------------------------------------------------------------*/	3548	/*----------------------------------------------------------------------*/
…		…
3554	{	3571	{
3555	if (mode == 'r')	3572	if (mode == 'r')
3556	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3573	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557	else	3574	else
3558	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3575	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559	PrivMode (state, bit);	3576	set_privmode (bit, state);
3560	}	3577	}
3561		3578
3562	return state;	3579	return state;
3563	}	3580	}
3564		3581
…		…
3572	static const struct	3589	static const struct
3573	{	3590	{
3574	const int argval;	3591	const int argval;
3575	const unsigned long bit;	3592	const unsigned long bit;
3576	} argtopriv[] = {	3593	} argtopriv[] = {
3577	{ 1, PrivMode_aplCUR },	3594	{ 1, PrivMode_aplCUR }, // DECCKM
3578	{ 2, PrivMode_vt52 },	3595	{ 2, PrivMode_vt52 },
3579	{ 3, PrivMode_132 },	3596	{ 3, PrivMode_132 }, // DECCOLM
3580	{ 4, PrivMode_smoothScroll },	3597	{ 4, PrivMode_smoothScroll }, // DECSCLM
3581	{ 5, PrivMode_rVideo },	3598	{ 5, PrivMode_rVideo }, // DECSCNM
3582	{ 6, PrivMode_relOrigin },	3599	{ 6, PrivMode_relOrigin }, // DECOM
3583	{ 7, PrivMode_Autowrap },	3600	{ 7, PrivMode_Autowrap }, // DECAWM
3584	// 8, bi-directional support mode	3601	// 8, auto-repeat keys // DECARM
3585	{ 9, PrivMode_MouseX10 },	3602	{ 9, PrivMode_MouseX10 },
3586	// 18, 19 printing-related	3603	// 18 end FF to printer after print screen
		3604	// 19 Print screen prints full screen/scorll region
3587	{ 25, PrivMode_VisibleCursor },	3605	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588	#ifdef scrollBar_esc	3606	#ifdef scrollBar_esc
3589	{ scrollBar_esc, PrivMode_scrollBar },	3607	{ scrollBar_esc, PrivMode_scrollBar },
3590	#endif	3608	#endif
3591	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3609	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3610	// 38, tektronix mode // DECTEK
3592	{ 40, PrivMode_132OK },	3611	{ 40, PrivMode_132OK },
3593	// 41 xterm more fixes NYI	3612	// 41 xterm more fixes NYI
3594	// 45 margin bell NYI	3613	// 45 margin bell NYI
3595	// 46 start logging	3614	// 46 start logging
3596	{ 47, PrivMode_Screen },	3615	{ 47, PrivMode_Screen },
3597	{ 66, PrivMode_aplKP },	3616	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598	#ifndef NO_BACKSPACE_KEY	3617	#ifndef NO_BACKSPACE_KEY
3599	{ 67, PrivMode_BackSpace },	3618	{ 67, PrivMode_BackSpace }, // DECBKM
3600	#endif	3619	#endif
3601	{ 1000, PrivMode_MouseX11 },	3620	{ 1000, PrivMode_MouseX11 },
3602	{ 1002, PrivMode_MouseBtnEvent },	3621	{ 1002, PrivMode_MouseBtnEvent },
3603	{ 1003, PrivMode_MouseAnyEvent },	3622	{ 1003, PrivMode_MouseAnyEvent },
3604	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3623	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3608	// 1037 send DEL for keypad delete NYI	3627	// 1037 send DEL for keypad delete NYI
3609	{ 1047, PrivMode_Screen },	3628	{ 1047, PrivMode_Screen },
3610	// 1048 save and restore cursor	3629	// 1048 save and restore cursor
3611	{ 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 */
3612	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3631	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3632	{ 2004, PrivMode_BracketPaste },
3613	};	3633	};
3614		3634
3615	if (nargs == 0)	3635	if (nargs == 0)
3616	return;	3636	return;
3617		3637
…		…
3642		3662
3643	scr_touch (true);	3663	scr_touch (true);
3644	break;	3664	break;
3645	#endif	3665	#endif
3646	case 1048: /* alternative cursor save */	3666	case 1048: /* alternative cursor save */
3647	case 1049:
3648	if (option (Opt_secondaryScreen))	3667	if (option (Opt_secondaryScreen))
3649	if (mode == 0)	3668	if (mode == 0)
3650	scr_cursor (RESTORE);	3669	scr_cursor (RESTORE);
3651	else if (mode == 1)	3670	else if (mode == 1)
3652	scr_cursor (SAVE);	3671	scr_cursor (SAVE);
…		…
3661	case 2: /* VT52 mode */	3680	case 2: /* VT52 mode */
3662	/* oddball mode. should be set regardless of set/reset	3681	/* oddball mode. should be set regardless of set/reset
3663	* parameter. Return from VT52 mode with an ESC < from	3682	* parameter. Return from VT52 mode with an ESC < from
3664	* within VT52 mode	3683	* within VT52 mode
3665	*/	3684	*/
3666	PrivMode (1, PrivMode_vt52);	3685	set_privmode (PrivMode_vt52, 1);
3667	break;	3686	break;
3668	case 3: /* 80/132 */	3687	case 3: /* 80/132 */
3669	if (priv_modes & PrivMode_132OK)	3688	if (priv_modes & PrivMode_132OK)
3670	set_widthheight (((state ? 132 : 80) * fwidth), height);	3689	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671	break;	3690	break;
3672	case 4: /* smooth scrolling */	3691	case 4: /* smooth scrolling */
3673	set_option (Opt_jumpScroll, !state);	3692	set_option (Opt_jumpScroll, !state);
3674	break;	3693	break;
3675	case 5: /* reverse video */	3694	case 5: /* reverse video */
…		…
3686	if (state) /* orthogonal */	3705	if (state) /* orthogonal */
3687	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3706	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3688	break;	3707	break;
3689	#ifdef scrollBar_esc	3708	#ifdef scrollBar_esc
3690	case scrollBar_esc:	3709	case scrollBar_esc:
3691	if (scrollbar_mapping (state))	3710	if (scrollBar.map (state))
3692	{	3711	{
3693	resize_all_windows (0, 0, 0);	3712	resize_all_windows (0, 0, 0);
3694	scr_touch (true);	3713	scr_touch (true);
3695	}	3714	}
3696	break;	3715	break;
…		…
3717	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3736	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718	vt_emask_mouse = PointerMotionMask;	3737	vt_emask_mouse = PointerMotionMask;
3719	}	3738	}
3720	else	3739	else
3721	vt_emask_mouse = NoEventMask;	3740	vt_emask_mouse = NoEventMask;
		3741
3722	vt_select_input ();	3742	vt_select_input ();
3723	break;	3743	break;
3724	case 1010: /* scroll to bottom on TTY output inhibit */	3744	case 1010: /* scroll to bottom on TTY output inhibit */
3725	set_option (Opt_scrollTtyOutput, !state);	3745	set_option (Opt_scrollTtyOutput, !state);
3726	break;	3746	break;
3727	case 1011: /* scroll to bottom on key press */	3747	case 1011: /* scroll to bottom on key press */
3728	set_option (Opt_scrollTtyKeypress, state);	3748	set_option (Opt_scrollTtyKeypress, state);
3729	break;	3749	break;
3730	case 1047: /* secondary screen w/ clearing last */	3750	case 1047: /* secondary screen w/ clearing last */
3731	if (option (Opt_secondaryScreen))	3751	if (option (Opt_secondaryScreen))
3732	if (current_screen != PRIMARY)	3752	if (!state)
3733	scr_erase_screen (2);	3753	scr_erase_screen (2);
		3754
3734	scr_change_screen (state);	3755	scr_change_screen (state);
3735	break;	3756	break;
3736	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
3737	scr_change_screen (state);	3762	scr_change_screen (state);
		3763
3738	if (option (Opt_secondaryScreen))	3764	if (option (Opt_secondaryScreen))
3739	if (current_screen != PRIMARY)	3765	if (state)
3740	scr_erase_screen (2);	3766	scr_erase_screen (2);
		3767	else
		3768	scr_cursor (RESTORE);
3741	break;	3769	break;
3742	default:	3770	default:
3743	break;	3771	break;
3744	}	3772	}
3745	}	3773	}

Diff Legend

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