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.367 by root, Sat Nov 24 11:06:12 2007 UTC vs.
Revision 1.436 by sf-exg, Sun Jan 24 21:53:13 2010 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
…		…
484	}	579	}
485	}	580	}
486		581
487	#if ENABLE_FRILLS || ISO_14755	582	#if ENABLE_FRILLS || ISO_14755
488	// ISO 14755 support	583	// ISO 14755 support
489	if (shft && ctrl)	584	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490	{	585	{
491	int hv;	586	int hv;
492		587
493	if (iso14755buf & ISO_14755_51	588	if (iso14755buf & ISO_14755_51
494	&& (keysym == XK_space || keysym == XK_KP_Space	589	&& (keysym == XK_space || keysym == XK_KP_Space
…		…
524	scr_overlay_off ();	619	scr_overlay_off ();
525	# endif	620	# endif
526	iso14755buf = 0;	621	iso14755buf = 0;
527	}	622	}
528	}	623	}
		624	else if (option (Opt_iso14755) &&
529	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	625	((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	626	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531	if (!(iso14755buf & ISO_14755_STARTED))	627	if (!(iso14755buf & ISO_14755_STARTED))
532	{	628	{
533	iso14755buf |= ISO_14755_STARTED;	629	iso14755buf |= ISO_14755_STARTED;
534	# if ISO_14755	630	# if ISO_14755
535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	631	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
546	}	642	}
547	#endif	643	#endif
548		644
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	645	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	646	{
		647	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		648	unsigned int newlen = 1;
		649
		650	switch (translate_keypad (keysym, kp))
551	{	651	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	652	#ifndef NO_BACKSPACE_KEY
553	newlen = 1;	653	case XK_BackSpace:
554	#ifdef XK_KP_Home	654	if (priv_modes & PrivMode_HaveBackSpace)
555	static const KeySym keypadtrans[] = {	655	{
556	XK_KP_7, // XK_KP_Home	656	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557	XK_KP_4, // XK_KP_Left	657	^ !!ctrl) ? '\b' : '\177';
558	XK_KP_8, // XK_KP_Up	658	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	};	659	}
		660	else
		661	strcpy (kbuf, rs[Rs_backspace_key]);
		662	break;
		663	#endif
		664	#ifndef NO_DELETE_KEY
		665	case XK_Delete:
		666	strcpy (kbuf, rs[Rs_delete_key]);
		667	break;
		668	#endif
		669	case XK_Tab:
		670	if (shft)
		671	strcpy (kbuf, "\033[Z");
		672	else
		673	{
		674	#ifdef CTRL_TAB_MAKES_META
		675	if (ctrl)
		676	meta = 1;
		677	#endif
		678	#ifdef MOD4_TAB_MAKES_META
		679	if (ev.state & Mod4Mask)
		680	meta = 1;
		681	#endif
		682	newlen = 0;
		683	}
		684	break;
571		685
572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	686	case XK_Up: /* "\033[A" */
		687	case XK_Down: /* "\033[B" */
		688	case XK_Right: /* "\033[C" */
		689	case XK_Left: /* "\033[D" */
		690	strcpy (kbuf, "\033[Z");
		691	kbuf[2] = "DACB"[keysym - XK_Left];
		692	/* do Shift first */
		693	if (shft)
		694	kbuf[2] = "dacb"[keysym - XK_Left];
		695	else if (ctrl)
		696	{
		697	kbuf[1] = 'O';
		698	kbuf[2] = "dacb"[keysym - XK_Left];
		699	}
		700	else if (priv_modes & PrivMode_aplCUR)
		701	kbuf[1] = 'O';
		702	break;
		703
		704	case XK_KP_Enter:
		705	/* allow shift to override */
		706	if (kp)
		707	{
		708	strcpy (kbuf, "\033OM");
		709	break;
		710	}
		711
		712	/* FALLTHROUGH */
		713
		714	case XK_Return:
		715	if (priv_modes & PrivMode_LFNL)
		716	{
		717	kbuf[0] = '\015';
		718	kbuf[1] = '\012';
		719	kbuf[2] = '\0';
		720	}
		721	else
		722	{
		723	kbuf[0] = '\015';
		724	kbuf[1] = '\0';
		725	}
		726	break;
		727
		728	case XK_KP_F1: /* "\033OP" */
		729	case XK_KP_F2: /* "\033OQ" */
		730	case XK_KP_F3: /* "\033OR" */
		731	case XK_KP_F4: /* "\033OS" */
		732	strcpy (kbuf, "\033OP");
		733	kbuf[2] += (keysym - XK_KP_F1);
		734	break;
		735
		736	case XK_KP_Multiply: /* "\033Oj" : "*" */
		737	case XK_KP_Add: /* "\033Ok" : "+" */
		738	case XK_KP_Separator: /* "\033Ol" : "," */
		739	case XK_KP_Subtract: /* "\033Om" : "-" */
		740	case XK_KP_Decimal: /* "\033On" : "." */
		741	case XK_KP_Divide: /* "\033Oo" : "/" */
		742	case XK_KP_0: /* "\033Op" : "0" */
		743	case XK_KP_1: /* "\033Oq" : "1" */
		744	case XK_KP_2: /* "\033Or" : "2" */
		745	case XK_KP_3: /* "\033Os" : "3" */
		746	case XK_KP_4: /* "\033Ot" : "4" */
		747	case XK_KP_5: /* "\033Ou" : "5" */
		748	case XK_KP_6: /* "\033Ov" : "6" */
		749	case XK_KP_7: /* "\033Ow" : "7" */
		750	case XK_KP_8: /* "\033Ox" : "8" */
		751	case XK_KP_9: /* "\033Oy" : "9" */
		752	/* allow shift to override */
		753	if (kp)
		754	{
		755	strcpy (kbuf, "\033Oj");
		756	kbuf[2] += (keysym - XK_KP_Multiply);
		757	}
		758	else
		759	{
		760	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		761	kbuf[1] = '\0';
		762	}
		763	break;
		764
		765	default:
573	{	766	{
574	unsigned int index = keysym - XK_KP_Home;	767	int param = map_function_key (keysym);
575	keysym = kp ? keypadtrans[index] : XK_Home + index;	768	if (param > 0)
		769	sprintf (kbuf,"\033[%d~", param);
		770	else
		771	newlen = 0;
576	}	772	}
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;	773	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	}	774	}
		775
		776	if (newlen)
		777	len = strlen (kbuf);
794		778
795	/*	779	/*
796	* Pass meta for all function keys, if 'meta' option set	780	* Pass meta for all function keys, if 'meta' option set
797	*/	781	*/
798	#ifdef META8_OPTION	782	#ifdef META8_OPTION
…		…
1032	}	1016	}
1033	while (row < end_row);	1017	while (row < end_row);
1034	}	1018	}
1035		1019
1036	scr_refresh ();	1020	scr_refresh ();
1037	scrollbar_show (1);	1021	scrollBar.show (1);
1038	#ifdef USE_XIM	1022	#ifdef USE_XIM
1039	IMSendSpot ();	1023	IMSendSpot ();
1040	#endif	1024	#endif
1041	}	1025	}
1042		1026
1043	display->flush ();	1027	display->flush ();
1044	}	1028	}
1045		1029
		1030	/* checks wether a refresh is requested and starts the refresh timer */
