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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.424 by root, Tue Nov 4 23:46:22 2008 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
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-2006 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
1043	display->flush ();	1026	display->flush ();
1044	}	1027	}
1045		1028
		1029	/* checks wether a refresh is requested and starts the refresh timer */
1046	void	1030	void
1047	rxvt_term::prepare_cb (ev::prepare &w, int revents)	1031	rxvt_term::refresh_check ()
1048	{	1032	{
1049	make_current ();	1033	if (want_refresh && !flush_ev.is_active ())
		1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050		1035
1051	display->flush ();	1036	display->flush ();
1052
1053	if (want_refresh && !ev_is_active (&flush_ev))
1054	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055	}	1037	}
1056		1038
1057	void	1039	void
1058	rxvt_term::flush_cb (ev::timer &w, int revents)	1040	rxvt_term::flush_cb (ev::timer &w, int revents)
1059	{	1041	{
…		…
1067	void	1049	void
1068	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1050	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069	{	1051	{
1070	hidden_cursor = !hidden_cursor;	1052	hidden_cursor = !hidden_cursor;
1071	want_refresh = 1;	1053	want_refresh = 1;
		1054	refresh_check ();
1072	}	1055	}
1073	#endif	1056	#endif
1074		1057
1075	#ifdef TEXT_BLINK	1058	#ifdef TEXT_BLINK
1076	void	1059	void
…		…
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;
		1066	refresh_check ();
1083	}	1067	}
1084	else	1068	else
1085	w.stop ();	1069	w.stop ();
1086	}	1070	}
1087	#endif	1071	#endif
1088		1072
1089	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1073	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090	void	1074	void
1091	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1075	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092	{	1076	{
1093	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1077	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094	scr_page (scrollbar_isUp() ? UP : DN, 1))	1078	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
		1079	{
1095	want_refresh = 1;	1080	want_refresh = 1;
		1081	refresh_check ();
		1082	}
1096	else	1083	else
1097	w.stop ();	1084	w.stop ();
1098	}	1085	}
1099	#endif	1086	#endif
1100		1087
…		…
1104	{	1091	{
1105	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1092	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106	{	1093	{
1107	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1094	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108	want_refresh = 1;	1095	want_refresh = 1;
		1096	refresh_check ();
1109	}	1097	}
1110	else	1098	else
1111	w.stop ();	1099	w.stop ();
1112	}	1100	}
1113	#endif	1101	#endif
1114		1102
1115	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1103	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116	void	1104	void
1117	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1105	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118	{	1106	{
1119	if (mouse_slip_wheel_speed == 0	1107	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121	: scr_page (UP, mouse_slip_wheel_speed))
1122	{	1108	{
1123	if (view_start == top_row || view_start == 0)
1124	mouse_slip_wheel_speed = 0;
1125
1126	want_refresh = 1;	1109	want_refresh = 1;
		1110	refresh_check ();
		1111	}
		1112
		1113	if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127	}	1114	{
1128	else	1115	mouse_slip_wheel_speed = 0;
1129	w.stop ();	1116	w.stop ();
		1117	}
1130	}	1118	}
1131	#endif	1119	#endif
1132		1120
1133	#if LINUX_YIELD_HACK	1121	#if LINUX_YIELD_HACK
1134	static struct event_handler	1122	static struct event_handler
…		…
1139	{	1127	{
1140	// this should really be sched_yield(), but the linux guys thought	1128	// this should really be sched_yield(), but the linux guys thought
1141	// that giving a process calling sched_yield () less cpu time than	1129	// that giving a process calling sched_yield () less cpu time than
1142	// 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
1143	// 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.
1144		1135
1145	struct timespec ts = { 0, 0 };	1136	struct timespec ts = { 0, 1000 };
1146	nanosleep (&ts, 0);	1137	nanosleep (&ts, 0);
1147		1138
1148	w.stop ();	1139	w.stop ();
1149	}	1140	}
1150		1141
…		…
1200	{	1191	{
1201	make_current ();	1192	make_current ();
1202		1193
1203	if (revents & ev::READ)	1194	if (revents & ev::READ)
1204	// loop, but don't allow a single term to monopolize us	1195	// loop, but don't allow a single term to monopolize us
1205	while (pty_fill ())	1196	for (int i = CBUFCNT; i-- && pty_fill (); )
1206	if (cmd_parse ())	1197	cmd_parse ();
1207	break;
1208		1198
1209	if (revents & ev::WRITE)	1199	if (revents & ev::WRITE)
1210	pty_write ();	1200	pty_write ();
		1201
		1202	refresh_check ();
1211	}	1203	}
1212		1204
1213	void	1205	void
1214	rxvt_term::pointer_unblank ()	1206	rxvt_term::pointer_unblank ()
1215	{	1207	{
…		…
1430	&& ev.xfocus.mode != NotifyGrab)	1422	&& ev.xfocus.mode != NotifyGrab)
1431	focus_out ();	1423	focus_out ();
1432	break;	1424	break;
1433		1425
1434	case ConfigureNotify:	1426	case ConfigureNotify:
1435	/* 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",
1436	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,
1437	szHint.width, szHint.height); */	1429	szHint.width, szHint.height);*/
1438	if (ev.xconfigure.window == parent[0])	1430	if (ev.xconfigure.window == parent[0])
1439	{	1431	{
1440	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1432	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441	;	1433	;
1442		1434
…		…
1447	}	1439	}
1448	else	1440	else
1449	{	1441	{
1450	#ifdef HAVE_BG_PIXMAP	1442	#ifdef HAVE_BG_PIXMAP
1451	if (bgPixmap.window_position_sensitive ())	1443	if (bgPixmap.window_position_sensitive ())
		1444	{
		1445	if (mapped)
1452	update_background ();	1446	update_background ();
		1447	else
		1448	bgPixmap.invalidate ();
		1449	}
1453	#endif	1450	#endif
1454	}	1451	}
		1452
