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.386 by ayin, Fri Dec 28 11:02:31 2007 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 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.
…		…
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
…		…
410	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
411	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
412	#else	507	#else
413	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
414	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
415	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
416	{	513	{
417	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
418	return;	515	return;
419	}	516	}
…		…
484	}	581	}
485	}	582	}
486		583
487	#if ENABLE_FRILLS || ISO_14755	584	#if ENABLE_FRILLS || ISO_14755
488	// ISO 14755 support	585	// ISO 14755 support
489	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490	{	587	{
491	int hv;	588	int hv;
492		589
493	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
494	&& (keysym == XK_space || keysym == XK_KP_Space	591	&& (keysym == XK_space || keysym == XK_KP_Space
…		…
524	scr_overlay_off ();	621	scr_overlay_off ();
525	# endif	622	# endif
526	iso14755buf = 0;	623	iso14755buf = 0;
527	}	624	}
528	}	625	}
		626	else if (option (Opt_iso14755) &&
529	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	628	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
532	{	630	{
533	iso14755buf |= ISO_14755_STARTED;	631	iso14755buf |= ISO_14755_STARTED;
534	# if ISO_14755	632	# if ISO_14755
535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
546	}	644	}
547	#endif	645	#endif
548		646
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	648	{
		649	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		650	unsigned int newlen = 1;
		651
		652	switch (translate_keypad (keysym, kp))
551	{	653	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	654	#ifndef NO_BACKSPACE_KEY
553	newlen = 1;	655	case XK_BackSpace:
554	#ifdef XK_KP_Home	656	if (priv_modes & PrivMode_HaveBackSpace)
555	static const KeySym keypadtrans[] = {	657	{
556	XK_KP_7, // XK_KP_Home	658	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557	XK_KP_4, // XK_KP_Left	659	^ !!ctrl) ? '\b' : '\177';
558	XK_KP_8, // XK_KP_Up	660	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	};	661	}
		662	else
		663	strcpy (kbuf, rs[Rs_backspace_key]);
		664	break;
		665	#endif
		666	#ifndef NO_DELETE_KEY
		667	case XK_Delete:
		668	strcpy (kbuf, rs[Rs_delete_key]);
		669	break;
		670	#endif
		671	case XK_Tab:
		672	if (shft)
		673	strcpy (kbuf, "\033[Z");
		674	else
		675	{
		676	#ifdef CTRL_TAB_MAKES_META
		677	if (ctrl)
		678	meta = 1;
		679	#endif
		680	#ifdef MOD4_TAB_MAKES_META
		681	if (ev.state & Mod4Mask)
		682	meta = 1;
		683	#endif
		684	newlen = 0;
		685	}
		686	break;
571		687
572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	688	case XK_Up: /* "\033[A" */
		689	case XK_Down: /* "\033[B" */
		690	case XK_Right: /* "\033[C" */
		691	case XK_Left: /* "\033[D" */
		692	strcpy (kbuf, "\033[Z");
		693	kbuf[2] = "DACB"[keysym - XK_Left];
		694	/* do Shift first */
		695	if (shft)
		696	kbuf[2] = "dacb"[keysym - XK_Left];
		697	else if (ctrl)
		698	{
		699	kbuf[1] = 'O';
		700	kbuf[2] = "dacb"[keysym - XK_Left];
		701	}
		702	else if (priv_modes & PrivMode_aplCUR)
		703	kbuf[1] = 'O';
		704	break;
		705
		706	case XK_KP_Enter:
		707	/* allow shift to override */
		708	if (kp)
		709	{
		710	strcpy (kbuf, "\033OM");
		711	break;
		712	}
		713
		714	/* FALLTHROUGH */
		715
		716	case XK_Return:
		717	if (priv_modes & PrivMode_LFNL)
		718	{
		719	kbuf[0] = '\015';
		720	kbuf[1] = '\012';
		721	kbuf[2] = '\0';
		722	}
		723	else
		724	{
		725	kbuf[0] = '\015';
		726	kbuf[1] = '\0';
		727	}
		728	break;
		729
		730	case XK_KP_F1: /* "\033OP" */
		731	case XK_KP_F2: /* "\033OQ" */
		732	case XK_KP_F3: /* "\033OR" */
		733	case XK_KP_F4: /* "\033OS" */
		734	strcpy (kbuf, "\033OP");
		735	kbuf[2] += (keysym - XK_KP_F1);
		736	break;
		737
		738	case XK_KP_Multiply: /* "\033Oj" : "*" */
		739	case XK_KP_Add: /* "\033Ok" : "+" */
		740	case XK_KP_Separator: /* "\033Ol" : "," */
		741	case XK_KP_Subtract: /* "\033Om" : "-" */
		742	case XK_KP_Decimal: /* "\033On" : "." */
		743	case XK_KP_Divide: /* "\033Oo" : "/" */
		744	case XK_KP_0: /* "\033Op" : "0" */
		745	case XK_KP_1: /* "\033Oq" : "1" */
		746	case XK_KP_2: /* "\033Or" : "2" */
		747	case XK_KP_3: /* "\033Os" : "3" */
		748	case XK_KP_4: /* "\033Ot" : "4" */
		749	case XK_KP_5: /* "\033Ou" : "5" */
		750	case XK_KP_6: /* "\033Ov" : "6" */
		751	case XK_KP_7: /* "\033Ow" : "7" */
		752	case XK_KP_8: /* "\033Ox" : "8" */
		753	case XK_KP_9: /* "\033Oy" : "9" */
		754	/* allow shift to override */
		755	if (kp)
		756	{
		757	strcpy (kbuf, "\033Oj");
		758	kbuf[2] += (keysym - XK_KP_Multiply);
		759	}
		760	else
		761	{
		762	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		763	kbuf[1] = '\0';
		764	}
		765	break;
		766
		767	default:
573	{	768	{
574	unsigned int index = keysym - XK_KP_Home;	769	int param = map_function_key (keysym);
575	keysym = kp ? keypadtrans[index] : XK_Home + index;	770	if (param > 0)
		771	sprintf (kbuf,"\033[%d~", param);
		772	else
		773	newlen = 0;
576	}	774	}
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;	775	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	}	776	}
		777
		778	if (newlen)
		779	len = strlen (kbuf);
794		780
795	/*	781	/*
796	* Pass meta for all function keys, if 'meta' option set	782	* Pass meta for all function keys, if 'meta' option set
797	*/	783	*/
798	#ifdef META8_OPTION	784	#ifdef META8_OPTION
…		…
1032	}	1018	}
1033	while (row < end_row);	1019	while (row < end_row);
1034	}	1020	}
1035		1021
1036	scr_refresh ();	1022	scr_refresh ();
1037	scrollbar_show (1);	1023	scrollBar.show (1);
1038	#ifdef USE_XIM	1024	#ifdef USE_XIM
1039	IMSendSpot ();	1025	IMSendSpot ();
1040	#endif	1026	#endif
1041	}	1027	}
1042		1028
…		…
1078	{	1064	{
1079	if (scr_refresh_rend (RS_Blink, RS_Blink))	1065	if (scr_refresh_rend (RS_Blink, RS_Blink))
1080	{	1066	{
1081	hidden_text = !hidden_text;	1067	hidden_text = !hidden_text;
1082	want_refresh = 1;	1068	want_refresh = 1;
1083	refresh_check ();	1069	refresh_check ();
1084	}	1070	}
1085	else	1071	else
1086	w.stop ();	1072	w.stop ();
1087	}	1073	}
1088	#endif	1074	#endif
1089		1075
1090	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1076	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091	void	1077	void
1092	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1078	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093	{	1079	{
1094	if ((scrollbar_isUp () || scrollbar_isDn ())	1080	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095	&& scr_page (scrollbar_isUp () ? UP : DN, 1))	1081	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096	{	1082	{
1097	want_refresh = 1;	1083	want_refresh = 1;
1098	refresh_check ();	1084	refresh_check ();
1099	}	1085	}
1100	else	1086	else
…		…
1144	{	1130	{
1145	// this should really be sched_yield(), but the linux guys thought	1131	// this should really be sched_yield(), but the linux guys thought
1146	// that giving a process calling sched_yield () less cpu time than	1132	// 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	1133	// ones with high nice levels is a useful thing to do. It surely is is
1148	// allowed by the sus... as is returning ENOSYS.	1134	// allowed by the sus... as is returning ENOSYS.
		1135	// since the linux guys additionally thought that breaking the only
		1136	// known workaroudn against their unusable sched_yield hack is cool,
		1137	// we just nanosleep a bit and hope for the best.
1149		1138
1150	struct timespec ts = { 0, 0 };	1139	struct timespec ts = { 0, 1000 };
1151	nanosleep (&ts, 0);	1140	nanosleep (&ts, 0);
1152		1141
1153	w.stop ();	1142	w.stop ();
1154	}	1143	}
1155		1144
…		…
1205	{	1194	{
1206	make_current ();	1195	make_current ();
1207		1196
1208	if (revents & ev::READ)	1197	if (revents & ev::READ)
1209	// loop, but don't allow a single term to monopolize us	1198	// loop, but don't allow a single term to monopolize us
1210	while (pty_fill ())	1199	for (int i = CBUFCNT; i-- && pty_fill (); )
1211	if (cmd_parse ())	1200	cmd_parse ();
1212	break;
1213		1201
1214	if (revents & ev::WRITE)	1202	if (revents & ev::WRITE)
1215	pty_write ();	1203	pty_write ();
1216		1204
1217	refresh_check ();	1205	refresh_check ();
…		…
1437	&& ev.xfocus.mode != NotifyGrab)	1425	&& ev.xfocus.mode != NotifyGrab)
1438	focus_out ();	1426	focus_out ();
1439	break;	1427	break;
1440		1428
1441	case ConfigureNotify:	1429	case ConfigureNotify:
1442	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1430	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1431	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444	szHint.width, szHint.height); */	1432	szHint.width, szHint.height);*/
1445	if (ev.xconfigure.window == parent[0])	1433	if (ev.xconfigure.window == parent[0])
1446	{	1434	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1435	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1436	;
1449		1437
…		…
1454	}	1442	}
1455	else	1443	else
1456	{	1444	{
1457	#ifdef HAVE_BG_PIXMAP	1445	#ifdef HAVE_BG_PIXMAP
1458	if (bgPixmap.window_position_sensitive ())	1446	if (bgPixmap.window_position_sensitive ())
		1447	{
		1448	if (mapped)
1459	update_background ();	1449	update_background ();
		1450	else
		1451	bgPixmap.invalidate ();
		1452	}
1460	#endif	1453	#endif
1461	}	1454	}
1462		1455
1463	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1456	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464	}	1457	}
…		…
1471	selection_property (ev.xproperty.window, ev.xproperty.atom);	1464	selection_property (ev.xproperty.window, ev.xproperty.atom);
1472		1465
1473	break;	1466	break;
1474		1467
1475	case SelectionClear:	1468	case SelectionClear:
1476	selection_clear ();	1469	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1477	break;	1470	break;
1478		1471
1479	case SelectionNotify:	1472	case SelectionNotify:
1480	if (selection_wait == Sel_normal)	1473	if (selection_wait == Sel_normal)
1481	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1474	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1484	case SelectionRequest:	1477	case SelectionRequest:
1485	selection_send (ev.xselectionrequest);	1478	selection_send (ev.xselectionrequest);
1486	break;	1479	break;
1487		1480
1488	case MapNotify:	1481	case MapNotify:
		1482	#ifdef HAVE_BG_PIXMAP
		1483	/* This is needed spcifically to fix the case of no window manager or a
		1484	* non-reparenting window manager. In those cases we never get first
		1485	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1486	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1487	* reparenting.
		1488	* We should not render background immidiately, as there could be several
		1489	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1490	* by scheduling background redraw as soon as we can, but giving a short
		1491	* bit of time for ConfigureNotifies to arrive.
		1492	* We should render background PRIOR to drawing any text, but AFTER all
		1493	* of ConfigureNotifys for the best results.
		1494	*/
		1495	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1496	update_background_ev.start (0.025);
		1497	#endif