1046	void	1031	void
1047	rxvt_term::prepare_cb (ev::prepare &w, int revents)	1032	rxvt_term::refresh_check ()
1048	{	1033	{
1049	make_current ();	1034	if (want_refresh && !flush_ev.is_active ())
		1035	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050		1036
1051	display->flush ();	1037	display->flush ();
1052
1053	if (want_refresh && !flush_ev.active)
1054	flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1055	}	1038	}
1056		1039
1057	void	1040	void
1058	rxvt_term::flush_cb (ev::timer &w, int revents)	1041	rxvt_term::flush_cb (ev::timer &w, int revents)
1059	{	1042	{
…		…
1067	void	1050	void
1068	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1051	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069	{	1052	{
1070	hidden_cursor = !hidden_cursor;	1053	hidden_cursor = !hidden_cursor;
1071	want_refresh = 1;	1054	want_refresh = 1;
		1055	refresh_check ();
1072	}	1056	}
1073	#endif	1057	#endif
1074		1058
1075	#ifdef TEXT_BLINK	1059	#ifdef TEXT_BLINK
1076	void	1060	void
…		…
1078	{	1062	{
1079	if (scr_refresh_rend (RS_Blink, RS_Blink))	1063	if (scr_refresh_rend (RS_Blink, RS_Blink))
1080	{	1064	{
1081	hidden_text = !hidden_text;	1065	hidden_text = !hidden_text;
1082	want_refresh = 1;	1066	want_refresh = 1;
		1067	refresh_check ();
1083	}	1068	}
1084	}
1085	#endif
1086
1087	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088	void
1089	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090	{
1091	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1092	scr_page (scrollbar_isUp() ? UP : DN, 1))
1093	want_refresh = 1;
1094	else	1069	else
1095	w.stop ();	1070	w.stop ();
1096	}	1071	}
1097	#endif	1072	#endif
1098		1073
		1074	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1075	void
		1076	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
		1077	{
		1078	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
		1079	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
		1080	{
		1081	want_refresh = 1;
		1082	refresh_check ();
		1083	}
		1084	else
		1085	w.stop ();
		1086	}
		1087	#endif
		1088
1099	#ifdef SELECTION_SCROLLING	1089	#ifdef SELECTION_SCROLLING
1100	void	1090	void
1101	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1091	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1102	{	1092	{
1103	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1093	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104	{	1094	{
1105	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1095	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106	want_refresh = 1;	1096	want_refresh = 1;
		1097	refresh_check ();
1107	}	1098	}
1108	else	1099	else
1109	w.stop ();	1100	w.stop ();
1110	}	1101	}
1111	#endif	1102	#endif
1112		1103
1113	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1104	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114	void	1105	void
1115	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1106	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116	{	1107	{
1117	if (mouse_slip_wheel_speed == 0	1108	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119	: scr_page (UP, mouse_slip_wheel_speed))
1120	{	1109	{
1121	if (view_start == top_row || view_start == 0)
1122	mouse_slip_wheel_speed = 0;
1123
1124	want_refresh = 1;	1110	want_refresh = 1;
		1111	refresh_check ();
		1112	}
		1113
		1114	if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125	}	1115	{
1126	else	1116	mouse_slip_wheel_speed = 0;
1127	w.stop ();	1117	w.stop ();
		1118	}
1128	}	1119	}
1129	#endif	1120	#endif
1130		1121
1131	#if LINUX_YIELD_HACK	1122	#if LINUX_YIELD_HACK
1132	static struct event_handler	1123	static struct event_handler
…		…
1137	{	1128	{
1138	// this should really be sched_yield(), but the linux guys thought	1129	// this should really be sched_yield(), but the linux guys thought
1139	// that giving a process calling sched_yield () less cpu time than	1130	// that giving a process calling sched_yield () less cpu time than
1140	// ones with high nice levels is a useful thing to do. It surely is is	1131	// ones with high nice levels is a useful thing to do. It surely is is
1141	// allowed by the sus... as is returning ENOSYS.	1132	// allowed by the sus... as is returning ENOSYS.
		1133	// since the linux guys additionally thought that breaking the only
		1134	// known workaroudn against their unusable sched_yield hack is cool,
		1135	// we just nanosleep a bit and hope for the best.
1142		1136
1143	struct timespec ts = { 0, 0 };	1137	struct timespec ts = { 0, 1000 };
1144	nanosleep (&ts, 0);	1138	nanosleep (&ts, 0);
1145		1139
1146	w.stop ();	1140	w.stop ();
1147	}	1141	}
1148		1142
…		…
1198	{	1192	{
1199	make_current ();	1193	make_current ();
1200		1194
1201	if (revents & ev::READ)	1195	if (revents & ev::READ)
1202	// loop, but don't allow a single term to monopolize us	1196	// loop, but don't allow a single term to monopolize us
1203	while (pty_fill ())	1197	for (int i = CBUFCNT; i-- && pty_fill (); )
1204	if (cmd_parse ())	1198	cmd_parse ();
1205	break;
1206		1199
1207	if (revents & ev::WRITE)	1200	if (revents & ev::WRITE)
1208	pty_write ();	1201	pty_write ();
		1202
		1203	refresh_check ();
1209	}	1204	}
1210		1205
1211	void	1206	void
1212	rxvt_term::pointer_unblank ()	1207	rxvt_term::pointer_unblank ()
1213	{	1208	{
…		…
1428	&& ev.xfocus.mode != NotifyGrab)	1423	&& ev.xfocus.mode != NotifyGrab)
1429	focus_out ();	1424	focus_out ();
1430	break;	1425	break;
1431		1426
1432	case ConfigureNotify:	1427	case ConfigureNotify:
1433	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1428	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1429	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435	szHint.width, szHint.height); */	1430	szHint.width, szHint.height);*/
1436	if (ev.xconfigure.window == parent[0])	1431	if (ev.xconfigure.window == parent[0])
1437	{	1432	{
1438	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1433	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439	;	1434	;
1440		1435
…		…
1445	}	1440	}
1446	else	1441	else
1447	{	1442	{
1448	#ifdef HAVE_BG_PIXMAP	1443	#ifdef HAVE_BG_PIXMAP
1449	if (bgPixmap.window_position_sensitive ())	1444	if (bgPixmap.window_position_sensitive ())
		1445	{
		1446	if (mapped)
1450	update_background ();	1447	update_background ();
		1448	else
		1449	bgPixmap.invalidate ();
		1450	}
1451	#endif	1451	#endif
1452	}	1452	}
		1453