1455	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1453	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456	}	1454	}
1457	break;	1455	break;
1458		1456
1459	case PropertyNotify:	1457	case PropertyNotify:
…		…
1476	case SelectionRequest:	1474	case SelectionRequest:
1477	selection_send (ev.xselectionrequest);	1475	selection_send (ev.xselectionrequest);
1478	break;	1476	break;
1479		1477
1480	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
1481	mapped = 1;	1495	mapped = 1;
1482	#ifdef TEXT_BLINK	1496	#ifdef TEXT_BLINK
1483	text_blink_ev.start ();	1497	text_blink_ev.start ();
1484	#endif	1498	#endif
1485	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1499	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
…		…
1509	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1523	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510	{	1524	{
1511	scr_expose (ev.xexpose.x, ev.xexpose.y,	1525	scr_expose (ev.xexpose.x, ev.xexpose.y,
1512	ev.xexpose.width, ev.xexpose.height, False);	1526	ev.xexpose.width, ev.xexpose.height, False);
1513	}	1527	}
		1528
1514	want_refresh = 1;	1529	want_refresh = 1;
1515	}	1530	}
1516	else	1531	else
1517	{	1532	{
1518	XEvent unused_event;	1533	XEvent unused_event;
…		…
1520	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1535	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521	;	1536	;
1522	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1537	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523	;	1538	;
1524		1539
1525	if (isScrollbarWindow (ev.xany.window))	1540	if (scrollBar.state && ev.xany.window == scrollBar.win)
1526	{	1541	{
1527	scrollBar.setIdle ();	1542	scrollBar.state = STATE_IDLE;
1528	scrollbar_show (0);	1543	scrollBar.show (0);
1529	}	1544	}
1530	}	1545	}
1531	break;	1546	break;
1532		1547
1533	case MotionNotify:	1548	case MotionNotify:
…		…
1579	int dist;	1594	int dist;
1580		1595
1581	/* don't clobber the current delay if we are	1596	/* don't clobber the current delay if we are
1582	* already in the middle of scrolling.	1597	* already in the middle of scrolling.
1583	*/	1598	*/
1584	if (!ev_is_active (&sel_scroll_ev))	1599	if (!sel_scroll_ev.is_active ())
1585	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	1600	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586		1601
1587	/* save the event params so we can highlight	1602	/* save the event params so we can highlight
1588	* the selection in the pending-scroll loop	1603	* the selection in the pending-scroll loop
1589	*/	1604	*/
…		…
1612	else	1627	else
1613	{	1628	{
1614	/* we are within the text window, so we	1629	/* we are within the text window, so we
1615	* shouldn't be scrolling	1630	* shouldn't be scrolling
1616	*/	1631	*/
1617	if (ev_is_active (&sel_scroll_ev))
1618	sel_scroll_ev.stop();	1632	sel_scroll_ev.stop();
1619	}	1633	}
1620	#endif	1634	#endif
1621	#ifdef MOUSE_THRESHOLD	1635	#ifdef MOUSE_THRESHOLD
1622	}	1636	}
1623	#endif	1637	#endif
1624	}	1638	}
1625	}	1639	}
1626	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1640	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1627	{	1641	{
1628	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1642	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1629	MotionNotify, &ev))	1643	MotionNotify, &ev))
1630	;	1644	;
1631		1645
…		…
1633	&unused_root, &unused_child,	1647	&unused_root, &unused_child,
1634	&unused_root_x, &unused_root_y,	1648	&unused_root_x, &unused_root_y,
1635	&ev.xbutton.x, &ev.xbutton.y,	1649	&ev.xbutton.x, &ev.xbutton.y,
1636	&unused_mask);	1650	&unused_mask);
1637	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1638	scrollbar_size ());	1652	scrollBar.size ());
1639	want_refresh = 1;	1653	want_refresh = 1;
1640	scrollbar_show (1);	1654	scrollBar.show (1);
1641	}	1655	}
1642	break;	1656	break;
1643	}	1657	}
1644		1658
1645	#if defined(CURSOR_BLINK)	1659	#if defined(CURSOR_BLINK)
…		…
1666		1680
1667	if (ev.type == KeyPress && hidden_pointer == 0)	1681	if (ev.type == KeyPress && hidden_pointer == 0)
1668	pointer_blank ();	1682	pointer_blank ();
1669	}	1683	}
1670	#endif	1684	#endif
		1685
		1686	refresh_check ();
		1687	}
		1688
		1689	void
		1690	rxvt_term::set_urgency (bool enable)
		1691	{
		1692	if (enable == urgency_hint)
		1693	return;
		1694
		1695	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1696	{
		1697	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1698	XSetWMHints (dpy, parent[0], h);
		1699	urgency_hint = enable;
		1700	}
1671	}	1701	}
1672		1702
1673	void	1703	void
1674	rxvt_term::focus_in ()	1704	rxvt_term::focus_in ()
1675	{	1705	{
1676	if (!focus)	1706	if (!focus)
1677	{	1707	{
1678	focus = 1;	1708	focus = 1;
1679	want_refresh = 1;	1709	want_refresh = 1;
1680
1681	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1682		1710
1683	#if USE_XIM	1711	#if USE_XIM
1684	if (Input_Context != NULL)	1712	if (Input_Context != NULL)
1685	{	1713	{
1686	IMSetPosition ();	1714	IMSetPosition ();
…		…
1698	scr_recolour ();	1726	scr_recolour ();
1699	}	1727	}
1700	#endif	1728	#endif
1701	#if ENABLE_FRILLS	1729	#if ENABLE_FRILLS
1702	if (option (Opt_urgentOnBell))	1730	if (option (Opt_urgentOnBell))
1703	{	1731	set_urgency (0);
1704	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705	{
1706	h->flags &= ~XUrgencyHint;
1707	XSetWMHints (dpy, parent[0], h);
1708	}
1709	}
1710	#endif	1732	#endif
		1733
		1734	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711	}	1735	}
1712	}	1736	}
1713		1737
1714	void	1738	void
1715	rxvt_term::focus_out ()	1739	rxvt_term::focus_out ()
…		…
1717	if (focus)	1741	if (focus)
1718	{	1742	{
1719	focus = 0;	1743	focus = 0;
1720	want_refresh = 1;	1744	want_refresh = 1;
1721		1745
1722	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1746	#if ENABLE_FRILLS
1723		1747	if (option (Opt_urgentOnBell))
		1748	set_urgency (0);
		1749	#endif
1724	#if ENABLE_FRILLS || ISO_14755	1750	#if ENABLE_FRILLS || ISO_14755
1725	if (iso14755buf)	1751	if (iso14755buf)
1726	{	1752	{
1727	iso14755buf = 0;	1753	iso14755buf = 0;
1728	# if ISO_14755	1754	# if ISO_14755
…		…
1745	{	1771	{
1746	pix_colors = pix_colors_unfocused;	1772	pix_colors = pix_colors_unfocused;
1747	scr_recolour ();	1773	scr_recolour ();
1748	}	1774	}
1749	#endif	1775	#endif
		1776
		1777	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1750	}	1778	}
1751	}	1779	}
1752		1780
1753	void	1781	void
1754	rxvt_term::update_fade_color (unsigned int idx)	1782	rxvt_term::update_fade_color (unsigned int idx)
…		…
1785	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1813	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786	{	1814	{
1787	bgPixmap.set_root_pixmap ();	1815	bgPixmap.set_root_pixmap ();
1788	update_background ();	1816	update_background ();
1789	}	1817	}
		1818