1489	mapped = 1;	1498	mapped = 1;
1490	#ifdef TEXT_BLINK	1499	#ifdef TEXT_BLINK
1491	text_blink_ev.start ();	1500	text_blink_ev.start ();
1492	#endif	1501	#endif
1493	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1502	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
…		…
1529	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1538	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1530	;	1539	;
1531	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1540	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1532	;	1541	;
1533		1542
1534	if (isScrollbarWindow (ev.xany.window))	1543	if (scrollBar.state && ev.xany.window == scrollBar.win)
1535	{	1544	{
1536	scrollBar.setIdle ();	1545	scrollBar.state = STATE_IDLE;
1537	scrollbar_show (0);	1546	scrollBar.show (0);
1538	}	1547	}
1539	}	1548	}
1540	break;	1549	break;
1541		1550
1542	case MotionNotify:	1551	case MotionNotify:
…		…
1629	#ifdef MOUSE_THRESHOLD	1638	#ifdef MOUSE_THRESHOLD
1630	}	1639	}
1631	#endif	1640	#endif
1632	}	1641	}
1633	}	1642	}
1634	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1643	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1635	{	1644	{
1636	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1645	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1637	MotionNotify, &ev))	1646	MotionNotify, &ev))
1638	;	1647	;
1639		1648
…		…
1641	&unused_root, &unused_child,	1650	&unused_root, &unused_child,
1642	&unused_root_x, &unused_root_y,	1651	&unused_root_x, &unused_root_y,
1643	&ev.xbutton.x, &ev.xbutton.y,	1652	&ev.xbutton.x, &ev.xbutton.y,
1644	&unused_mask);	1653	&unused_mask);
1645	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1654	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1646	scrollbar_size ());	1655	scrollBar.size ());
1647	want_refresh = 1;	1656	want_refresh = 1;
1648	scrollbar_show (1);	1657	scrollBar.show (1);
1649	}	1658	}
1650	break;	1659	break;
1651	}	1660	}
1652		1661
1653	#if defined(CURSOR_BLINK)	1662	#if defined(CURSOR_BLINK)
…		…
1678	#endif	1687	#endif
1679		1688
1680	refresh_check ();	1689	refresh_check ();
1681	}	1690	}
1682		1691
		1692	#if ENABLE_FRILLS
		1693	void
		1694	rxvt_term::set_urgency (bool enable)
		1695	{
		1696	if (enable == urgency_hint)
		1697	return;
		1698
		1699	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1700	{
		1701	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1702	XSetWMHints (dpy, parent[0], h);
		1703	urgency_hint = enable;
		1704	}
		1705	}
		1706	#endif
		1707