1453	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1454	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454	}	1455	}
1455	break;	1456	break;
1456		1457
1457	case PropertyNotify:	1458	case PropertyNotify:
…		…
1461	selection_property (ev.xproperty.window, ev.xproperty.atom);	1462	selection_property (ev.xproperty.window, ev.xproperty.atom);
1462		1463
1463	break;	1464	break;
1464		1465
1465	case SelectionClear:	1466	case SelectionClear:
1466	selection_clear ();	1467	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467	break;	1468	break;
1468		1469
1469	case SelectionNotify:	1470	case SelectionNotify:
1470	if (selection_wait == Sel_normal)	1471	if (selection_wait == Sel_normal)
1471	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1472	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1474	case SelectionRequest:	1475	case SelectionRequest:
1475	selection_send (ev.xselectionrequest);	1476	selection_send (ev.xselectionrequest);
1476	break;	1477	break;
1477		1478
1478	case MapNotify:	1479	case MapNotify:
		1480	#ifdef HAVE_BG_PIXMAP
		1481	/* This is needed spcifically to fix the case of no window manager or a
		1482	* non-reparenting window manager. In those cases we never get first
		1483	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1484	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1485	* reparenting.
		1486	* We should not render background immidiately, as there could be several
		1487	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1488	* by scheduling background redraw as soon as we can, but giving a short
		1489	* bit of time for ConfigureNotifies to arrive.
		1490	* We should render background PRIOR to drawing any text, but AFTER all
		1491	* of ConfigureNotifys for the best results.
		1492	*/
		1493	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1494	update_background_ev.start (0.025);
		1495	#endif
1479	mapped = 1;	1496	mapped = 1;
1480	#ifdef TEXT_BLINK	1497	#ifdef TEXT_BLINK
1481	text_blink_ev.start (TEXT_BLINK_INTERVAL);	1498	text_blink_ev.start ();
1482	#endif	1499	#endif
1483	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1500	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484	break;	1501	break;
1485		1502
1486	case UnmapNotify:	1503	case UnmapNotify:
…		…
1507	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1524	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508	{	1525	{
1509	scr_expose (ev.xexpose.x, ev.xexpose.y,	1526	scr_expose (ev.xexpose.x, ev.xexpose.y,
1510	ev.xexpose.width, ev.xexpose.height, False);	1527	ev.xexpose.width, ev.xexpose.height, False);
1511	}	1528	}
		1529
1512	want_refresh = 1;	1530	want_refresh = 1;
1513	}	1531	}
1514	else	1532	else
1515	{	1533	{
1516	XEvent unused_event;	1534	XEvent unused_event;
…		…
1518	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1536	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519	;	1537	;
1520	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1538	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521	;	1539	;
1522		1540
1523	if (isScrollbarWindow (ev.xany.window))	1541	if (scrollBar.state && ev.xany.window == scrollBar.win)
1524	{	1542	{
1525	scrollBar.setIdle ();	1543	scrollBar.state = STATE_IDLE;
1526	scrollbar_show (0);	1544	scrollBar.show (0);
1527	}	1545	}
1528	}	1546	}
1529	break;	1547	break;
1530		1548
1531	case MotionNotify:	1549	case MotionNotify:
…		…
1577	int dist;	1595	int dist;
1578		1596
1579	/* don't clobber the current delay if we are	1597	/* don't clobber the current delay if we are
1580	* already in the middle of scrolling.	1598	* already in the middle of scrolling.
1581	*/	1599	*/
1582	if (!sel_scroll_ev.active)	1600	if (!sel_scroll_ev.is_active ())
1583	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	1601	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584		1602
1585	/* save the event params so we can highlight	1603	/* save the event params so we can highlight
1586	* the selection in the pending-scroll loop	1604	* the selection in the pending-scroll loop
1587	*/	1605	*/
…		…
1610	else	1628	else
1611	{	1629	{
1612	/* we are within the text window, so we	1630	/* we are within the text window, so we
1613	* shouldn't be scrolling	1631	* shouldn't be scrolling
1614	*/	1632	*/
1615	if (sel_scroll_ev.active)
1616	sel_scroll_ev.stop();	1633	sel_scroll_ev.stop();
1617	}	1634	}
1618	#endif	1635	#endif
1619	#ifdef MOUSE_THRESHOLD	1636	#ifdef MOUSE_THRESHOLD
1620	}	1637	}
1621	#endif	1638	#endif
1622	}	1639	}
1623	}	1640	}
1624	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1641	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1625	{	1642	{
1626	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1643	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627	MotionNotify, &ev))	1644	MotionNotify, &ev))
1628	;	1645	;
1629		1646
…		…
1631	&unused_root, &unused_child,	1648	&unused_root, &unused_child,
1632	&unused_root_x, &unused_root_y,	1649	&unused_root_x, &unused_root_y,
1633	&ev.xbutton.x, &ev.xbutton.y,	1650	&ev.xbutton.x, &ev.xbutton.y,
1634	&unused_mask);	1651	&unused_mask);
1635	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1652	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1636	scrollbar_size ());	1653	scrollBar.size ());
1637	want_refresh = 1;	1654	want_refresh = 1;
1638	scrollbar_show (1);	1655	scrollBar.show (1);
1639	}	1656	}
1640	break;	1657	break;
1641	}	1658	}
1642		1659
1643	#if defined(CURSOR_BLINK)	1660	#if defined(CURSOR_BLINK)
…		…
1664		1681
1665	if (ev.type == KeyPress && hidden_pointer == 0)	1682	if (ev.type == KeyPress && hidden_pointer == 0)
1666	pointer_blank ();	1683	pointer_blank ();
1667	}	1684	}
1668	#endif	1685	#endif
		1686
		1687	refresh_check ();
1669	}	1688	}
		1689
		1690	#if ENABLE_FRILLS
		1691	void
		1692	rxvt_term::set_urgency (bool enable)
		1693	{
		1694	if (enable == urgency_hint)
		1695	return;
		1696
		1697	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1698	{
		1699	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1700	XSetWMHints (dpy, parent[0], h);
		1701	urgency_hint = enable;
		1702	}
		1703	}
		1704	#endif