1790	break;	1819	break;
1791	}	1820	}
1792	# endif	1821	# endif
		1822
		1823	refresh_check ();
1793	}	1824	}
1794	#endif	1825	#endif
1795		1826
1796	void	1827	void
1797	rxvt_term::button_press (XButtonEvent &ev)	1828	rxvt_term::button_press (XButtonEvent &ev)
…		…
1910	}	1941	}
1911		1942
1912	/*	1943	/*
1913	* Scrollbar window processing of button press	1944	* Scrollbar window processing of button press
1914	*/	1945	*/
1915	if (isScrollbarWindow (ev.window))	1946	if (scrollBar.state && ev.window == scrollBar.win)
1916	{	1947	{
1917	scrollBar.setIdle ();	1948	page_dirn direction = NO_DIR;
		1949
		1950	if (scrollBar.upButton (ev.y))
		1951	direction = UP; /* up */
		1952	else if (scrollBar.dnButton (ev.y))
		1953	direction = DN; /* down */
		1954
		1955	scrollBar.state = STATE_IDLE;
1918	/*	1956	/*
1919	* Rxvt-style scrollbar:	1957	* Rxvt-style scrollbar:
1920	* move up if mouse is above slider	1958	* move up if mouse is above slider
1921	* move dn if mouse is below slider	1959	* move dn if mouse is below slider
1922	*	1960	*
…		…
1931	/*	1969	/*
1932	* Mouse report disabled scrollbar:	1970	* Mouse report disabled scrollbar:
1933	* arrow buttons - send up/down	1971	* arrow buttons - send up/down
1934	* click on scrollbar - send pageup/down	1972	* click on scrollbar - send pageup/down
1935	*/	1973	*/
1936	if ((scrollBar.style == R_SB_NEXT	1974	if (direction == UP)
1937	&& scrollbarnext_upButton (ev.y))
1938	|| (scrollBar.style == R_SB_RXVT
1939	&& scrollbarrxvt_upButton (ev.y)))
1940	tt_printf ("\033[A");	1975	tt_printf ("\033[A");
1941	else if ((scrollBar.style == R_SB_NEXT	1976	else if (direction == DN)
1942	&& scrollbarnext_dnButton (ev.y))
1943	|| (scrollBar.style == R_SB_RXVT
1944	&& scrollbarrxvt_dnButton (ev.y)))
1945	tt_printf ("\033[B");	1977	tt_printf ("\033[B");
1946	else	1978	else
1947	switch (ev.button)	1979	switch (ev.button)
1948	{	1980	{
1949	case Button2:	1981	case Button2:
…		…
1957	break;	1989	break;
1958	}	1990	}
1959	}	1991	}
1960	else	1992	else
1961	#endif /* NO_SCROLLBAR_REPORT */	1993	#endif /* NO_SCROLLBAR_REPORT */
1962
1963	{
1964	char upordown = 0;
1965
1966	if (scrollBar.style == R_SB_NEXT)
1967	{	1994	{
1968	if (scrollbarnext_upButton (ev.y))	1995	if (direction != NO_DIR)
1969	upordown = -1; /* up */
1970	else if (scrollbarnext_dnButton (ev.y))
1971	upordown = 1; /* down */
1972	}
1973	else if (scrollBar.style == R_SB_RXVT)
1974	{
1975	if (scrollbarrxvt_upButton (ev.y))
1976	upordown = -1; /* up */
1977	else if (scrollbarrxvt_dnButton (ev.y))
1978	upordown = 1; /* down */
1979	}
1980	if (upordown)
1981	{	1996	{
1982	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1997	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1998	if (!cont_scroll_ev.is_active ())
1983	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	1999	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984	#endif	2000	#endif
1985	if (scr_page (upordown < 0 ? UP : DN, 1))	2001	if (scr_page (direction, 1))
1986	{	2002	{
1987	if (upordown < 0)	2003	if (direction == UP)
1988	scrollBar.setUp ();	2004	scrollBar.state = STATE_UP;
1989	else	2005	else
1990	scrollBar.setDn ();	2006	scrollBar.state = STATE_DOWN;
1991	}	2007	}
1992	}	2008	}
1993	else	2009	else
1994	switch (ev.button)	2010	switch (ev.button)
1995	{	2011	{
1996	case Button2:	2012	case Button2:
1997	switch (scrollbar_align)	2013	switch (scrollBar.align)
1998	{	2014	{
1999	case R_SB_ALIGN_TOP:	2015	case R_SB_ALIGN_TOP:
2000	csrO = 0;	2016	csrO = 0;
2001	break;	2017	break;
2002	case R_SB_ALIGN_CENTRE:	2018	case R_SB_ALIGN_CENTRE:
…		…
2008	}	2024	}
2009		2025
2010	if (scrollBar.style == R_SB_XTERM	2026	if (scrollBar.style == R_SB_XTERM
2011	|| scrollbar_above_slider (ev.y)	2027	|| scrollbar_above_slider (ev.y)
2012	|| scrollbar_below_slider (ev.y))	2028	|| scrollbar_below_slider (ev.y))
2013	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2029	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2014		2030
2015	scrollBar.setMotion ();	2031	scrollBar.state = STATE_MOTION;
2016	break;	2032	break;
2017		2033
2018	case Button1:	2034	case Button1:
2019	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2035	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2020	csrO = ev.y - scrollBar.top;	2036	csrO = ev.y - scrollBar.top;
2021	/* FALLTHROUGH */	2037	/* FALLTHROUGH */
2022		2038
2023	case Button3:	2039	case Button3:
2024	if (scrollBar.style != R_SB_XTERM)	2040	if (scrollBar.style != R_SB_XTERM)
…		…
2034	scr_page (DN, nrow - 1);	2050	scr_page (DN, nrow - 1);
2035	# else	2051	# else
2036	scr_page (DN, nrow / 4);	2052	scr_page (DN, nrow / 4);
2037	# endif	2053	# endif
2038	else	2054	else
2039	scrollBar.setMotion ();	2055	scrollBar.state = STATE_MOTION;
2040	}	2056	}
2041	else	2057	else
2042	{	2058	{
2043	scr_page ((ev.button == Button1 ? DN : UP),	2059	scr_page ((ev.button == Button1 ? DN : UP),
2044	(nrow	2060	(nrow
2045	* scrollbar_position (ev.y)	2061	* scrollbar_position (ev.y)
2046	/ scrollbar_size ()));	2062	/ scrollBar.size ()));
2047	}	2063	}
2048		2064
2049	break;	2065	break;
2050	}	2066	}
2051	}	2067	}
…		…
2061		2077
2062	csrO = 0; /* reset csr Offset */	2078	csrO = 0; /* reset csr Offset */
2063	if (!bypass_keystate)	2079	if (!bypass_keystate)
2064	reportmode = !! (priv_modes & PrivMode_mouse_report);	2080	reportmode = !! (priv_modes & PrivMode_mouse_report);
2065		2081
2066	if (scrollbar_isUpDn ())	2082	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2067	{	2083	{
2068	scrollBar.setIdle ();	2084	scrollBar.state = STATE_IDLE;
2069	scrollbar_show (0);	2085	scrollBar.show (0);
2070	}	2086	}
2071		2087
2072	#ifdef SELECTION_SCROLLING	2088	#ifdef SELECTION_SCROLLING
2073	if (ev_is_active (&sel_scroll_ev))
2074	sel_scroll_ev.stop();	2089	sel_scroll_ev.stop();
2075	#endif	2090	#endif
2076		2091
2077	if (ev.window == vt)	2092	if (ev.window == vt)
2078	{	2093	{
2079	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2094	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2151	{	2166	{
2152	mouse_slip_wheel_speed += v ? -1 : 1;	2167	mouse_slip_wheel_speed += v ? -1 : 1;
2153	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2168	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2154	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2169	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155		2170
		2171	if (!slip_wheel_ev.is_active ())
2156	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2172	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157	}	2173	}
2158	else	2174	else
		2175	# endif
2159	{	2176	{
2160	# endif
2161	scr_page (v, i);	2177	scr_page (v, i);
2162	scrollbar_show (1);	2178	scrollBar.show (1);
2163	# ifdef MOUSE_SLIP_WHEELING
2164	}	2179	}
2165	# endif
2166	}	2180	}
2167	break;	2181	break;
2168	#endif	2182	#endif
2169	}	2183	}
2170	}	2184	}
2171	}	2185	}
2172		2186
2173	/*}}} */	2187	/*}}} */
2174		2188
2175	bool	2189	void
2176	rxvt_term::cmd_parse ()	2190	rxvt_term::cmd_parse ()
2177	{	2191	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2192	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2193	char *seq_begin; // remember start of esc-sequence here
2181		2194
2182	for (;;)	2195	for (;;)
2183	{	2196	{
2184	if (ch == NOCHAR)	2197	if (expect_false (ch == NOCHAR))
2185	{	2198	{
2186	seq_begin = cmdbuf_ptr;	2199	seq_begin = cmdbuf_ptr;
2187	ch = next_char ();	2200	ch = next_char ();
2188		2201
2189	if (ch == NOCHAR)	2202	if (ch == NOCHAR)
2190	break;	2203	break;
2191	}	2204	}
2192		2205
2193	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2206	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194	{	2207	{
2195	if (!seen_input)	2208	if (expect_false (!seen_input))
2196	{	2209	{
2197	seen_input = 1;	2210	seen_input = 1;
2198	// many badly-written programs (e.g. jed) contain a race condition:	2211	// many badly-written programs (e.g. jed) contain a race condition:
2199	// they first read the screensize and then install a SIGWINCH handler.	2212	// they first read the screensize and then install a SIGWINCH handler.
2200	// some window managers resize the window early, and these programs	2213	// some window managers resize the window early, and these programs
…		…
2213	wchar_t *str = buf;	2226	wchar_t *str = buf;
2214	wchar_t *eol = str + min (ncol, UBUFSIZ);	2227	wchar_t *eol = str + min (ncol, UBUFSIZ);
2215		2228
2216	for (;;)	2229	for (;;)
2217	{	2230	{
2218	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2231	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219	break;	2232	break;
2220		2233
2221	*str++ = ch;	2234	*str++ = ch;
2222		2235
2223	if (ch == C0_LF || str >= eol)	2236	if (expect_false (ch == C0_LF || str >= eol))
2224	{	2237	{
2225	if (ch == C0_LF)	2238	if (ch == C0_LF)
2226	nlines++;	2239	nlines++;
2227		2240
2228	refresh_count++;	2241	refresh_count++;
…		…
2277	* What the heck we'll cheat and only refresh less than every page-full.	2290	* What the heck we'll cheat and only refresh less than every page-full.
2278	* if skipScroll is enabled.	2291	* if skipScroll is enabled.
2279	*/	2292	*/
2280	if (refreshnow)	2293	if (refreshnow)
2281	{	2294	{
2282	flag = true;
2283	scr_refresh ();	2295	scr_refresh ();
2284	want_refresh = 1;	2296	want_refresh = 1;
2285	}	2297	}
2286
2287	}	2298	}
2288	else	2299	else
2289	{	2300	{
2290	try	2301	try
2291	{	2302	{
…		…
2299	}	2310	}
2300		2311
2301	ch = NOCHAR;	2312	ch = NOCHAR;
2302	}	2313	}
2303	}	2314	}
2304
2305	return flag;
2306	}	2315	}
2307		2316
2308	// read the next character	2317	// read the next character
2309	wchar_t	2318	wchar_t
2310	rxvt_term::next_char () NOTHROW	2319	rxvt_term::next_char () NOTHROW
2311	{	2320	{
2312	while (cmdbuf_ptr < cmdbuf_endp)	2321	while (cmdbuf_ptr < cmdbuf_endp)
2313	{	2322	{
2314	// assume 7-bit to be ascii ALWAYS	2323	// assume 7-bit to be ascii ALWAYS
2315	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2324	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316	return *cmdbuf_ptr++;	2325	return *cmdbuf_ptr++;
2317		2326
2318	wchar_t wc;	2327	wchar_t wc;
2319	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2328	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320		2329
…		…
2324	cmdbuf_ptr = cmdbuf_endp;	2333	cmdbuf_ptr = cmdbuf_endp;
2325	break;	2334	break;
2326	}	2335	}
2327		2336
2328	if (len == (size_t)-1)	2337	if (len == (size_t)-1)
		2338	{
		2339	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2329	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2340	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2341	}
2330		2342
2331	// assume wchar == unicode	2343	// assume wchar == unicode
2332	cmdbuf_ptr += len;	2344	cmdbuf_ptr += len;
2333	return wc & UNICODE_MASK;	2345	return wc & UNICODE_MASK;
2334	}	2346	}
…		…
2378	/*----------------------------------------------------------------------*/	2390	/*----------------------------------------------------------------------*/
2379	#ifdef PRINTPIPE	2391	#ifdef PRINTPIPE
2380	FILE *	2392	FILE *
2381	rxvt_term::popen_printer ()	2393	rxvt_term::popen_printer ()
2382	{	2394	{
2383	FILE *stream = popen (rs[Rs_print_pipe], "w");	2395	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384		2396
2385	if (stream == NULL)	2397	if (stream == NULL)
2386	rxvt_warn ("can't open printer pipe, not printing.\n");	2398	rxvt_warn ("can't open printer pipe, not printing.\n");
2387		2399
2388	return stream;	2400	return stream;
…		…
2399	* simulate attached vt100 printer	2411	* simulate attached vt100 printer
2400	*/	2412	*/
2401	void	2413	void
2402	rxvt_term::process_print_pipe ()	2414	rxvt_term::process_print_pipe ()
2403	{	2415	{
2404	int done;	2416	FILE *fd = popen_printer ();
2405	FILE *fd;
2406		2417
2407	if ((fd = popen_printer ()) == NULL)	2418	if (!fd)
2408	return;	2419	return;
2409		2420
2410	/*	2421	/*
2411	* Send all input to the printer until either ESC[4i or ESC[?4i	2422	* Send all input to the printer until either ESC[4i or ESC[?4i
2412	* is received.	2423	* is received.
2413	*/	2424	*/
2414	for (done = 0; !done;)	2425	for (int done = 0; !done; )
2415	{	2426	{
2416	unsigned char buf[8];	2427	unsigned char buf[8];
2417	unicode_t ch;	2428	unicode_t ch;
2418	unsigned int i, len;	2429	unsigned int i, len;
2419		2430
…		…
2564	break;	2575	break;
2565	case 'Z': /* identify the terminal type */	2576	case 'Z': /* identify the terminal type */
2566	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2577	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567	break;	2578	break;
2568	case '<': /* turn off VT52 mode */	2579	case '<': /* turn off VT52 mode */
2569	PrivMode (0, PrivMode_vt52);	2580	set_privmode (PrivMode_vt52, 0);
2570	break;	2581	break;
2571	case 'F': /* use special graphics character set */	2582	case 'F': /* use special graphics character set */
2572	case 'G': /* use regular character set */	2583	case 'G': /* use regular character set */
2573	/* unimplemented */	2584	/* unimplemented */
2574	break;	2585	break;
…		…
2628	scr_forwardindex ();	2639	scr_forwardindex ();
2629	break;	2640	break;
2630	#endif	2641	#endif
2631	case '=':	2642	case '=':
2632	case '>':	2643	case '>':
2633	PrivMode ((ch == '='), PrivMode_aplKP);	2644	set_privmode (PrivMode_aplKP, ch == '=');
2634	break;	2645	break;
2635		2646
2636	case C1_40:	2647	case C1_40:
2637	cmd_getc ();	2648	cmd_getc ();
2638	break;	2649	break;
…		…
2677	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2688	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678	case C1_SCI: /* ESC Z */	2689	case C1_SCI: /* ESC Z */
2679	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2690	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680	break; /* steal obsolete ESC [ c */	2691	break; /* steal obsolete ESC [ c */
2681		2692
2682	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2693	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683	case C1_CSI: /* ESC [ */	2694	case C1_CSI: /* ESC [ */
2684	process_csi_seq ();	2695	process_csi_seq ();
2685	break;	2696	break;
2686		2697
2687	/* 8.3.90: OPERATING SYSTEM COMMAND */	2698	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688	case C1_OSC: /* ESC ] */	2699	case C1_OSC: /* ESC ] */
2689	process_osc_seq ();	2700	process_osc_seq ();
2690	break;	2701	break;
2691		2702
2692	/* 8.3.106: RESET TO INITIAL STATE */	2703	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693	case 'c':	2704	case 'c':
2694	mbstate.reset ();	2705	mbstate.reset ();
2695	scr_poweron ();	2706	scr_poweron ();
2696	scrollbar_show (1);	2707	scrollBar.show (1);
2697	break;	2708	break;
2698		2709
2699	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2710	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700	case 'n':	2711	case 'n':
2701	scr_charset_choose (2);	2712	scr_charset_choose (2);
…		…
2752		2763
2753	nargs = 0;	2764	nargs = 0;
2754		2765
2755	priv = 0;	2766	priv = 0;
2756	ch = cmd_getc ();	2767	ch = cmd_getc ();
2757	if (ch >= '<' && ch <= '?')	2768	if ((ch >= '<' && ch <= '?') || ch == '!')
2758	{	2769	{
2759	/* '<' '=' '>' '?' */	2770	/* '<' '=' '>' '?' '!' */
2760	priv = ch;	2771	priv = ch;
2761	ch = cmd_getc ();	2772	ch = cmd_getc ();
2762	}	2773	}
2763		2774
2764	/* read any numerical arguments */	2775	/* read any numerical arguments */
…		…
2813	// versions.	2824	// versions.
2814	//	2825	//
2815	tt_printf ("\033[>%d;95;0c", 'U');	2826	tt_printf ("\033[>%d;95;0c", 'U');
2816	}	2827	}
2817	break;	2828	break;
		2829
2818	case '?':	2830	case '?':
2819	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2831	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2820	process_terminal_mode (ch, priv, nargs, arg);	2832	process_terminal_mode (ch, priv, nargs, arg);
2821	break;	2833	break;
		2834
		2835	case '!':
		2836	if (ch == CSI_70)
		2837	{
		2838	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2839	scr_soft_reset ();
		2840
		2841	static const int pm_h[] = { 7, 25 };
		2842	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2843
		2844	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2845	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2822	}	2846	}
		2847	break;
		2848	}
		2849
2823	return;	2850	return;
2824	}	2851	}
2825		2852
2826	switch (ch)	2853	switch (ch)
2827	{	2854	{
…		…
3338	*buf++ = '\0';	3365	*buf++ = '\0';
3339		3366
3340	process_color_seq (op, color, name, resp);	3367	process_color_seq (op, color, name, resp);
3341	}	3368	}
3342	break;	3369	break;
		3370	case Rxvt_restoreFG:
3343	case XTerm_Color00:	3371	case XTerm_Color00:
3344	process_color_seq (op, Color_fg, str, resp);	3372	process_color_seq (op, Color_fg, str, resp);
3345	break;	3373	break;
		3374	case Rxvt_restoreBG:
3346	case XTerm_Color01:	3375	case XTerm_Color01:
3347	process_color_seq (op, Color_bg, str, resp);	3376	process_color_seq (op, Color_bg, str, resp);
3348	break;	3377	break;
3349	#ifndef NO_CURSORCOLOR	3378	#ifndef NO_CURSORCOLOR
3350	case XTerm_Color_cursor:	3379	case XTerm_Color_cursor:
…		…
3376	#if ENABLE_TRANSPARENCY	3405	#if ENABLE_TRANSPARENCY
3377	case URxvt_Color_tint:	3406	case URxvt_Color_tint:
3378	process_color_seq (op, Color_tint, str, resp);	3407	process_color_seq (op, Color_tint, str, resp);
3379	{	3408	{
3380	bool changed = false;	3409	bool changed = false;
		3410
3381	if (ISSET_PIXCOLOR (Color_tint))	3411	if (ISSET_PIXCOLOR (Color_tint))
3382	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3412	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3383	else	3413	else
3384	changed = bgPixmap.unset_tint ();	3414	changed = bgPixmap.unset_tint ();
		3415
3385	if (changed)	3416	if (changed)
3386	update_background ();	3417	update_background ();
3387	}	3418	}
3388		3419
3389	break;	3420	break;
…		…
3412	changed++;	3443	changed++;
3413	str = strchr (str, ';');	3444	str = strchr (str, ';');
3414	if (str == NULL)	3445	if (str == NULL)
3415	bgPixmap.set_defaultGeometry ();	3446	bgPixmap.set_defaultGeometry ();
3416	}	3447	}
		3448
3417	while (str)	3449	while (str)
3418	{	3450	{
3419	str++;	3451	str++;
3420	if (bgPixmap.set_geometry (str))	3452	if (bgPixmap.set_geometry (str))
3421	changed++;	3453	changed++;
3422	str = strchr (str, ';');	3454	str = strchr (str, ';');
3423	}	3455	}
		3456
3424	if (changed)	3457	if (changed)
3425	update_background ();	3458	update_background ();
3426	}	3459	}
3427	break;	3460	break;
3428	#endif	3461	#endif
3429
3430	case Rxvt_restoreFG:
3431	set_window_color (Color_fg, str);
3432	break;
3433	case Rxvt_restoreBG:
3434	set_window_color (Color_bg, str);
3435	break;
3436		3462
3437	case XTerm_logfile:	3463	case XTerm_logfile:
3438	// TODO, when secure mode?	3464	// TODO, when secure mode?
3439	break;	3465	break;
3440		3466
…		…
3507	break;	3533	break;
3508	#endif	3534	#endif
3509		3535
3510	#if ENABLE_PERL	3536	#if ENABLE_PERL
3511	case URxvt_perl:	3537	case URxvt_perl:
3512	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3538	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513	; // no responses yet
3514	break;	3539	break;
3515	#endif	3540	#endif
3516	}	3541	}
3517	}	3542	}
3518	/*----------------------------------------------------------------------*/	3543	/*----------------------------------------------------------------------*/
…		…
3541	{	3566	{
3542	if (mode == 'r')	3567	if (mode == 'r')
3543	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3568	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544	else	3569	else
3545	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3570	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546	PrivMode (state, bit);	3571	set_privmode (bit, state);
3547	}	3572	}
3548		3573
3549	return state;	3574	return state;
3550	}	3575	}
3551		3576
…		…
3595	// 1037 send DEL for keypad delete NYI	3620	// 1037 send DEL for keypad delete NYI
3596	{ 1047, PrivMode_Screen },	3621	{ 1047, PrivMode_Screen },
3597	// 1048 save and restore cursor	3622	// 1048 save and restore cursor
3598	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3623	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3624	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3625	{ 2004, PrivMode_BracketPaste },
3600	};	3626	};
3601		3627
3602	if (nargs == 0)	3628	if (nargs == 0)
3603	return;	3629	return;
3604		3630
…		…
3648	case 2: /* VT52 mode */	3674	case 2: /* VT52 mode */
3649	/* oddball mode. should be set regardless of set/reset	3675	/* oddball mode. should be set regardless of set/reset
3650	* parameter. Return from VT52 mode with an ESC < from	3676	* parameter. Return from VT52 mode with an ESC < from
3651	* within VT52 mode	3677	* within VT52 mode
3652	*/	3678	*/
3653	PrivMode (1, PrivMode_vt52);	3679	set_privmode (PrivMode_vt52, 1);
3654	break;	3680	break;
3655	case 3: /* 80/132 */	3681	case 3: /* 80/132 */
3656	if (priv_modes & PrivMode_132OK)	3682	if (priv_modes & PrivMode_132OK)
		3683	{
		3684	scr_poweron ();
3657	set_widthheight (((state ? 132 : 80) * fwidth), height);	3685	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3686	}
3658	break;	3687	break;
3659	case 4: /* smooth scrolling */	3688	case 4: /* smooth scrolling */
3660	set_option (Opt_jumpScroll, !state);	3689	set_option (Opt_jumpScroll, !state);
3661	break;	3690	break;
3662	case 5: /* reverse video */	3691	case 5: /* reverse video */
…		…
3673	if (state) /* orthogonal */	3702	if (state) /* orthogonal */
3674	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3703	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3675	break;	3704	break;
3676	#ifdef scrollBar_esc	3705	#ifdef scrollBar_esc
3677	case scrollBar_esc:	3706	case scrollBar_esc:
3678	if (scrollbar_mapping (state))	3707	if (scrollBar.map (state))
3679	{	3708	{
3680	resize_all_windows (0, 0, 0);	3709	resize_all_windows (0, 0, 0);
3681	scr_touch (true);	3710	scr_touch (true);
3682	}	3711	}
3683	break;	3712	break;

Diff Legend

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