1683	void	1708	void
1684	rxvt_term::focus_in ()	1709	rxvt_term::focus_in ()
1685	{	1710	{
1686	if (!focus)	1711	if (!focus)
1687	{	1712	{
1688	focus = 1;	1713	focus = 1;
1689	want_refresh = 1;	1714	want_refresh = 1;
1690
1691	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1692		1715
1693	#if USE_XIM	1716	#if USE_XIM
1694	if (Input_Context != NULL)	1717	if (Input_Context != NULL)
1695	{	1718	{
1696	IMSetPosition ();	1719	IMSetPosition ();
…		…
1708	scr_recolour ();	1731	scr_recolour ();
1709	}	1732	}
1710	#endif	1733	#endif
1711	#if ENABLE_FRILLS	1734	#if ENABLE_FRILLS
1712	if (option (Opt_urgentOnBell))	1735	if (option (Opt_urgentOnBell))
1713	{	1736	set_urgency (0);
1714	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1715	{
1716	h->flags &= ~XUrgencyHint;
1717	XSetWMHints (dpy, parent[0], h);
1718	}
1719	}
1720	#endif	1737	#endif
		1738
		1739	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1721	}	1740	}
1722	}	1741	}
1723		1742
1724	void	1743	void
1725	rxvt_term::focus_out ()	1744	rxvt_term::focus_out ()
…		…
1727	if (focus)	1746	if (focus)
1728	{	1747	{
1729	focus = 0;	1748	focus = 0;
1730	want_refresh = 1;	1749	want_refresh = 1;
1731		1750
1732	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1751	#if ENABLE_FRILLS
1733		1752	if (option (Opt_urgentOnBell))
		1753	set_urgency (0);
		1754	#endif
1734	#if ENABLE_FRILLS || ISO_14755	1755	#if ENABLE_FRILLS || ISO_14755
1735	if (iso14755buf)	1756	if (iso14755buf)
1736	{	1757	{
1737	iso14755buf = 0;	1758	iso14755buf = 0;
1738	# if ISO_14755	1759	# if ISO_14755
…		…
1755	{	1776	{
1756	pix_colors = pix_colors_unfocused;	1777	pix_colors = pix_colors_unfocused;
1757	scr_recolour ();	1778	scr_recolour ();
1758	}	1779	}
1759	#endif	1780	#endif
		1781
		1782	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760	}	1783	}
1761	}	1784	}
1762		1785
1763	void	1786	void
1764	rxvt_term::update_fade_color (unsigned int idx)	1787	rxvt_term::update_fade_color (unsigned int idx)
…		…
1923	}	1946	}
1924		1947
1925	/*	1948	/*
1926	* Scrollbar window processing of button press	1949	* Scrollbar window processing of button press
1927	*/	1950	*/
1928	if (isScrollbarWindow (ev.window))	1951	if (scrollBar.state && ev.window == scrollBar.win)
1929	{	1952	{
1930	scrollBar.setIdle ();	1953	page_dirn direction = NO_DIR;
		1954
		1955	if (scrollBar.upButton (ev.y))
		1956	direction = UP; /* up */
		1957	else if (scrollBar.dnButton (ev.y))
		1958	direction = DN; /* down */
		1959
		1960	scrollBar.state = STATE_IDLE;
1931	/*	1961	/*
1932	* Rxvt-style scrollbar:	1962	* Rxvt-style scrollbar:
1933	* move up if mouse is above slider	1963	* move up if mouse is above slider
1934	* move dn if mouse is below slider	1964	* move dn if mouse is below slider
1935	*	1965	*
…		…
1944	/*	1974	/*
1945	* Mouse report disabled scrollbar:	1975	* Mouse report disabled scrollbar:
1946	* arrow buttons - send up/down	1976	* arrow buttons - send up/down
1947	* click on scrollbar - send pageup/down	1977	* click on scrollbar - send pageup/down
1948	*/	1978	*/
1949	if ((scrollBar.style == R_SB_NEXT	1979	if (direction == UP)
1950	&& scrollbarnext_upButton (ev.y))
1951	|| (scrollBar.style == R_SB_RXVT
1952	&& scrollbarrxvt_upButton (ev.y)))
1953	tt_printf ("\033[A");	1980	tt_printf ("\033[A");
1954	else if ((scrollBar.style == R_SB_NEXT	1981	else if (direction == DN)
1955	&& scrollbarnext_dnButton (ev.y))
1956	|| (scrollBar.style == R_SB_RXVT
1957	&& scrollbarrxvt_dnButton (ev.y)))
1958	tt_printf ("\033[B");	1982	tt_printf ("\033[B");
1959	else	1983	else
1960	switch (ev.button)	1984	switch (ev.button)
1961	{	1985	{
1962	case Button2:	1986	case Button2:
…		…
1970	break;	1994	break;
1971	}	1995	}
1972	}	1996	}
1973	else	1997	else
1974	#endif /* NO_SCROLLBAR_REPORT */	1998	#endif /* NO_SCROLLBAR_REPORT */
1975
1976	{
1977	char upordown = 0;
1978
1979	if (scrollBar.style == R_SB_NEXT)
1980	{	1999	{
1981	if (scrollbarnext_upButton (ev.y))	2000	if (direction != NO_DIR)
1982	upordown = -1; /* up */
1983	else if (scrollbarnext_dnButton (ev.y))
1984	upordown = 1; /* down */
1985	}
1986	else if (scrollBar.style == R_SB_RXVT)
1987	{
1988	if (scrollbarrxvt_upButton (ev.y))
1989	upordown = -1; /* up */
1990	else if (scrollbarrxvt_dnButton (ev.y))
1991	upordown = 1; /* down */
1992	}
1993
1994	if (upordown)
1995	{	2001	{
1996	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2002	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997	if (!cont_scroll_ev.is_active ())	2003	if (!cont_scroll_ev.is_active ())
1998	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2004	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999	#endif	2005	#endif
2000	if (scr_page (upordown < 0 ? UP : DN, 1))	2006	if (scr_page (direction, 1))
2001	{	2007	{
2002	if (upordown < 0)	2008	if (direction == UP)
2003	scrollBar.setUp ();	2009	scrollBar.state = STATE_UP;
2004	else	2010	else
2005	scrollBar.setDn ();	2011	scrollBar.state = STATE_DOWN;
2006	}	2012	}
2007	}	2013	}
2008	else	2014	else
2009	switch (ev.button)	2015	switch (ev.button)
2010	{	2016	{
2011	case Button2:	2017	case Button2:
2012	switch (scrollbar_align)	2018	switch (scrollBar.align)
2013	{	2019	{
2014	case R_SB_ALIGN_TOP:	2020	case R_SB_ALIGN_TOP:
2015	csrO = 0;	2021	csrO = 0;
2016	break;	2022	break;
2017	case R_SB_ALIGN_CENTRE:	2023	case R_SB_ALIGN_CENTRE:
…		…
2023	}	2029	}
2024		2030
2025	if (scrollBar.style == R_SB_XTERM	2031	if (scrollBar.style == R_SB_XTERM
2026	|| scrollbar_above_slider (ev.y)	2032	|| scrollbar_above_slider (ev.y)
2027	|| scrollbar_below_slider (ev.y))	2033	|| scrollbar_below_slider (ev.y))
2028	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2034	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2029		2035
2030	scrollBar.setMotion ();	2036	scrollBar.state = STATE_MOTION;
2031	break;	2037	break;
2032		2038
2033	case Button1:	2039	case Button1:
2034	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2040	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035	csrO = ev.y - scrollBar.top;	2041	csrO = ev.y - scrollBar.top;
2036	/* FALLTHROUGH */	2042	/* FALLTHROUGH */
2037		2043
2038	case Button3:	2044	case Button3:
2039	if (scrollBar.style != R_SB_XTERM)	2045	if (scrollBar.style != R_SB_XTERM)
…		…
2049	scr_page (DN, nrow - 1);	2055	scr_page (DN, nrow - 1);
2050	# else	2056	# else
2051	scr_page (DN, nrow / 4);	2057	scr_page (DN, nrow / 4);
2052	# endif	2058	# endif
2053	else	2059	else
2054	scrollBar.setMotion ();	2060	scrollBar.state = STATE_MOTION;
2055	}	2061	}
2056	else	2062	else
2057	{	2063	{
2058	scr_page ((ev.button == Button1 ? DN : UP),	2064	scr_page ((ev.button == Button1 ? DN : UP),
2059	(nrow	2065	(nrow
2060	* scrollbar_position (ev.y)	2066	* scrollbar_position (ev.y)
2061	/ scrollbar_size ()));	2067	/ scrollBar.size ()));
2062	}	2068	}
2063		2069
2064	break;	2070	break;
2065	}	2071	}
2066	}	2072	}
…		…
2076		2082
2077	csrO = 0; /* reset csr Offset */	2083	csrO = 0; /* reset csr Offset */
2078	if (!bypass_keystate)	2084	if (!bypass_keystate)
2079	reportmode = !! (priv_modes & PrivMode_mouse_report);	2085	reportmode = !! (priv_modes & PrivMode_mouse_report);
2080		2086
2081	if (scrollbar_isUpDn ())	2087	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2082	{	2088	{
2083	scrollBar.setIdle ();	2089	scrollBar.state = STATE_IDLE;
2084	scrollbar_show (0);	2090	scrollBar.show (0);
2085	}	2091	}
2086		2092
2087	#ifdef SELECTION_SCROLLING	2093	#ifdef SELECTION_SCROLLING
2088	sel_scroll_ev.stop();	2094	sel_scroll_ev.stop();
2089	#endif	2095	#endif
…		…
2169		2175
2170	if (!slip_wheel_ev.is_active ())	2176	if (!slip_wheel_ev.is_active ())
2171	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2177	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172	}	2178	}
2173	else	2179	else
		2180	# endif