1670		1705
1671	void	1706	void
1672	rxvt_term::focus_in ()	1707	rxvt_term::focus_in ()
1673	{	1708	{
1674	if (!focus)	1709	if (!focus)
1675	{	1710	{
1676	focus = 1;	1711	focus = 1;
1677	want_refresh = 1;	1712	want_refresh = 1;
1678		1713
1679	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1680
1681	#if USE_XIM	1714	#if USE_XIM
1682	if (Input_Context != NULL)	1715	if (Input_Context != NULL)
1683	{	1716	{
1684	IMSetPosition ();	1717	IMSetPosition ();
1685	XSetICFocus (Input_Context);	1718	XSetICFocus (Input_Context);
1686	}	1719	}
1687	#endif	1720	#endif
1688	#if CURSOR_BLINK	1721	#if CURSOR_BLINK
1689	if (option (Opt_cursorBlink))	1722	if (option (Opt_cursorBlink))
1690	cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);	1723	cursor_blink_ev.again ();
1691	#endif	1724	#endif
1692	#if OFF_FOCUS_FADING	1725	#if OFF_FOCUS_FADING
1693	if (rs[Rs_fade])	1726	if (rs[Rs_fade])
1694	{	1727	{
1695	pix_colors = pix_colors_focused;	1728	pix_colors = pix_colors_focused;
1696	scr_recolour ();	1729	scr_recolour ();
1697	}	1730	}
1698	#endif	1731	#endif
1699	#if ENABLE_FRILLS	1732	#if ENABLE_FRILLS
1700	if (option (Opt_urgentOnBell))	1733	if (option (Opt_urgentOnBell))
1701	{	1734	set_urgency (0);
1702	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703	{
1704	h->flags &= ~XUrgencyHint;
1705	XSetWMHints (dpy, parent[0], h);
1706	}
1707	}
1708	#endif	1735	#endif
		1736
		1737	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1709	}	1738	}
1710	}	1739	}
1711		1740
1712	void	1741	void
1713	rxvt_term::focus_out ()	1742	rxvt_term::focus_out ()
…		…
1715	if (focus)	1744	if (focus)
1716	{	1745	{
1717	focus = 0;	1746	focus = 0;
1718	want_refresh = 1;	1747	want_refresh = 1;
1719		1748
1720	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1749	#if ENABLE_FRILLS
1721		1750	if (option (Opt_urgentOnBell))
		1751	set_urgency (0);
		1752	#endif
1722	#if ENABLE_FRILLS || ISO_14755	1753	#if ENABLE_FRILLS || ISO_14755
1723	if (iso14755buf)	1754	if (iso14755buf)
1724	{	1755	{
1725	iso14755buf = 0;	1756	iso14755buf = 0;
1726	# if ISO_14755	1757	# if ISO_14755
…		…
1743	{	1774	{
1744	pix_colors = pix_colors_unfocused;	1775	pix_colors = pix_colors_unfocused;
1745	scr_recolour ();	1776	scr_recolour ();
1746	}	1777	}
1747	#endif	1778	#endif
		1779
		1780	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1748	}	1781	}
1749	}	1782	}
1750		1783
1751	void	1784	void
1752	rxvt_term::update_fade_color (unsigned int idx)	1785	rxvt_term::update_fade_color (unsigned int idx)
…		…
1783	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1816	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784	{	1817	{
1785	bgPixmap.set_root_pixmap ();	1818	bgPixmap.set_root_pixmap ();
1786	update_background ();	1819	update_background ();
1787	}	1820	}
		1821
1788	break;	1822	break;
1789	}	1823	}
1790	# endif	1824	# endif
		1825
		1826	refresh_check ();
1791	}	1827	}
1792	#endif	1828	#endif
1793		1829
1794	void	1830	void
1795	rxvt_term::button_press (XButtonEvent &ev)	1831	rxvt_term::button_press (XButtonEvent &ev)
…		…
1908	}	1944	}
1909		1945
1910	/*	1946	/*
1911	* Scrollbar window processing of button press	1947	* Scrollbar window processing of button press
1912	*/	1948	*/
1913	if (isScrollbarWindow (ev.window))	1949	if (scrollBar.state && ev.window == scrollBar.win)
1914	{	1950	{
1915	scrollBar.setIdle ();	1951	page_dirn direction = NO_DIR;
		1952
		1953	if (scrollBar.upButton (ev.y))
		1954	direction = UP; /* up */
		1955	else if (scrollBar.dnButton (ev.y))
		1956	direction = DN; /* down */
		1957
		1958	scrollBar.state = STATE_IDLE;
1916	/*	1959	/*
1917	* Rxvt-style scrollbar:	1960	* Rxvt-style scrollbar:
1918	* move up if mouse is above slider	1961	* move up if mouse is above slider
1919	* move dn if mouse is below slider	1962	* move dn if mouse is below slider
1920	*	1963	*
…		…
1929	/*	1972	/*
1930	* Mouse report disabled scrollbar:	1973	* Mouse report disabled scrollbar:
1931	* arrow buttons - send up/down	1974	* arrow buttons - send up/down
1932	* click on scrollbar - send pageup/down	1975	* click on scrollbar - send pageup/down
1933	*/	1976	*/
1934	if ((scrollBar.style == R_SB_NEXT	1977	if (direction == UP)
1935	&& scrollbarnext_upButton (ev.y))
1936	|| (scrollBar.style == R_SB_RXVT
1937	&& scrollbarrxvt_upButton (ev.y)))
1938	tt_printf ("\033[A");	1978	tt_printf ("\033[A");
1939	else if ((scrollBar.style == R_SB_NEXT	1979	else if (direction == DN)
1940	&& scrollbarnext_dnButton (ev.y))
1941	|| (scrollBar.style == R_SB_RXVT
1942	&& scrollbarrxvt_dnButton (ev.y)))
1943	tt_printf ("\033[B");	1980	tt_printf ("\033[B");
1944	else	1981	else
1945	switch (ev.button)	1982	switch (ev.button)
1946	{	1983	{
1947	case Button2:	1984	case Button2:
…		…
1955	break;	1992	break;
1956	}	1993	}
1957	}	1994	}
1958	else	1995	else
1959	#endif /* NO_SCROLLBAR_REPORT */	1996	#endif /* NO_SCROLLBAR_REPORT */
1960
1961	{
1962	char upordown = 0;
1963
1964	if (scrollBar.style == R_SB_NEXT)
1965	{	1997	{
1966	if (scrollbarnext_upButton (ev.y))	1998	if (direction != NO_DIR)
1967	upordown = -1; /* up */
1968	else if (scrollbarnext_dnButton (ev.y))
1969	upordown = 1; /* down */
1970	}
1971	else if (scrollBar.style == R_SB_RXVT)
1972	{
1973	if (scrollbarrxvt_upButton (ev.y))
1974	upordown = -1; /* up */
1975	else if (scrollbarrxvt_dnButton (ev.y))
1976	upordown = 1; /* down */
1977	}
1978	if (upordown)
1979	{	1999	{
1980	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2000	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		2001	if (!cont_scroll_ev.is_active ())
1981	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2002	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982	#endif	2003	#endif
1983	if (scr_page (upordown < 0 ? UP : DN, 1))	2004	if (scr_page (direction, 1))
1984	{	2005	{
1985	if (upordown < 0)	2006	if (direction == UP)
1986	scrollBar.setUp ();	2007	scrollBar.state = STATE_UP;
1987	else	2008	else
1988	scrollBar.setDn ();	2009	scrollBar.state = STATE_DOWN;
1989	}	2010	}
1990	}	2011	}
1991	else	2012	else
1992	switch (ev.button)	2013	switch (ev.button)
1993	{	2014	{
1994	case Button2:	2015	case Button2:
1995	switch (scrollbar_align)	2016	switch (scrollBar.align)
1996	{	2017	{
1997	case R_SB_ALIGN_TOP:	2018	case R_SB_ALIGN_TOP:
1998	csrO = 0;	2019	csrO = 0;
1999	break;	2020	break;
2000	case R_SB_ALIGN_CENTRE:	2021	case R_SB_ALIGN_CENTRE:
…		…
2006	}	2027	}
2007		2028
2008	if (scrollBar.style == R_SB_XTERM	2029	if (scrollBar.style == R_SB_XTERM
2009	|| scrollbar_above_slider (ev.y)	2030	|| scrollbar_above_slider (ev.y)
2010	|| scrollbar_below_slider (ev.y))	2031	|| scrollbar_below_slider (ev.y))
2011	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2032	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2012		2033
2013	scrollBar.setMotion ();	2034	scrollBar.state = STATE_MOTION;
2014	break;	2035	break;
2015		2036
2016	case Button1:	2037	case Button1:
2017	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2038	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018	csrO = ev.y - scrollBar.top;	2039	csrO = ev.y - scrollBar.top;
2019	/* FALLTHROUGH */	2040	/* FALLTHROUGH */
2020		2041
2021	case Button3:	2042	case Button3:
2022	if (scrollBar.style != R_SB_XTERM)	2043	if (scrollBar.style != R_SB_XTERM)
…		…
2032	scr_page (DN, nrow - 1);	2053	scr_page (DN, nrow - 1);
2033	# else	2054	# else
2034	scr_page (DN, nrow / 4);	2055	scr_page (DN, nrow / 4);
2035	# endif	2056	# endif
2036	else	2057	else
2037	scrollBar.setMotion ();	2058	scrollBar.state = STATE_MOTION;
2038	}	2059	}
2039	else	2060	else
2040	{	2061	{
2041	scr_page ((ev.button == Button1 ? DN : UP),	2062	scr_page ((ev.button == Button1 ? DN : UP),
2042	(nrow	2063	(nrow
2043	* scrollbar_position (ev.y)	2064	* scrollbar_position (ev.y)
2044	/ scrollbar_size ()));	2065	/ scrollBar.size ()));
2045	}	2066	}
2046		2067
2047	break;	2068	break;
2048	}	2069	}
2049	}	2070	}
…		…
2059		2080
2060	csrO = 0; /* reset csr Offset */	2081	csrO = 0; /* reset csr Offset */
2061	if (!bypass_keystate)	2082	if (!bypass_keystate)
2062	reportmode = !! (priv_modes & PrivMode_mouse_report);	2083	reportmode = !! (priv_modes & PrivMode_mouse_report);
2063		2084
2064	if (scrollbar_isUpDn ())	2085	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065	{	2086	{
2066	scrollBar.setIdle ();	2087	scrollBar.state = STATE_IDLE;
2067	scrollbar_show (0);	2088	scrollBar.show (0);
2068	}	2089	}
2069		2090
2070	#ifdef SELECTION_SCROLLING	2091	#ifdef SELECTION_SCROLLING
2071	if (sel_scroll_ev.active)
2072	sel_scroll_ev.stop();	2092	sel_scroll_ev.stop();
2073	#endif	2093	#endif
2074		2094
2075	if (ev.window == vt)	2095	if (ev.window == vt)
2076	{	2096	{
2077	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2097	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2149	{	2169	{
2150	mouse_slip_wheel_speed += v ? -1 : 1;	2170	mouse_slip_wheel_speed += v ? -1 : 1;
2151	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2171	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2172	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153		2173
		2174	if (!slip_wheel_ev.is_active ())
2154	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2175	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155	}	2176	}
2156	else	2177	else
		2178	# endif
2157	{	2179	{
2158	# endif
2159	scr_page (v, i);	2180	scr_page (v, i);
2160	scrollbar_show (1);	2181	scrollBar.show (1);
2161	# ifdef MOUSE_SLIP_WHEELING
2162	}	2182	}
2163	# endif
2164	}	2183	}
2165	break;	2184	break;
2166	#endif	2185	#endif
2167	}	2186	}
2168	}	2187	}
2169	}	2188	}
2170		2189
2171	/*}}} */	2190	/*}}} */
2172		2191
2173	bool	2192	void
2174	rxvt_term::cmd_parse ()	2193	rxvt_term::cmd_parse ()
2175	{	2194	{
2176	bool flag = false;
2177	wchar_t ch = NOCHAR;	2195	wchar_t ch = NOCHAR;
2178	char *seq_begin; // remember start of esc-sequence here	2196	char *seq_begin; // remember start of esc-sequence here
2179		2197
2180	for (;;)	2198	for (;;)
2181	{	2199	{
2182	if (ch == NOCHAR)	2200	if (expect_false (ch == NOCHAR))
2183	{	2201	{
2184	seq_begin = cmdbuf_ptr;	2202	seq_begin = cmdbuf_ptr;
2185	ch = next_char ();	2203	ch = next_char ();
2186		2204
2187	if (ch == NOCHAR)	2205	if (ch == NOCHAR)
2188	break;	2206	break;
2189	}	2207	}
2190		2208
2191	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2209	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2192	{	2210	{
2193	if (!seen_input)	2211	if (expect_false (!seen_input))
2194	{	2212	{
2195	seen_input = 1;	2213	seen_input = 1;
2196	// many badly-written programs (e.g. jed) contain a race condition:	2214	// many badly-written programs (e.g. jed) contain a race condition:
2197	// they first read the screensize and then install a SIGWINCH handler.	2215	// they first read the screensize and then install a SIGWINCH handler.
2198	// some window managers resize the window early, and these programs	2216	// some window managers resize the window early, and these programs
…		…
2211	wchar_t *str = buf;	2229	wchar_t *str = buf;
2212	wchar_t *eol = str + min (ncol, UBUFSIZ);	2230	wchar_t *eol = str + min (ncol, UBUFSIZ);
2213		2231
2214	for (;;)	2232	for (;;)
2215	{	2233	{
2216	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2234	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2217	break;	2235	break;
2218		2236
2219	*str++ = ch;	2237	*str++ = ch;
2220		2238
2221	if (ch == C0_LF || str >= eol)	2239	if (expect_false (ch == C0_LF || str >= eol))
2222	{	2240	{
2223	if (ch == C0_LF)	2241	if (ch == C0_LF)
2224	nlines++;	2242	nlines++;
2225		2243
2226	refresh_count++;	2244	refresh_count++;
…		…
2275	* What the heck we'll cheat and only refresh less than every page-full.	2293	* What the heck we'll cheat and only refresh less than every page-full.
2276	* if skipScroll is enabled.	2294	* if skipScroll is enabled.
2277	*/	2295	*/
2278	if (refreshnow)	2296	if (refreshnow)
2279	{	2297	{
2280	flag = true;
2281	scr_refresh ();	2298	scr_refresh ();
2282	want_refresh = 1;	2299	want_refresh = 1;
2283	}	2300	}
2284
2285	}	2301	}
2286	else	2302	else
2287	{	2303	{
2288	try	2304	try
2289	{	2305	{
…		…
2297	}	2313	}
2298		2314
2299	ch = NOCHAR;	2315	ch = NOCHAR;
2300	}	2316	}
2301	}	2317	}
2302
2303	return flag;
2304	}	2318	}
2305		2319
2306	// read the next character	2320	// read the next character
2307	wchar_t	2321	wchar_t
2308	rxvt_term::next_char () NOTHROW	2322	rxvt_term::next_char () NOTHROW
2309	{	2323	{
2310	while (cmdbuf_ptr < cmdbuf_endp)	2324	while (cmdbuf_ptr < cmdbuf_endp)
2311	{	2325	{
2312	// assume 7-bit to be ascii ALWAYS	2326	// assume 7-bit to be ascii ALWAYS
2313	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2327	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2314	return *cmdbuf_ptr++;	2328	return *cmdbuf_ptr++;
2315		2329
2316	wchar_t wc;	2330	wchar_t wc;
2317	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2331	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2318		2332
…		…
2322	cmdbuf_ptr = cmdbuf_endp;	2336	cmdbuf_ptr = cmdbuf_endp;
2323	break;	2337	break;
2324	}	2338	}
2325		2339
2326	if (len == (size_t)-1)	2340	if (len == (size_t)-1)
		2341	{
		2342	mbstate.reset (); // reset now undefined conversion state
2327	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2343	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2344	}
2328		2345
2329	// assume wchar == unicode	2346	// assume wchar == unicode
2330	cmdbuf_ptr += len;	2347	cmdbuf_ptr += len;
2331	return wc & UNICODE_MASK;	2348	return wc & UNICODE_MASK;
2332	}	2349	}
…		…
2376	/*----------------------------------------------------------------------*/	2393	/*----------------------------------------------------------------------*/
2377	#ifdef PRINTPIPE	2394	#ifdef PRINTPIPE
2378	FILE *	2395	FILE *
2379	rxvt_term::popen_printer ()	2396	rxvt_term::popen_printer ()
2380	{	2397	{
2381	FILE *stream = popen (rs[Rs_print_pipe], "w");	2398	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2382		2399
2383	if (stream == NULL)	2400	if (stream == NULL)
2384	rxvt_warn ("can't open printer pipe, not printing.\n");	2401	rxvt_warn ("can't open printer pipe, not printing.\n");
2385		2402
2386	return stream;	2403	return stream;
…		…
2397	* simulate attached vt100 printer	2414	* simulate attached vt100 printer
2398	*/	2415	*/
2399	void	2416	void
2400	rxvt_term::process_print_pipe ()	2417	rxvt_term::process_print_pipe ()
2401	{	2418	{
2402	int done;	2419	FILE *fd = popen_printer ();
2403	FILE *fd;
2404		2420
2405	if ((fd = popen_printer ()) == NULL)	2421	if (!fd)
2406	return;	2422	return;
2407		2423
2408	/*	2424	/*
2409	* Send all input to the printer until either ESC[4i or ESC[?4i	2425	* Send all input to the printer until either ESC[4i or ESC[?4i
2410	* is received.	2426	* is received.
2411	*/	2427	*/
2412	for (done = 0; !done;)	2428	for (int done = 0; !done; )
2413	{	2429	{
2414	unsigned char buf[8];	2430	unsigned char buf[8];
2415	unicode_t ch;	2431	unicode_t ch;
2416	unsigned int i, len;	2432	unsigned int i, len;
2417		2433
…		…
2562	break;	2578	break;
2563	case 'Z': /* identify the terminal type */	2579	case 'Z': /* identify the terminal type */
2564	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2580	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2565	break;	2581	break;
2566	case '<': /* turn off VT52 mode */	2582	case '<': /* turn off VT52 mode */
2567	PrivMode (0, PrivMode_vt52);	2583	set_privmode (PrivMode_vt52, 0);
2568	break;	2584	break;
2569	case 'F': /* use special graphics character set */	2585	case 'F': /* use special graphics character set */
2570	case 'G': /* use regular character set */	2586	case 'G': /* use regular character set */
2571	/* unimplemented */	2587	/* unimplemented */
2572	break;	2588	break;
…		…
2626	scr_forwardindex ();	2642	scr_forwardindex ();
2627	break;	2643	break;
2628	#endif	2644	#endif
2629	case '=':	2645	case '=':
2630	case '>':	2646	case '>':
2631	PrivMode ((ch == '='), PrivMode_aplKP);	2647	set_privmode (PrivMode_aplKP, ch == '=');
2632	break;	2648	break;
2633		2649
2634	case C1_40:	2650	case C1_40:
2635	cmd_getc ();	2651	cmd_getc ();
2636	break;	2652	break;
…		…
2675	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2691	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2676	case C1_SCI: /* ESC Z */	2692	case C1_SCI: /* ESC Z */
2677	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2693	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2678	break; /* steal obsolete ESC [ c */	2694	break; /* steal obsolete ESC [ c */
2679		2695
2680	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2696	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2681	case C1_CSI: /* ESC [ */	2697	case C1_CSI: /* ESC [ */
2682	process_csi_seq ();	2698	process_csi_seq ();
2683	break;	2699	break;
2684		2700
2685	/* 8.3.90: OPERATING SYSTEM COMMAND */	2701	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2686	case C1_OSC: /* ESC ] */	2702	case C1_OSC: /* ESC ] */
2687	process_osc_seq ();	2703	process_osc_seq ();
2688	break;	2704	break;
2689		2705
2690	/* 8.3.106: RESET TO INITIAL STATE */	2706	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2691	case 'c':	2707	case 'c':
2692	mbstate.reset ();	2708	mbstate.reset ();
2693	scr_poweron ();	2709	scr_poweron ();
2694	scrollbar_show (1);	2710	scrollBar.show (1);
2695	break;	2711	break;
2696		2712
2697	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2713	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2698	case 'n':	2714	case 'n':
2699	scr_charset_choose (2);	2715	scr_charset_choose (2);
…		…
2750		2766
2751	nargs = 0;	2767	nargs = 0;
2752		2768
2753	priv = 0;	2769	priv = 0;
2754	ch = cmd_getc ();	2770	ch = cmd_getc ();
2755	if (ch >= '<' && ch <= '?')	2771	if ((ch >= '<' && ch <= '?') || ch == '!')
		2772	{
2756	{ /* '<' '=' '>' '?' */	2773	/* '<' '=' '>' '?' '!' */
2757	priv = ch;	2774	priv = ch;
2758	ch = cmd_getc ();	2775	ch = cmd_getc ();
2759	}	2776	}
2760		2777
2761	/* read any numerical arguments */	2778	/* read any numerical arguments */
…		…
2810	// versions.	2827	// versions.
2811	//	2828	//
2812	tt_printf ("\033[>%d;95;0c", 'U');	2829	tt_printf ("\033[>%d;95;0c", 'U');
2813	}	2830	}
2814	break;	2831	break;
		2832
2815	case '?':	2833	case '?':
2816	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2834	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2817	process_terminal_mode (ch, priv, nargs, arg);	2835	process_terminal_mode (ch, priv, nargs, arg);
2818	break;	2836	break;
		2837
		2838	case '!':
		2839	if (ch == CSI_70)
		2840	{
		2841	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2842	scr_soft_reset ();
		2843
		2844	static const int pm_h[] = { 7, 25 };
		2845	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2846
		2847	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2848	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2819	}	2849	}
		2850	break;
		2851	}
		2852
2820	return;	2853	return;
2821	}	2854	}
2822		2855
2823	switch (ch)	2856	switch (ch)
2824	{	2857	{
…		…
3253		3286
3254	/*	3287	/*
3255	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3288	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3256	*/	3289	*/
3257	void	3290	void
3258	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3291	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3259	{	3292	{
3260	int color;	3293	int color;
3261	char *buf, *name;	3294	char *buf, *name;
3262	bool query = str[0] == '?' && !str[1];	3295	bool query = str[0] == '?' && !str[1];
3263	int saveop = op;	3296	int saveop = op;
…		…
3304		3337
3305	XFree (value);	3338	XFree (value);
3306	}	3339	}
3307	else	3340	else
3308	{	3341	{
3309	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3342	char *eq = strchr (str, '=');
3310		3343
3311	if (eq)	3344	if (eq)
3312	{	3345	{
3313	*eq = 0;	3346	*eq = 0;
3314	set_utf8_property (display->atom (str), eq + 1);	3347	set_utf8_property (display->atom (str), eq + 1);
…		…
3335	*buf++ = '\0';	3368	*buf++ = '\0';
3336		3369
3337	process_color_seq (op, color, name, resp);	3370	process_color_seq (op, color, name, resp);
3338	}	3371	}
3339	break;	3372	break;
		3373	case Rxvt_restoreFG:
3340	case XTerm_Color00:	3374	case XTerm_Color00:
3341	process_color_seq (op, Color_fg, str, resp);	3375	process_color_seq (op, Color_fg, str, resp);
3342	break;	3376	break;
		3377	case Rxvt_restoreBG:
3343	case XTerm_Color01:	3378	case XTerm_Color01:
3344	process_color_seq (op, Color_bg, str, resp);	3379	process_color_seq (op, Color_bg, str, resp);
3345	break;	3380	break;
3346	#ifndef NO_CURSORCOLOR	3381	#ifndef NO_CURSORCOLOR
3347	case XTerm_Color_cursor:	3382	case XTerm_Color_cursor:
…		…
3368	break;	3403	break;
3369	case URxvt_Color_IT:	3404	case URxvt_Color_IT:
3370	process_color_seq (op, Color_IT, str, resp);	3405	process_color_seq (op, Color_IT, str, resp);
3371	break;	3406	break;
3372	#endif	3407	#endif
		3408	case URxvt_Color_border:
		3409	process_color_seq (op, Color_border, str, resp);
		3410	break;
3373	#if ENABLE_TRANSPARENCY	3411	#if ENABLE_TRANSPARENCY
3374	case URxvt_Color_tint:	3412	case URxvt_Color_tint:
3375	process_color_seq (op, Color_tint, str, resp);	3413	process_color_seq (op, Color_tint, str, resp);
3376	{	3414	{
3377	bool changed = false;	3415	bool changed = false;
		3416
3378	if (ISSET_PIXCOLOR (Color_tint))	3417	if (ISSET_PIXCOLOR (Color_tint))
3379	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3418	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3380	else	3419	else
3381	changed = bgPixmap.unset_tint ();	3420	changed = bgPixmap.unset_tint ();
		3421
3382	if (changed)	3422	if (changed)
3383	update_background ();	3423	update_background ();
3384	}	3424	}
3385		3425
3386	break;	3426	break;
…		…
3409	changed++;	3449	changed++;
3410	str = strchr (str, ';');	3450	str = strchr (str, ';');
3411	if (str == NULL)	3451	if (str == NULL)
3412	bgPixmap.set_defaultGeometry ();	3452	bgPixmap.set_defaultGeometry ();
3413	}	3453	}
		3454
3414	while (str)	3455	while (str)
3415	{	3456	{
3416	str++;	3457	str++;
3417	if (bgPixmap.set_geometry (str))	3458	if (bgPixmap.set_geometry (str))
3418	changed++;	3459	changed++;
3419	str = strchr (str, ';');	3460	str = strchr (str, ';');
3420	}	3461	}
		3462
3421	if (changed)	3463	if (changed)
3422	update_background ();	3464	update_background ();
3423	}	3465	}
3424	break;	3466	break;
3425	#endif	3467	#endif
3426
3427	case Rxvt_restoreFG:
3428	set_window_color (Color_fg, str);
3429	break;
3430	case Rxvt_restoreBG:
3431	set_window_color (Color_bg, str);
3432	break;
3433		3468
3434	case XTerm_logfile:	3469	case XTerm_logfile:
3435	// TODO, when secure mode?	3470	// TODO, when secure mode?
3436	break;	3471	break;
3437		3472
…		…
3504	break;	3539	break;
3505	#endif	3540	#endif
3506		3541
3507	#if ENABLE_PERL	3542	#if ENABLE_PERL
3508	case URxvt_perl:	3543	case URxvt_perl:
3509	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3544	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3510	; // no responses yet
3511	break;	3545	break;
3512	#endif	3546	#endif
3513	}	3547	}
3514	}	3548	}
3515	/*----------------------------------------------------------------------*/	3549	/*----------------------------------------------------------------------*/
…		…
3538	{	3572	{
3539	if (mode == 'r')	3573	if (mode == 'r')
3540	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3574	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3541	else	3575	else
3542	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3576	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3543	PrivMode (state, bit);	3577	set_privmode (bit, state);
3544	}	3578	}
3545		3579
3546	return state;	3580	return state;
3547	}	3581	}
3548		3582
…		…
3556	static const struct	3590	static const struct
3557	{	3591	{
3558	const int argval;	3592	const int argval;
3559	const unsigned long bit;	3593	const unsigned long bit;
3560	} argtopriv[] = {	3594	} argtopriv[] = {
3561	{ 1, PrivMode_aplCUR },	3595	{ 1, PrivMode_aplCUR }, // DECCKM
3562	{ 2, PrivMode_vt52 },	3596	{ 2, PrivMode_vt52 },
3563	{ 3, PrivMode_132 },	3597	{ 3, PrivMode_132 }, // DECCOLM
3564	{ 4, PrivMode_smoothScroll },	3598	{ 4, PrivMode_smoothScroll }, // DECSCLM
3565	{ 5, PrivMode_rVideo },	3599	{ 5, PrivMode_rVideo }, // DECSCNM
3566	{ 6, PrivMode_relOrigin },	3600	{ 6, PrivMode_relOrigin }, // DECOM
3567	{ 7, PrivMode_Autowrap },	3601	{ 7, PrivMode_Autowrap }, // DECAWM
3568	// 8, bi-directional support mode	3602	// 8, auto-repeat keys // DECARM
3569	{ 9, PrivMode_MouseX10 },	3603	{ 9, PrivMode_MouseX10 },
3570	// 18, 19 printing-related	3604	// 18 end FF to printer after print screen
		3605	// 19 Print screen prints full screen/scorll region
3571	{ 25, PrivMode_VisibleCursor },	3606	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3572	#ifdef scrollBar_esc	3607	#ifdef scrollBar_esc
3573	{ scrollBar_esc, PrivMode_scrollBar },	3608	{ scrollBar_esc, PrivMode_scrollBar },
3574	#endif	3609	#endif
3575	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3610	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3611	// 38, tektronix mode // DECTEK
3576	{ 40, PrivMode_132OK },	3612	{ 40, PrivMode_132OK },
3577	// 41 xterm more fixes NYI	3613	// 41 xterm more fixes NYI
3578	// 45 margin bell NYI	3614	// 45 margin bell NYI
3579	// 46 start logging	3615	// 46 start logging
3580	{ 47, PrivMode_Screen },	3616	{ 47, PrivMode_Screen },
3581	{ 66, PrivMode_aplKP },	3617	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3582	#ifndef NO_BACKSPACE_KEY	3618	#ifndef NO_BACKSPACE_KEY
3583	{ 67, PrivMode_BackSpace },	3619	{ 67, PrivMode_BackSpace }, // DECBKM
3584	#endif	3620	#endif
3585	{ 1000, PrivMode_MouseX11 },	3621	{ 1000, PrivMode_MouseX11 },
3586	// 1001 Use Hilite Mouse Tracking. NYI, TODO
3587	{ 1002, PrivMode_MouseBtnEvent },	3622	{ 1002, PrivMode_MouseBtnEvent },
3588	{ 1003, PrivMode_MouseAnyEvent },	3623	{ 1003, PrivMode_MouseAnyEvent },
3589	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3624	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590	{ 1011, PrivMode_Keypress }, // rxvt extension	3625	{ 1011, PrivMode_Keypress }, // rxvt extension
3591	// 1035 enable modifiers for alt, numlock NYI	3626	// 1035 enable modifiers for alt, numlock NYI
…		…
3593	// 1037 send DEL for keypad delete NYI	3628	// 1037 send DEL for keypad delete NYI
3594	{ 1047, PrivMode_Screen },	3629	{ 1047, PrivMode_Screen },
3595	// 1048 save and restore cursor	3630	// 1048 save and restore cursor
3596	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3631	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3597	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3632	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3633	{ 2004, PrivMode_BracketPaste },
3598	};	3634	};
3599		3635
3600	if (nargs == 0)	3636	if (nargs == 0)
3601	return;	3637	return;
3602		3638
…		…
3627		3663
3628	scr_touch (true);	3664	scr_touch (true);
3629	break;	3665	break;
3630	#endif	3666	#endif
3631	case 1048: /* alternative cursor save */	3667	case 1048: /* alternative cursor save */
3632	case 1049:
3633	if (option (Opt_secondaryScreen))	3668	if (option (Opt_secondaryScreen))
3634	if (mode == 0)	3669	if (mode == 0)
3635	scr_cursor (RESTORE);	3670	scr_cursor (RESTORE);
3636	else if (mode == 1)	3671	else if (mode == 1)
3637	scr_cursor (SAVE);	3672	scr_cursor (SAVE);
…		…
3646	case 2: /* VT52 mode */	3681	case 2: /* VT52 mode */
3647	/* oddball mode. should be set regardless of set/reset	3682	/* oddball mode. should be set regardless of set/reset
3648	* parameter. Return from VT52 mode with an ESC < from	3683	* parameter. Return from VT52 mode with an ESC < from
3649	* within VT52 mode	3684	* within VT52 mode
3650	*/	3685	*/
3651	PrivMode (1, PrivMode_vt52);	3686	set_privmode (PrivMode_vt52, 1);
3652	break;	3687	break;
3653	case 3: /* 80/132 */	3688	case 3: /* 80/132 */
3654	if (priv_modes & PrivMode_132OK)	3689	if (priv_modes & PrivMode_132OK)
3655	set_widthheight (((state ? 132 : 80) * fwidth), height);	3690	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3656	break;	3691	break;
3657	case 4: /* smooth scrolling */	3692	case 4: /* smooth scrolling */
3658	set_option (Opt_jumpScroll, !state);	3693	set_option (Opt_jumpScroll, !state);
3659	break;	3694	break;
3660	case 5: /* reverse video */	3695	case 5: /* reverse video */
…		…
3671	if (state) /* orthogonal */	3706	if (state) /* orthogonal */
3672	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3707	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3673	break;	3708	break;
3674	#ifdef scrollBar_esc	3709	#ifdef scrollBar_esc
3675	case scrollBar_esc:	3710	case scrollBar_esc:
3676	if (scrollbar_mapping (state))	3711	if (scrollBar.map (state))
3677	{	3712	{
3678	resize_all_windows (0, 0, 0);	3713	resize_all_windows (0, 0, 0);
3679	scr_touch (true);	3714	scr_touch (true);
3680	}	3715	}
3681	break;	3716	break;
…		…
3692	/* case 67: - backspace key */	3727	/* case 67: - backspace key */
3693	case 1000: /* X11 mouse reporting */	3728	case 1000: /* X11 mouse reporting */
3694	if (state) /* orthogonal */	3729	if (state) /* orthogonal */
3695	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3730	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696	break;	3731	break;
3697	#if 0
3698	case 1001:
3699	break; /* X11 mouse highlighting */
3700	#endif
3701	case 1002:	3732	case 1002:
3702	case 1003:	3733	case 1003:
3703	if (state)	3734	if (state)
3704	{	3735	{
3705	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);	3736	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3706	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3737	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3707	vt_emask_mouse = PointerMotionMask;	3738	vt_emask_mouse = PointerMotionMask;
3708	}	3739	}
3709	else	3740	else
3710	vt_emask_mouse = NoEventMask;	3741	vt_emask_mouse = NoEventMask;
		3742