2174	{	2181	{
2175	# endif
2176	scr_page (v, i);	2182	scr_page (v, i);
2177	scrollbar_show (1);	2183	scrollBar.show (1);
2178	# ifdef MOUSE_SLIP_WHEELING
2179	}	2184	}
2180	# endif
2181	}	2185	}
2182	break;	2186	break;
2183	#endif	2187	#endif
2184	}	2188	}
2185	}	2189	}
2186	}	2190	}
2187		2191
2188	/*}}} */	2192	/*}}} */
2189		2193
2190	bool	2194	void
2191	rxvt_term::cmd_parse ()	2195	rxvt_term::cmd_parse ()
2192	{	2196	{
2193	bool flag = false;
2194	wchar_t ch = NOCHAR;	2197	wchar_t ch = NOCHAR;
2195	char *seq_begin; // remember start of esc-sequence here	2198	char *seq_begin; // remember start of esc-sequence here
2196		2199
2197	for (;;)	2200	for (;;)
2198	{	2201	{
2199	if (ch == NOCHAR)	2202	if (expect_false (ch == NOCHAR))
2200	{	2203	{
2201	seq_begin = cmdbuf_ptr;	2204	seq_begin = cmdbuf_ptr;
2202	ch = next_char ();	2205	ch = next_char ();
2203		2206
2204	if (ch == NOCHAR)	2207	if (ch == NOCHAR)
2205	break;	2208	break;
2206	}	2209	}
2207		2210
2208	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2211	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209	{	2212	{
2210	if (!seen_input)	2213	if (expect_false (!seen_input))
2211	{	2214	{
2212	seen_input = 1;	2215	seen_input = 1;
2213	// many badly-written programs (e.g. jed) contain a race condition:	2216	// many badly-written programs (e.g. jed) contain a race condition:
2214	// they first read the screensize and then install a SIGWINCH handler.	2217	// they first read the screensize and then install a SIGWINCH handler.
2215	// some window managers resize the window early, and these programs	2218	// some window managers resize the window early, and these programs
…		…
2228	wchar_t *str = buf;	2231	wchar_t *str = buf;
2229	wchar_t *eol = str + min (ncol, UBUFSIZ);	2232	wchar_t *eol = str + min (ncol, UBUFSIZ);
2230		2233
2231	for (;;)	2234	for (;;)
2232	{	2235	{
2233	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2236	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234	break;	2237	break;
2235		2238
2236	*str++ = ch;	2239	*str++ = ch;
2237		2240
2238	if (ch == C0_LF || str >= eol)	2241	if (expect_false (ch == C0_LF || str >= eol))
2239	{	2242	{
2240	if (ch == C0_LF)	2243	if (ch == C0_LF)
2241	nlines++;	2244	nlines++;
2242		2245
2243	refresh_count++;	2246	refresh_count++;
…		…
2292	* What the heck we'll cheat and only refresh less than every page-full.	2295	* What the heck we'll cheat and only refresh less than every page-full.
2293	* if skipScroll is enabled.	2296	* if skipScroll is enabled.
2294	*/	2297	*/
2295	if (refreshnow)	2298	if (refreshnow)
2296	{	2299	{
2297	flag = true;
2298	scr_refresh ();	2300	scr_refresh ();
2299	want_refresh = 1;	2301	want_refresh = 1;
2300	}	2302	}
2301
2302	}	2303	}
2303	else	2304	else
2304	{	2305	{
2305	try	2306	try
2306	{	2307	{
…		…
2314	}	2315	}
2315		2316
2316	ch = NOCHAR;	2317	ch = NOCHAR;
2317	}	2318	}
2318	}	2319	}
2319
2320	return flag;
2321	}	2320	}
2322		2321
2323	// read the next character	2322	// read the next character
2324	wchar_t	2323	wchar_t
2325	rxvt_term::next_char () NOTHROW	2324	rxvt_term::next_char () NOTHROW
2326	{	2325	{
2327	while (cmdbuf_ptr < cmdbuf_endp)	2326	while (cmdbuf_ptr < cmdbuf_endp)
2328	{	2327	{
2329	// assume 7-bit to be ascii ALWAYS	2328	// assume 7-bit to be ascii ALWAYS
2330	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2329	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331	return *cmdbuf_ptr++;	2330	return *cmdbuf_ptr++;
2332		2331
2333	wchar_t wc;	2332	wchar_t wc;
2334	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2333	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335		2334
…		…
2339	cmdbuf_ptr = cmdbuf_endp;	2338	cmdbuf_ptr = cmdbuf_endp;
2340	break;	2339	break;
2341	}	2340	}
2342		2341
2343	if (len == (size_t)-1)	2342	if (len == (size_t)-1)
		2343	{
		2344	mbstate.reset (); // reset now undefined conversion state
2344	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2345	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2346	}
2345		2347
2346	// assume wchar == unicode	2348	// assume wchar == unicode
2347	cmdbuf_ptr += len;	2349	cmdbuf_ptr += len;
2348	return wc & UNICODE_MASK;	2350	return wc & UNICODE_MASK;
2349	}	2351	}
…		…
2393	/*----------------------------------------------------------------------*/	2395	/*----------------------------------------------------------------------*/
2394	#ifdef PRINTPIPE	2396	#ifdef PRINTPIPE
2395	FILE *	2397	FILE *
2396	rxvt_term::popen_printer ()	2398	rxvt_term::popen_printer ()
2397	{	2399	{
2398	FILE *stream = popen (rs[Rs_print_pipe], "w");	2400	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399		2401
2400	if (stream == NULL)	2402	if (stream == NULL)
2401	rxvt_warn ("can't open printer pipe, not printing.\n");	2403	rxvt_warn ("can't open printer pipe, not printing.\n");
2402		2404
2403	return stream;	2405	return stream;
…		…
2414	* simulate attached vt100 printer	2416	* simulate attached vt100 printer
2415	*/	2417	*/
2416	void	2418	void
2417	rxvt_term::process_print_pipe ()	2419	rxvt_term::process_print_pipe ()
2418	{	2420	{
2419	int done;	2421	FILE *fd = popen_printer ();
2420	FILE *fd;
2421		2422
2422	if ((fd = popen_printer ()) == NULL)	2423	if (!fd)
2423	return;	2424	return;
2424		2425
2425	/*	2426	/*
2426	* Send all input to the printer until either ESC[4i or ESC[?4i	2427	* Send all input to the printer until either ESC[4i or ESC[?4i
2427	* is received.	2428	* is received.
2428	*/	2429	*/
2429	for (done = 0; !done;)	2430	for (int done = 0; !done; )
2430	{	2431	{
2431	unsigned char buf[8];	2432	unsigned char buf[8];
2432	unicode_t ch;	2433	unicode_t ch;
2433	unsigned int i, len;	2434	unsigned int i, len;
2434		2435
…		…
2579	break;	2580	break;
2580	case 'Z': /* identify the terminal type */	2581	case 'Z': /* identify the terminal type */
2581	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2582	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582	break;	2583	break;
2583	case '<': /* turn off VT52 mode */	2584	case '<': /* turn off VT52 mode */
2584	PrivMode (0, PrivMode_vt52);	2585	set_privmode (PrivMode_vt52, 0);
2585	break;	2586	break;
2586	case 'F': /* use special graphics character set */	2587	case 'F': /* use special graphics character set */
2587	case 'G': /* use regular character set */	2588	case 'G': /* use regular character set */
2588	/* unimplemented */	2589	/* unimplemented */
2589	break;	2590	break;
…		…
2643	scr_forwardindex ();	2644	scr_forwardindex ();
2644	break;	2645	break;
2645	#endif	2646	#endif
2646	case '=':	2647	case '=':
2647	case '>':	2648	case '>':
2648	PrivMode ((ch == '='), PrivMode_aplKP);	2649	set_privmode (PrivMode_aplKP, ch == '=');
2649	break;	2650	break;
2650		2651
2651	case C1_40:	2652	case C1_40:
2652	cmd_getc ();	2653	cmd_getc ();
2653	break;	2654	break;
…		…
2692	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2693	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693	case C1_SCI: /* ESC Z */	2694	case C1_SCI: /* ESC Z */
2694	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2695	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695	break; /* steal obsolete ESC [ c */	2696	break; /* steal obsolete ESC [ c */
2696		2697
2697	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2698	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698	case C1_CSI: /* ESC [ */	2699	case C1_CSI: /* ESC [ */
2699	process_csi_seq ();	2700	process_csi_seq ();
2700	break;	2701	break;
2701		2702
2702	/* 8.3.90: OPERATING SYSTEM COMMAND */	2703	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703	case C1_OSC: /* ESC ] */	2704	case C1_OSC: /* ESC ] */
2704	process_osc_seq ();	2705	process_osc_seq ();
2705	break;	2706	break;
2706		2707
2707	/* 8.3.106: RESET TO INITIAL STATE */	2708	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708	case 'c':	2709	case 'c':
2709	mbstate.reset ();	2710	mbstate.reset ();
2710	scr_poweron ();	2711	scr_poweron ();
2711	scrollbar_show (1);	2712	scrollBar.show (1);
2712	break;	2713	break;
2713		2714
2714	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2715	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715	case 'n':	2716	case 'n':
2716	scr_charset_choose (2);	2717	scr_charset_choose (2);
…		…
2767		2768
2768	nargs = 0;	2769	nargs = 0;
2769		2770
2770	priv = 0;	2771	priv = 0;
2771	ch = cmd_getc ();	2772	ch = cmd_getc ();
2772	if (ch >= '<' && ch <= '?')	2773	if ((ch >= '<' && ch <= '?') || ch == '!')
2773	{	2774	{
2774	/* '<' '=' '>' '?' */	2775	/* '<' '=' '>' '?' '!' */
2775	priv = ch;	2776	priv = ch;
2776	ch = cmd_getc ();	2777	ch = cmd_getc ();
2777	}	2778	}
2778		2779
2779	/* read any numerical arguments */	2780	/* read any numerical arguments */
…		…
2828	// versions.	2829	// versions.
2829	//	2830	//
2830	tt_printf ("\033[>%d;95;0c", 'U');	2831	tt_printf ("\033[>%d;95;0c", 'U');
2831	}	2832	}
2832	break;	2833	break;
		2834
2833	case '?':	2835	case '?':
2834	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2836	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835	process_terminal_mode (ch, priv, nargs, arg);	2837	process_terminal_mode (ch, priv, nargs, arg);
2836	break;	2838	break;
		2839
		2840	case '!':
		2841	if (ch == CSI_70)
		2842	{
		2843	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2844	scr_soft_reset ();
		2845
		2846	static const int pm_h[] = { 7, 25 };
		2847	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2848
		2849	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2850	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2837	}	2851	}
		2852	break;
		2853	}
		2854
2838	return;	2855	return;
2839	}	2856	}
2840		2857
2841	switch (ch)	2858	switch (ch)
2842	{	2859	{
…		…
3271		3288
3272	/*	3289	/*
3273	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3290	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274	*/	3291	*/
3275	void	3292	void
3276	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3293	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277	{	3294	{
3278	int color;	3295	int color;
3279	char *buf, *name;	3296	char *buf, *name;
3280	bool query = str[0] == '?' && !str[1];	3297	bool query = str[0] == '?' && !str[1];
3281	int saveop = op;	3298	int saveop = op;
…		…
3322		3339
3323	XFree (value);	3340	XFree (value);
3324	}	3341	}
3325	else	3342	else
3326	{	3343	{
3327	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3344	char *eq = strchr (str, '=');
3328		3345
3329	if (eq)	3346	if (eq)
3330	{	3347	{
3331	*eq = 0;	3348	*eq = 0;
3332	set_utf8_property (display->atom (str), eq + 1);	3349	set_utf8_property (display->atom (str), eq + 1);
…		…
3353	*buf++ = '\0';	3370	*buf++ = '\0';
3354		3371
3355	process_color_seq (op, color, name, resp);	3372	process_color_seq (op, color, name, resp);
3356	}	3373	}
3357	break;	3374	break;
		3375	case Rxvt_restoreFG:
3358	case XTerm_Color00:	3376	case XTerm_Color00:
3359	process_color_seq (op, Color_fg, str, resp);	3377	process_color_seq (op, Color_fg, str, resp);
3360	break;	3378	break;
		3379	case Rxvt_restoreBG:
3361	case XTerm_Color01:	3380	case XTerm_Color01:
3362	process_color_seq (op, Color_bg, str, resp);	3381	process_color_seq (op, Color_bg, str, resp);
3363	break;	3382	break;
3364	#ifndef NO_CURSORCOLOR	3383	#ifndef NO_CURSORCOLOR
3365	case XTerm_Color_cursor:	3384	case XTerm_Color_cursor:
…		…
3386	break;	3405	break;
3387	case URxvt_Color_IT:	3406	case URxvt_Color_IT:
3388	process_color_seq (op, Color_IT, str, resp);	3407	process_color_seq (op, Color_IT, str, resp);
3389	break;	3408	break;
3390	#endif	3409	#endif
		3410	case URxvt_Color_border:
		3411	process_color_seq (op, Color_border, str, resp);
		3412	break;
3391	#if ENABLE_TRANSPARENCY	3413	#if ENABLE_TRANSPARENCY
3392	case URxvt_Color_tint:	3414	case URxvt_Color_tint:
3393	process_color_seq (op, Color_tint, str, resp);	3415	process_color_seq (op, Color_tint, str, resp);
3394	{	3416	{
3395	bool changed = false;	3417	bool changed = false;
…		…
3410	case Rxvt_Pixmap:	3432	case Rxvt_Pixmap:
3411	if (!strcmp (str, "?"))	3433	if (!strcmp (str, "?"))
3412	{	3434	{
3413	char str[256];	3435	char str[256];
3414		3436
3415	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3437	sprintf (str, "[%dx%d+%d+%d]",
3416	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3438	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3417	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3439	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3418	process_xterm_seq (XTerm_title, str, CHAR_ST);	3440	process_xterm_seq (XTerm_title, str, CHAR_ST);
3419	}	3441	}
3420	else	3442	else
…		…
3444	update_background ();	3466	update_background ();
3445	}	3467	}
3446	break;	3468	break;
3447	#endif	3469	#endif
3448		3470
3449	case Rxvt_restoreFG:
3450	set_window_color (Color_fg, str);
3451	break;
3452	case Rxvt_restoreBG:
3453	set_window_color (Color_bg, str);
3454	break;
3455
3456	case XTerm_logfile:	3471	case XTerm_logfile:
3457	// TODO, when secure mode?	3472	// TODO, when secure mode?
3458	break;	3473	break;
3459		3474
3460	#if 0	3475	#if 0
…		…
3526	break;	3541	break;
3527	#endif	3542	#endif
3528		3543
3529	#if ENABLE_PERL	3544	#if ENABLE_PERL
3530	case URxvt_perl:	3545	case URxvt_perl:
3531	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3546	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3532	; // no responses yet
3533	break;	3547	break;
3534	#endif	3548	#endif
3535	}	3549	}
3536	}	3550	}
3537	/*----------------------------------------------------------------------*/	3551	/*----------------------------------------------------------------------*/
…		…
3560	{	3574	{
3561	if (mode == 'r')	3575	if (mode == 'r')
3562	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3576	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3563	else	3577	else
3564	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3578	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3565	PrivMode (state, bit);	3579	set_privmode (bit, state);
3566	}	3580	}
3567		3581
3568	return state;	3582	return state;
3569	}	3583	}
3570		3584
…		…
3578	static const struct	3592	static const struct
3579	{	3593	{
3580	const int argval;	3594	const int argval;
3581	const unsigned long bit;	3595	const unsigned long bit;
3582	} argtopriv[] = {	3596	} argtopriv[] = {
3583	{ 1, PrivMode_aplCUR },	3597	{ 1, PrivMode_aplCUR }, // DECCKM
3584	{ 2, PrivMode_vt52 },	3598	{ 2, PrivMode_vt52 },
3585	{ 3, PrivMode_132 },	3599	{ 3, PrivMode_132 }, // DECCOLM
3586	{ 4, PrivMode_smoothScroll },	3600	{ 4, PrivMode_smoothScroll }, // DECSCLM
3587	{ 5, PrivMode_rVideo },	3601	{ 5, PrivMode_rVideo }, // DECSCNM
3588	{ 6, PrivMode_relOrigin },	3602	{ 6, PrivMode_relOrigin }, // DECOM
3589	{ 7, PrivMode_Autowrap },	3603	{ 7, PrivMode_Autowrap }, // DECAWM
3590	// 8, bi-directional support mode	3604	// 8, auto-repeat keys // DECARM
3591	{ 9, PrivMode_MouseX10 },	3605	{ 9, PrivMode_MouseX10 },
3592	// 18, 19 printing-related	3606	// 18 end FF to printer after print screen
		3607	// 19 Print screen prints full screen/scorll region
3593	{ 25, PrivMode_VisibleCursor },	3608	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3594	#ifdef scrollBar_esc	3609	#ifdef scrollBar_esc
3595	{ scrollBar_esc, PrivMode_scrollBar },	3610	{ scrollBar_esc, PrivMode_scrollBar },
3596	#endif	3611	#endif
3597	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3612	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3613	// 38, tektronix mode // DECTEK
3598	{ 40, PrivMode_132OK },	3614	{ 40, PrivMode_132OK },
3599	// 41 xterm more fixes NYI	3615	// 41 xterm more fixes NYI
3600	// 45 margin bell NYI	3616	// 45 margin bell NYI
3601	// 46 start logging	3617	// 46 start logging
3602	{ 47, PrivMode_Screen },	3618	{ 47, PrivMode_Screen },
3603	{ 66, PrivMode_aplKP },	3619	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3604	#ifndef NO_BACKSPACE_KEY	3620	#ifndef NO_BACKSPACE_KEY
3605	{ 67, PrivMode_BackSpace },	3621	{ 67, PrivMode_BackSpace }, // DECBKM
3606	#endif	3622	#endif
3607	{ 1000, PrivMode_MouseX11 },	3623	{ 1000, PrivMode_MouseX11 },
3608	{ 1002, PrivMode_MouseBtnEvent },	3624	{ 1002, PrivMode_MouseBtnEvent },
3609	{ 1003, PrivMode_MouseAnyEvent },	3625	{ 1003, PrivMode_MouseAnyEvent },
3610	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3614	// 1037 send DEL for keypad delete NYI	3630	// 1037 send DEL for keypad delete NYI
3615	{ 1047, PrivMode_Screen },	3631	{ 1047, PrivMode_Screen },
3616	// 1048 save and restore cursor	3632	// 1048 save and restore cursor
3617	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3633	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3634	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3635	{ 2004, PrivMode_BracketPaste },
3619	};	3636	};
3620		3637
3621	if (nargs == 0)	3638	if (nargs == 0)
3622	return;	3639	return;
3623		3640
…		…
3648		3665
3649	scr_touch (true);	3666	scr_touch (true);
3650	break;	3667	break;
3651	#endif	3668	#endif
3652	case 1048: /* alternative cursor save */	3669	case 1048: /* alternative cursor save */
3653	case 1049:
3654	if (option (Opt_secondaryScreen))	3670	if (option (Opt_secondaryScreen))
3655	if (mode == 0)	3671	if (mode == 0)
3656	scr_cursor (RESTORE);	3672	scr_cursor (RESTORE);
3657	else if (mode == 1)	3673	else if (mode == 1)
3658	scr_cursor (SAVE);	3674	scr_cursor (SAVE);
…		…
3667	case 2: /* VT52 mode */	3683	case 2: /* VT52 mode */
3668	/* oddball mode. should be set regardless of set/reset	3684	/* oddball mode. should be set regardless of set/reset
3669	* parameter. Return from VT52 mode with an ESC < from	3685	* parameter. Return from VT52 mode with an ESC < from
3670	* within VT52 mode	3686	* within VT52 mode
3671	*/	3687	*/
3672	PrivMode (1, PrivMode_vt52);	3688	set_privmode (PrivMode_vt52, 1);
3673	break;	3689	break;
3674	case 3: /* 80/132 */	3690	case 3: /* 80/132 */
3675	if (priv_modes & PrivMode_132OK)	3691	if (priv_modes & PrivMode_132OK)
3676	set_widthheight (((state ? 132 : 80) * fwidth), height);	3692	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3677	break;	3693	break;
3678	case 4: /* smooth scrolling */	3694	case 4: /* smooth scrolling */
3679	set_option (Opt_jumpScroll, !state);	3695	set_option (Opt_jumpScroll, !state);
3680	break;	3696	break;
3681	case 5: /* reverse video */	3697	case 5: /* reverse video */
…		…
3692	if (state) /* orthogonal */	3708	if (state) /* orthogonal */
3693	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3709	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694	break;	3710	break;
3695	#ifdef scrollBar_esc	3711	#ifdef scrollBar_esc
3696	case scrollBar_esc:	3712	case scrollBar_esc:
3697	if (scrollbar_mapping (state))	3713	if (scrollBar.map (state))
3698	{	3714	{
3699	resize_all_windows (0, 0, 0);	3715	resize_all_windows (0, 0, 0);
3700	scr_touch (true);	3716	scr_touch (true);
3701	}	3717	}
3702	break;	3718	break;
…		…
3723	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3739	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724	vt_emask_mouse = PointerMotionMask;	3740	vt_emask_mouse = PointerMotionMask;
3725	}	3741	}
3726	else	3742	else
3727	vt_emask_mouse = NoEventMask;	3743	vt_emask_mouse = NoEventMask;
		3744
3728	vt_select_input ();	3745	vt_select_input ();
3729	break;	3746	break;
3730	case 1010: /* scroll to bottom on TTY output inhibit */	3747	case 1010: /* scroll to bottom on TTY output inhibit */
3731	set_option (Opt_scrollTtyOutput, !state);	3748	set_option (Opt_scrollTtyOutput, !state);
3732	break;	3749	break;
3733	case 1011: /* scroll to bottom on key press */	3750	case 1011: /* scroll to bottom on key press */
3734	set_option (Opt_scrollTtyKeypress, state);	3751	set_option (Opt_scrollTtyKeypress, state);
3735	break;	3752	break;
3736	case 1047: /* secondary screen w/ clearing last */	3753	case 1047: /* secondary screen w/ clearing last */
3737	if (option (Opt_secondaryScreen))	3754	if (option (Opt_secondaryScreen))
3738	if (current_screen != PRIMARY)	3755	if (!state)
3739	scr_erase_screen (2);	3756	scr_erase_screen (2);
		3757
3740	scr_change_screen (state);	3758	scr_change_screen (state);
3741	break;	3759	break;
3742	case 1049: /* secondary screen w/ clearing first */	3760	case 1049: /* secondary screen w/ clearing first */
		3761	if (option (Opt_secondaryScreen))
		3762	if (state)
		3763	scr_cursor (SAVE);
		3764
3743	scr_change_screen (state);	3765	scr_change_screen (state);
		3766
3744	if (option (Opt_secondaryScreen))	3767	if (option (Opt_secondaryScreen))
3745	if (current_screen != PRIMARY)	3768	if (state)
3746	scr_erase_screen (2);	3769	scr_erase_screen (2);
		3770	else
		3771	scr_cursor (RESTORE);
3747	break;	3772	break;
3748	default:	3773	default:
3749	break;	3774	break;
3750	}	3775	}
3751	}	3776	}

Diff Legend

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