3711	vt_select_input ();	3743	vt_select_input ();
3712	break;	3744	break;
3713	case 1010: /* scroll to bottom on TTY output inhibit */	3745	case 1010: /* scroll to bottom on TTY output inhibit */
3714	set_option (Opt_scrollTtyOutput, !state);	3746	set_option (Opt_scrollTtyOutput, !state);
3715	break;	3747	break;
3716	case 1011: /* scroll to bottom on key press */	3748	case 1011: /* scroll to bottom on key press */
3717	set_option (Opt_scrollTtyKeypress, state);	3749	set_option (Opt_scrollTtyKeypress, state);
3718	break;	3750	break;
3719	case 1047: /* secondary screen w/ clearing last */	3751	case 1047: /* secondary screen w/ clearing last */
3720	if (option (Opt_secondaryScreen))	3752	if (option (Opt_secondaryScreen))
3721	if (current_screen != PRIMARY)	3753	if (!state)
3722	scr_erase_screen (2);	3754	scr_erase_screen (2);
		3755
3723	scr_change_screen (state);	3756	scr_change_screen (state);
3724	break;	3757	break;
3725	case 1049: /* secondary screen w/ clearing first */	3758	case 1049: /* secondary screen w/ clearing first */
		3759	if (option (Opt_secondaryScreen))
		3760	if (state)
		3761	scr_cursor (SAVE);
		3762
3726	scr_change_screen (state);	3763	scr_change_screen (state);
		3764
3727	if (option (Opt_secondaryScreen))	3765	if (option (Opt_secondaryScreen))
3728	if (current_screen != PRIMARY)	3766	if (state)
3729	scr_erase_screen (2);	3767	scr_erase_screen (2);
		3768	else
		3769	scr_cursor (RESTORE);
3730	break;	3770	break;
3731	default:	3771	default:
3732	break;	3772	break;
3733	}	3773	}
3734	}	3774	}
…		…
3894	rxvt_term::process_graphics ()	3934	rxvt_term::process_graphics ()
3895	{	3935	{
3896	unicode_t ch, cmd = cmd_getc ();	3936	unicode_t ch, cmd = cmd_getc ();
3897		3937
3898	if (cmd == 'Q')	3938	if (cmd == 'Q')
		3939	{
3899	{ /* query graphics */	3940	/* query graphics */
3900	tt_printf ("\033G0\012"); /* no graphics */	3941	tt_printf ("\033G0\012"); /* no graphics */
3901	return;	3942	return;
3902	}	3943	}
3903	/* swallow other graphics sequences until terminating ':' */	3944	/* swallow other graphics sequences until terminating ':' */
3904	do	3945	do

Diff Legend

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