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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.339 by ayin, Fri Aug 3 14:03:28 2007 UTC vs.
Revision 1.412 by ayin, Sun Feb 17 11:13:11 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.
…		…
95	XK_Shift_L, 0x21e7,	96	XK_Shift_L, 0x21e7,
96	XK_Shift_R, 0x21e7,	97	XK_Shift_R, 0x21e7,
97		98
98	XK_Shift_Lock, 0x21eb,	99	XK_Shift_Lock, 0x21eb,
99	XK_ISO_Lock, 0x21eb,	100	XK_ISO_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,
101	XK_Caps_Lock, 0x21ec,	101	XK_Caps_Lock, 0x21ec,
102	XK_Num_Lock, 0x21ed,	102	XK_Num_Lock, 0x21ed,
103	XK_ISO_Level3_Shift, 0x21ee,	103	XK_ISO_Level3_Shift, 0x21ee,
104	XK_ISO_Level3_Lock, 0x21ef,	104	XK_ISO_Level3_Lock, 0x21ef,
105	XK_ISO_Group_Lock, 0x21f0,	105	XK_ISO_Group_Lock, 0x21f0,
…		…
199	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
201		201
202	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
203		203
204	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
206		206
207	if (y >= 0)	207	if (y >= 0)
208	{	208	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
221	ch = *chr++;	221	ch = *chr++;
222		222
223	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
224	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
225	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
226	# if !UNICODE3	226	# if !UNICODE_3
227	if (ch >= 0x10000)	227	if (ch >= 0x10000)
228	ch = 0xfffd;	228	ch = 0xfffd;
229	# endif	229	# endif
230	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
231		231
…		…
279	}	279	}
280		280
281	iso14755buf = 0;	281	iso14755buf = 0;
282	}	282	}
283		283
284	int	284	static int
285	rxvt_term::hex_keyval (XKeyEvent &ev)	285	hex_keyval (XKeyEvent &ev)
286	{	286	{
287	// check wether this event corresponds to a hex digit	287	// check wether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	288	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	289	for (int index = 0; index < 8; index++)
290	{	290	{
…		…
298		298
299	return -1;	299	return -1;
300	}	300	}
301	#endif	301	#endif
302		302
		303	static inline KeySym
		304	translate_keypad (KeySym keysym, bool kp)
		305	{
		306	#ifdef XK_KP_Home
		307	static const KeySym keypadtrans[] = {
		308	XK_KP_7, // XK_KP_Home
		309	XK_KP_4, // XK_KP_Left
		310	XK_KP_8, // XK_KP_Up
		311	XK_KP_6, // XK_KP_Right
		312	XK_KP_2, // XK_KP_Down
		313	# ifndef UNSHIFTED_SCROLLKEYS
		314	XK_KP_9, // XK_KP_Prior
		315	XK_KP_3, // XK_KP_Next
		316	# else
		317	XK_Prior,
		318	XK_Next,
		319	# endif
		320	XK_KP_1, // XK_KP_End
		321	XK_KP_5, // XK_KP_Begin
		322	};
		323
		324	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		325	{
		326	unsigned int index = keysym - XK_KP_Home;
		327	keysym = kp ? keypadtrans[index] : XK_Home + index;
		328	}
		329	else if (keysym == XK_KP_Insert)
		330	keysym = kp ? XK_KP_0 : XK_Insert;
		331	# ifndef NO_DELETE_KEY
		332	else if (keysym == XK_KP_Delete)
		333	keysym = kp ? XK_KP_Decimal : XK_Delete;
		334	# endif
		335	#endif
		336	return keysym;
		337	}
		338
		339	static inline int
		340	map_function_key (KeySym keysym)
		341	{
		342	int param = 0;
		343
		344	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		345	{
		346	param = 11 + keysym - XK_F1;
		347	if (keysym >= XK_F17)
		348	param += 4;
		349	else if (keysym >= XK_F15)
		350	param += 3;
		351	else if (keysym >= XK_F11)
		352	param += 2;
		353	else if (keysym >= XK_F6)
		354	param += 1;
		355	}
		356	else
		357	switch (keysym)
		358	{
		359	case XK_Find:
		360	param = 1;
		361	break;
		362	case XK_Insert:
		363	param = 2;
		364	break;
		365	#ifdef DXK_Remove
		366	case DXK_Remove:
		367	#endif
		368	case XK_Execute:
		369	param = 3;
		370	break;
		371	case XK_Select:
		372	param = 4;
		373	break;
		374	#ifndef UNSHIFTED_SCROLLKEYS
		375	case XK_Prior:
		376	param = 5;
		377	break;
		378	case XK_Next:
		379	param = 6;
		380	break;
		381	case XK_Home:
		382	param = 7;
		383	break;
		384	case XK_End:
		385	param = 8;
		386	break;
		387	#endif
		388	case XK_Help:
		389	param = 28;
		390	break;
		391	case XK_Menu:
		392	param = 29;
		393	break;
		394	}
		395	return param;
		396	}
		397
303	void	398	void
304	rxvt_term::key_press (XKeyEvent &ev)	399	rxvt_term::key_press (XKeyEvent &ev)
305	{	400	{
306	int ctrl, meta, shft, len;	401	int ctrl, meta, shft, len;
307	unsigned int newlen;
308	KeySym keysym;	402	KeySym keysym;
309	int valid_keysym;	403	int valid_keysym;
310	char kbuf[KBUFSZ];	404	char kbuf[KBUFSZ];
311		405
312	#if ISO_14755	406	#if ISO_14755
…		…
325	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
326		420
327	if (numlock_state \|\| (ev.state & ModNumLockMask))	421	if (numlock_state \|\| (ev.state & ModNumLockMask))
328	{	422	{
329	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
330	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
331	}	425	}
332		426
333	kbuf[0] = 0;	427	kbuf[0] = 0;
334		428
335	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
547	}	641	}
548	#endif	642	#endif
549		643
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	645	{
		646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		647	unsigned int newlen = 1;
		648
		649	switch (translate_keypad (keysym, kp))
552	{	650	{
		651	#ifndef NO_BACKSPACE_KEY
		652	case XK_BackSpace:
		653	if (priv_modes & PrivMode_HaveBackSpace)
		654	{
		655	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		656	^ !!ctrl) ? '\b' : '\177';
		657	kbuf[1] = '\0';
		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
553	newlen = 1;	681	newlen = 0;
554	switch (keysym)	682	}
		683	break;
		684
		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:
555	{	765	{
556	#ifndef NO_BACKSPACE_KEY	766	int param = map_function_key (keysym);
557	case XK_BackSpace:	767	if (param > 0)
558	if (priv_modes & PrivMode_HaveBackSpace)	768	sprintf (kbuf,"\033[%d~", param);
559	{
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';
563	}
564	else	769	else
565	strcpy (kbuf, key_backspace);
566	break;
567	#endif
568	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Prior
570	case XK_KP_Delete:
571	/* allow shift to override */
572	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573	{
574	strcpy (kbuf, "\033On");
575	break;
576	}
577	/* FALLTHROUGH */
578	# endif
579	case XK_Delete:
580	strcpy (kbuf, key_delete);
581	break;
582	#endif
583	case XK_Tab:
584	if (shft)
585	strcpy (kbuf, "\033[Z");
586	else
587	{
588	#ifdef CTRL_TAB_MAKES_META
589	if (ctrl)
590	meta = 1;
591	#endif
592	#ifdef MOD4_TAB_MAKES_META
593	if (ev.state & Mod4Mask)
594	meta = 1;
595	#endif
596	newlen = 0;
597	}
598	break;
599
600	#ifdef XK_KP_Left
601	case XK_KP_Up: /* \033Ox or standard */
602	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */
605	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606	{
607	strcpy (kbuf, "\033OZ");
608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
609	break;
610	}
611	else
612	/* translate to std. cursor key */
613	keysym = XK_Left + (keysym - XK_KP_Left);
614	/* FALLTHROUGH */
615	#endif
616	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");
621	kbuf[2] = "DACB"[keysym - XK_Left];
622	/* do Shift first */
623	if (shft)
624	kbuf[2] = "dacb"[keysym - XK_Left];
625	else if (ctrl)
626	{
627	kbuf[1] = 'O';
628	kbuf[2] = "dacb"[keysym - XK_Left];
629	}
630	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';
632	break;
633
634	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:
637	/* allow shift to override */
638	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639	{
640	strcpy (kbuf, "\033Oy");
641	break;
642	}
643	/* FALLTHROUGH */
644	# endif
645	case XK_Prior:
646	strcpy (kbuf, "\033[5~");
647	break;
648	# ifdef XK_KP_Next
649	case XK_KP_Next:
650	/* allow shift to override */
651	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652	{
653	strcpy (kbuf, "\033Os");
654	break;
655	}
656	/* FALLTHROUGH */
657	# endif
658	case XK_Next:
659	strcpy (kbuf, "\033[6~");
660	break;
661	#endif
662	case XK_KP_Enter:
663	/* allow shift to override */
664	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665	{
666	strcpy (kbuf, "\033OM");
667	break;
668	}
669
670	/* FALLTHROUGH */
671
672	case XK_Return:
673	if (priv_modes & PrivMode_LFNL)
674	{
675	kbuf[0] = '\015';
676	kbuf[1] = '\012';
677	kbuf[2] = '\0';
678	}
679	else
680	{
681	kbuf[0] = '\015';
682	kbuf[1] = '\0';
683	}
684	break;
685
686	#ifdef XK_KP_Begin
687	case XK_KP_Begin:
688	strcpy (kbuf, "\033Ou");
689	break;
690
691	#endif
692	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");
697	kbuf[2] += (keysym - XK_KP_F1);
698	break;
699
700	case XK_KP_Multiply: /* "\033Oj" : "" /
701	case XK_KP_Add: /* "\033Ok" : "+" */
702	case XK_KP_Separator: /* "\033Ol" : "," */
703	case XK_KP_Subtract: /* "\033Om" : "-" */
704	case XK_KP_Decimal: /* "\033On" : "." */
705	case XK_KP_Divide: /* "\033Oo" : "/" */
706	case XK_KP_0: /* "\033Op" : "0" */
707	case XK_KP_1: /* "\033Oq" : "1" */
708	case XK_KP_2: /* "\033Or" : "2" */
709	case XK_KP_3: /* "\033Os" : "3" */
710	case XK_KP_4: /* "\033Ot" : "4" */
711	case XK_KP_5: /* "\033Ou" : "5" */
712	case XK_KP_6: /* "\033Ov" : "6" */
713	case XK_KP_7: /* "\033Ow" : "7" */
714	case XK_KP_8: /* "\033Ox" : "8" */
715	case XK_KP_9: /* "\033Oy" : "9" */
716	/* allow shift to override */
717	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718	{
719	strcpy (kbuf, "\033Oj");
720	kbuf[2] += (keysym - XK_KP_Multiply);
721	}
722	else
723	{
724	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725	kbuf[1] = '\0';
726	}
727	break;
728
729	case XK_Find:
730	strcpy (kbuf, "\033[1~");
731	break;
732
733	#ifdef XK_KP_Insert
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:
744	strcpy (kbuf, "\033[2~");
745	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:
748	/* FALLTHROUGH */
749	#endif
750	case XK_Execute:
751	strcpy (kbuf, "\033[3~");
752	break;
753	case XK_Select:
754	strcpy (kbuf, "\033[4~");
755	break;
756	#ifdef XK_KP_End
757	case XK_KP_End:
758	/* allow shift to override */
759	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760	{
761	strcpy (kbuf, "\033Oq");
762	break;
763	}
764	/* FALLTHROUGH */
765	#endif
766	case XK_End:
767	strcpy (kbuf, KS_END);
768	break;
769	#ifdef XK_KP_Home
770	case XK_KP_Home:
771	/* allow shift to override */
772	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773	{
774	strcpy (kbuf, "\033Ow");
775	break;
776	}
777	/* FALLTHROUGH */
778	#endif
779	case XK_Home:
780	strcpy (kbuf, KS_HOME);
781	break;
782
783	#define FKEY(n, fkey) \
784	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786	case XK_F1: /* "\033[11~" */
787	case XK_F2: /* "\033[12~" */
788	case XK_F3: /* "\033[13~" */
789	case XK_F4: /* "\033[14~" */
790	case XK_F5: /* "\033[15~" */
791	FKEY (11, XK_F1);
792	break;
793	case XK_F6: /* "\033[17~" */
794	case XK_F7: /* "\033[18~" */
795	case XK_F8: /* "\033[19~" */
796	case XK_F9: /* "\033[20~" */
797	case XK_F10: /* "\033[21~" */
798	FKEY (17, XK_F6);
799	break;
800	case XK_F11: /* "\033[23~" */
801	case XK_F12: /* "\033[24~" */
802	case XK_F13: /* "\033[25~" */
803	case XK_F14: /* "\033[26~" */
804	FKEY (23, XK_F11);
805	break;
806	case XK_F15: /* "\033[28~" */
807	case XK_F16: /* "\033[29~" */
808	FKEY (28, XK_F15);
809	break;
810	case XK_Help: /* "\033[28~" */
811	FKEY (28, XK_Help);
812	break;
813	case XK_Menu: /* "\033[29~" */
814	FKEY (29, XK_Menu);
815	break;
816	case XK_F17: /* "\033[31~" */
817	case XK_F18: /* "\033[32~" */
818	case XK_F19: /* "\033[33~" */
819	case XK_F20: /* "\033[34~" */
820	case XK_F21: /* "\033[35~" */
821	case XK_F22: /* "\033[36~" */
822	case XK_F23: /* "\033[37~" */
823	case XK_F24: /* "\033[38~" */
824	case XK_F25: /* "\033[39~" */
825	case XK_F26: /* "\033[40~" */
826	case XK_F27: /* "\033[41~" */
827	case XK_F28: /* "\033[42~" */
828	case XK_F29: /* "\033[43~" */
829	case XK_F30: /* "\033[44~" */
830	case XK_F31: /* "\033[45~" */
831	case XK_F32: /* "\033[46~" */
832	case XK_F33: /* "\033[47~" */
833	case XK_F34: /* "\033[48~" */
834	case XK_F35: /* "\033[49~" */
835	FKEY (31, XK_F17);
836	break;
837	#undef FKEY
838	default:
839	newlen = 0;	770	newlen = 0;
840	break;
841	}	771	}
842		772	break;
843	if (newlen)
844	len = strlen (kbuf);
845	}	773	}
		774
		775	if (newlen)
		776	len = strlen (kbuf);
846		777
847	/*	778	/*
848	* Pass meta for all function keys, if 'meta' option set	779	* Pass meta for all function keys, if 'meta' option set
849	*/	780	*/
850	#ifdef META8_OPTION	781	#ifdef META8_OPTION
…		…
1035	void	966	void
1036	rxvt_term::flush ()	967	rxvt_term::flush ()
1037	{	968	{
1038	flush_ev.stop ();	969	flush_ev.stop ();
1039		970
1040	#ifdef ENABLE_TRANSPARENCY	971	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	972	if (bgPixmap.check_clearChanged ())
1042	{	973	{
1043	want_full_refresh = 0;	974	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	975	scr_touch (false);
1046	}	976	}
1047	#endif	977	#endif
1048		978
1049	if (want_refresh)	979	if (want_refresh)
…		…
1094	}	1024	}
1095		1025
1096	display->flush ();	1026	display->flush ();
1097	}	1027	}
1098		1028
		1029	/* checks wether a refresh is requested and starts the refresh timer */
1099	void	1030	void
1100	rxvt_term::check_cb (check_watcher &w)	1031	rxvt_term::refresh_check ()
1101	{	1032	{
1102	make_current ();	1033	if (want_refresh && !flush_ev.is_active ())
		1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103		1035
1104	display->flush ();	1036	display->flush ();
1105
1106	if (want_refresh && !flush_ev.active)
1107	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108	}	1037	}
1109		1038
1110	void	1039	void
1111	rxvt_term::flush_cb (time_watcher &w)	1040	rxvt_term::flush_cb (ev::timer &w, int revents)
1112	{	1041	{
1113	make_current ();	1042	make_current ();
1114		1043
1115	refresh_count = 0;	1044	refresh_count = 0;
1116	flush ();	1045	flush ();
1117	}	1046	}
1118		1047
1119	#ifdef CURSOR_BLINK	1048	#ifdef CURSOR_BLINK
1120	void	1049	void
1121	rxvt_term::cursor_blink_cb (time_watcher &w)	1050	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122	{	1051	{
1123	hidden_cursor = !hidden_cursor;	1052	hidden_cursor = !hidden_cursor;
1124	want_refresh = 1;	1053	want_refresh = 1;
1125		1054	refresh_check ();
1126	w.start (w.at + CURSOR_BLINK_INTERVAL);
1127	}	1055	}
1128	#endif	1056	#endif
1129		1057
1130	#ifdef TEXT_BLINK	1058	#ifdef TEXT_BLINK
1131	void	1059	void
1132	rxvt_term::text_blink_cb (time_watcher &w)	1060	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133	{	1061	{
1134	if (scr_refresh_rend (RS_Blink, RS_Blink))	1062	if (scr_refresh_rend (RS_Blink, RS_Blink))
1135	{	1063	{
1136	hidden_text = !hidden_text;	1064	hidden_text = !hidden_text;
1137	want_refresh = 1;	1065	want_refresh = 1;
1138	w.start (w.at + TEXT_BLINK_INTERVAL);	1066	refresh_check ();
1139	}	1067	}
		1068	else
		1069	w.stop ();
1140	}	1070	}
1141	#endif	1071	#endif
1142		1072
1143	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1073	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144	void	1074	void
1145	rxvt_term::cont_scroll_cb (time_watcher &w)	1075	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146	{	1076	{
1147	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1077	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1148	scr_page (scrollbar_isUp() ? UP : DN, 1))	1078	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149	{	1079	{
1150	want_refresh = 1;	1080	want_refresh = 1;
1151	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1081	refresh_check ();
1152	}	1082	}
		1083	else
		1084	w.stop ();
1153	}	1085	}
1154	#endif	1086	#endif
1155		1087
1156	#ifdef SELECTION_SCROLLING	1088	#ifdef SELECTION_SCROLLING
1157	void	1089	void
1158	rxvt_term::sel_scroll_cb (time_watcher &w)	1090	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159	{	1091	{
1160	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1092	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161	{	1093	{
1162	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1094	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163	want_refresh = 1;	1095	want_refresh = 1;
1164	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	refresh_check ();
1165	}	1097	}
		1098	else
		1099	w.stop ();
1166	}	1100	}
1167	#endif	1101	#endif
1168		1102
1169	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1103	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170	void	1104	void
1171	rxvt_term::slip_wheel_cb (time_watcher &w)	1105	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172	{	1106	{
1173	if (mouse_slip_wheel_speed == 0	1107	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175	: scr_page (UP, mouse_slip_wheel_speed))
1176	{	1108	{
1177	if (view_start == top_row \|\| view_start == 0)
1178	mouse_slip_wheel_speed = 0;
1179
1180	want_refresh = 1;	1109	want_refresh = 1;
1181	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1110	refresh_check ();
		1111	}
		1112
		1113	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1114	{
		1115	mouse_slip_wheel_speed = 0;
		1116	w.stop ();
1182	}	1117	}
1183	}	1118	}
1184	#endif	1119	#endif
1185		1120
1186	#if LINUX_YIELD_HACK	1121	#if LINUX_YIELD_HACK
1187	static struct event_handler	1122	static struct event_handler
1188	{	1123	{
1189	check_watcher yield_ev;	1124	ev::prepare yield_ev;
1190		1125
1191	void yield_cb (check_watcher &w)	1126	void yield_cb (ev::prepare &w, int revents)
1192	{	1127	{
1193	// this should really be sched_yield(), but the linux guys thought	1128	// this should really be sched_yield(), but the linux guys thought
1194	// that giving a process calling sched_yield () less cpu time than	1129	// that giving a process calling sched_yield () less cpu time than
1195	// 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
1196	// allowed by the sus... as is returning ENOSYS.	1131	// allowed by the sus... as is returning ENOSYS.
…		…
1247		1182
1248	return false;	1183	return false;
1249	}	1184	}
1250		1185
1251	void	1186	void
1252	rxvt_term::pty_cb (io_watcher &w, short revents)	1187	rxvt_term::pty_cb (ev::io &w, int revents)
1253	{	1188	{
1254	make_current ();	1189	make_current ();
1255		1190
1256	if (revents & EVENT_READ)	1191	if (revents & ev::READ)
1257	// loop, but don't allow a single term to monopolize us	1192	// loop, but don't allow a single term to monopolize us
1258	while (pty_fill ())	1193	while (pty_fill ())
1259	if (cmd_parse ())	1194	if (cmd_parse ())
1260	break;	1195	break;
1261		1196
1262	if (revents & EVENT_WRITE)	1197	if (revents & ev::WRITE)
1263	pty_write ();	1198	pty_write ();
		1199
		1200	refresh_check ();
1264	}	1201	}
1265		1202
1266	void	1203	void
1267	rxvt_term::pointer_unblank ()	1204	rxvt_term::pointer_unblank ()
1268	{	1205	{
…		…
1271		1208
1272	#ifdef POINTER_BLANK	1209	#ifdef POINTER_BLANK
1273	hidden_pointer = 0;	1210	hidden_pointer = 0;
1274		1211
1275	if (option (Opt_pointerBlank))	1212	if (option (Opt_pointerBlank))
1276	pointer_ev.start (NOW + pointerBlankDelay);	1213	pointer_ev.start (pointerBlankDelay);
1277	#endif	1214	#endif
1278	}	1215	}
1279		1216
1280	#ifdef POINTER_BLANK	1217	#ifdef POINTER_BLANK
1281	void	1218	void
…		…
1289		1226
1290	hidden_pointer = 1;	1227	hidden_pointer = 1;
1291	}	1228	}
1292		1229
1293	void	1230	void
1294	rxvt_term::pointer_cb (time_watcher &w)	1231	rxvt_term::pointer_cb (ev::timer &w, int revents)
1295	{	1232	{
1296	make_current ();	1233	make_current ();
1297		1234
1298	pointer_blank ();	1235	pointer_blank ();
1299	}	1236	}
…		…
1302	void	1239	void
1303	rxvt_term::mouse_report (XButtonEvent &ev)	1240	rxvt_term::mouse_report (XButtonEvent &ev)
1304	{	1241	{
1305	int button_number, key_state = 0;	1242	int button_number, key_state = 0;
1306	int x, y;	1243	int x, y;
		1244	int code = 32;
1307		1245
1308	x = ev.x;	1246	x = Pixel2Col (ev.x);
1309	y = ev.y;	1247	y = Pixel2Row (ev.y);
1310	pixel_position (&x, &y);	1248	if (ev.type == MotionNotify)
		1249	{
		1250	if (x == mouse_row && y == mouse_col)
		1251	return;
		1252	mouse_row = x;
		1253	mouse_col = y;
		1254	code += 32;
		1255	}
1311		1256
1312	if (MEvent.button == AnyButton)	1257	if (MEvent.button == AnyButton)
1313	button_number = 3;	1258	button_number = 3;
1314	else	1259	else
1315	{	1260	{
…		…
1361	x + 1,	1306	x + 1,
1362	y + 1);	1307	y + 1);
1363	#endif	1308	#endif
1364		1309
1365	tt_printf ("\033[M%c%c%c",	1310	tt_printf ("\033[M%c%c%c",
1366	(32 + button_number + key_state),	1311	(code + button_number + key_state),
1367	(32 + x + 1),	1312	(32 + x + 1),
1368	(32 + y + 1));	1313	(32 + y + 1));
1369	}	1314	}
1370		1315
1371	/{{{ process an X event /	1316	/{{{ process an X event /
…		…
1475	&& ev.xfocus.mode != NotifyGrab)	1420	&& ev.xfocus.mode != NotifyGrab)
1476	focus_out ();	1421	focus_out ();
1477	break;	1422	break;
1478		1423
1479	case ConfigureNotify:	1424	case ConfigureNotify:
		1425	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1426	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1427	szHint.width, szHint.height);*/
1480	if (ev.xconfigure.window == parent[0])	1428	if (ev.xconfigure.window == parent[0])
1481	{	1429	{
1482	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483	;	1431	;
1484		1432
1485	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1433	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1486	{	1434	{
1487	seen_resize = 1;	1435	seen_resize = 1;
1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1436	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489	#ifdef XPM_BACKGROUND	1437	}
1490	if (!option (Opt_transparent) && bgPixmap.auto_resize)	1438	else
		1439	{
		1440	#ifdef HAVE_BG_PIXMAP
		1441	if (bgPixmap.window_position_sensitive ())
1491	{	1442	{
		1443	if (mapped)
		1444	update_background ();
1492	resize_pixmap ();	1445	else
1493	scr_touch (true);	1446	bgPixmap.invalidate ();
1494	}	1447	}
1495	#endif	1448	#endif
1496	}	1449	}
1497		1450
1498	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1451	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500	#ifdef ENABLE_TRANSPARENCY
1501	if (option (Opt_transparent))
1502	check_our_parents ();
1503	#endif
1504	}	1452	}
1505	break;	1453	break;
1506		1454
1507	case PropertyNotify:	1455	case PropertyNotify:
1508	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1456	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1524	case SelectionRequest:	1472	case SelectionRequest:
1525	selection_send (ev.xselectionrequest);	1473	selection_send (ev.xselectionrequest);
1526	break;	1474	break;
1527		1475
1528	case MapNotify:	1476	case MapNotify:
		1477	#ifdef HAVE_BG_PIXMAP
		1478	/* This is needed spcifically to fix the case of no window manager or a
		1479	* non-reparenting window manager. In those cases we never get first
		1480	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1481	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1482	* reparenting.
		1483	* We should not render background immidiately, as there could be several
		1484	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1485	* by scheduling background redraw as soon as we can, but giving a short
		1486	* bit of time for ConfigureNotifies to arrive.
		1487	* We should render background PRIOR to drawing any text, but AFTER all
		1488	* of ConfigureNotifys for the best results.
		1489	*/
		1490	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1491	update_background_ev.start (0.025);
		1492	#endif
1529	mapped = 1;	1493	mapped = 1;
1530	#ifdef TEXT_BLINK	1494	#ifdef TEXT_BLINK
1531	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1495	text_blink_ev.start ();
1532	#endif	1496	#endif
1533	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1497	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534	break;	1498	break;
1535		1499
1536	case UnmapNotify:	1500	case UnmapNotify:
…		…
1538	#ifdef TEXT_BLINK	1502	#ifdef TEXT_BLINK
1539	text_blink_ev.stop ();	1503	text_blink_ev.stop ();
1540	#endif	1504	#endif
1541	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1505	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542	break;	1506	break;
1543
1544	#ifdef ENABLE_TRANSPARENCY
1545	case ReparentNotify:
1546	rootwin_cb (ev);
1547	break;
1548	#endif /* ENABLE_TRANSPARENCY */
1549		1507
1550	case GraphicsExpose:	1508	case GraphicsExpose:
1551	case Expose:	1509	case Expose:
1552	if (ev.xany.window == vt)	1510	if (ev.xany.window == vt)
1553	{	1511	{
1554	do	1512	do
		1513	{
1555	scr_expose (ev.xexpose.x, ev.xexpose.y,	1514	scr_expose (ev.xexpose.x, ev.xexpose.y,
1556	ev.xexpose.width, ev.xexpose.height, False);	1515	ev.xexpose.width, ev.xexpose.height, False);
		1516	}
1557	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1517	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558		1518
1559	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1519	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560		1520
1561	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1521	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1522	{
1562	scr_expose (ev.xexpose.x, ev.xexpose.y,	1523	scr_expose (ev.xexpose.x, ev.xexpose.y,
1563	ev.xexpose.width, ev.xexpose.height, False);	1524	ev.xexpose.width, ev.xexpose.height, False);
		1525	}
1564		1526
1565	want_refresh = 1;	1527	want_refresh = 1;
1566	}	1528	}
1567	else	1529	else
1568	{	1530	{
…		…
1571	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1533	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572	;	1534	;
1573	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1535	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574	;	1536	;
1575		1537
1576	if (isScrollbarWindow (ev.xany.window))	1538	if (scrollBar.state && ev.xany.window == scrollBar.win)
1577	{	1539	{
1578	scrollBar.setIdle ();	1540	scrollBar.state = STATE_IDLE;
1579	scrollbar_show (0);	1541	scrollbar_show (0);
1580	}	1542	}
1581
1582	#ifdef ENABLE_TRANSPARENCY
1583	if (am_transparent && ev.xany.window == parent[0])
1584	XClearWindow (dpy, ev.xany.window);
1585	#endif
1586	}	1543	}
1587	break;	1544	break;
1588		1545
1589	case MotionNotify:	1546	case MotionNotify:
1590	#ifdef POINTER_BLANK	1547	#ifdef POINTER_BLANK
1591	if (hidden_pointer)	1548	if (hidden_pointer)
1592	pointer_unblank ();	1549	pointer_unblank ();
1593	#endif	1550	#endif
		1551	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1552	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1553	mouse_report (ev.xbutton);
1594	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1554	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595	break;	1555	break;
1596		1556
1597	if (ev.xany.window == vt)	1557	if (ev.xany.window == vt)
1598	{	1558	{
…		…
1632	int dist;	1592	int dist;
1633		1593
1634	/* don't clobber the current delay if we are	1594	/* don't clobber the current delay if we are
1635	* already in the middle of scrolling.	1595	* already in the middle of scrolling.
1636	*/	1596	*/
1637	if (!sel_scroll_ev.active)	1597	if (!sel_scroll_ev.is_active ())
1638	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1598	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1639		1599
1640	/* save the event params so we can highlight	1600	/* save the event params so we can highlight
1641	* the selection in the pending-scroll loop	1601	* the selection in the pending-scroll loop
1642	*/	1602	*/
1643	selection_save_x = ev.xbutton.x;	1603	selection_save_x = ev.xbutton.x;
…		…
1665	else	1625	else
1666	{	1626	{
1667	/* we are within the text window, so we	1627	/* we are within the text window, so we
1668	* shouldn't be scrolling	1628	* shouldn't be scrolling
1669	*/	1629	*/
1670	if (sel_scroll_ev.active)
1671	sel_scroll_ev.stop();	1630	sel_scroll_ev.stop();
1672	}	1631	}
1673	#endif	1632	#endif
1674	#ifdef MOUSE_THRESHOLD	1633	#ifdef MOUSE_THRESHOLD
1675	}	1634	}
1676	#endif	1635	#endif
1677	}	1636	}
1678	}	1637	}
1679	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1638	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1680	{	1639	{
1681	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1640	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682	MotionNotify, &ev))	1641	MotionNotify, &ev))
1683	;	1642	;
1684		1643
…		…
1702	{	1661	{
1703	hidden_cursor = 0;	1662	hidden_cursor = 0;
1704	want_refresh = 1;	1663	want_refresh = 1;
1705	}	1664	}
1706		1665
1707	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1666	cursor_blink_ev.again ();
1708	}	1667	}
1709	#endif	1668	#endif
1710		1669
1711	#if defined(POINTER_BLANK)	1670	#if defined(POINTER_BLANK)
1712	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1671	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1719		1678
1720	if (ev.type == KeyPress && hidden_pointer == 0)	1679	if (ev.type == KeyPress && hidden_pointer == 0)
1721	pointer_blank ();	1680	pointer_blank ();
1722	}	1681	}
1723	#endif	1682	#endif
		1683
		1684	refresh_check ();
1724	}	1685	}
1725		1686
1726	void	1687	void
1727	rxvt_term::focus_in ()	1688	rxvt_term::focus_in ()
1728	{	1689	{
…		…
1740	XSetICFocus (Input_Context);	1701	XSetICFocus (Input_Context);
1741	}	1702	}
1742	#endif	1703	#endif
1743	#if CURSOR_BLINK	1704	#if CURSOR_BLINK
1744	if (option (Opt_cursorBlink))	1705	if (option (Opt_cursorBlink))
1745	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1706	cursor_blink_ev.again ();
1746	#endif	1707	#endif
1747	#if OFF_FOCUS_FADING	1708	#if OFF_FOCUS_FADING
1748	if (rs[Rs_fade])	1709	if (rs[Rs_fade])
1749	{	1710	{
1750	pix_colors = pix_colors_focused;	1711	pix_colors = pix_colors_focused;
…		…
1752	}	1713	}
1753	#endif	1714	#endif
1754	#if ENABLE_FRILLS	1715	#if ENABLE_FRILLS
1755	if (option (Opt_urgentOnBell))	1716	if (option (Opt_urgentOnBell))
1756	{	1717	{
1757	XWMHints *h;
1758
1759	h = XGetWMHints(dpy, parent[0]);	1718	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1760	if (h != NULL)
1761	{	1719	{
1762	h->flags &= ~XUrgencyHint;	1720	h->flags &= ~XUrgencyHint;
1763	XSetWMHints(dpy, parent[0], h);	1721	XSetWMHints (dpy, parent[0], h);
1764	}	1722	}
1765	}	1723	}
1766	#endif	1724	#endif
1767	}	1725	}
1768	}	1726	}
…		…
1791	XUnsetICFocus (Input_Context);	1749	XUnsetICFocus (Input_Context);
1792	#endif	1750	#endif
1793	#if CURSOR_BLINK	1751	#if CURSOR_BLINK
1794	if (option (Opt_cursorBlink))	1752	if (option (Opt_cursorBlink))
1795	cursor_blink_ev.stop ();	1753	cursor_blink_ev.stop ();
		1754
1796	hidden_cursor = 0;	1755	hidden_cursor = 0;
1797	#endif	1756	#endif
1798	#if OFF_FOCUS_FADING	1757	#if OFF_FOCUS_FADING
1799	if (rs[Rs_fade])	1758	if (rs[Rs_fade])
1800	{	1759	{
…		…
1834	case PropertyNotify:	1793	case PropertyNotify:
1835	/*	1794	/*
1836	* if user used some Esetroot compatible prog to set the root bg,	1795	* if user used some Esetroot compatible prog to set the root bg,
1837	* use the property to determine the pixmap. We use it later on.	1796	* use the property to determine the pixmap. We use it later on.
1838	*/	1797	*/
1839	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1798	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1799	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841	return;	1800	{
		1801	bgPixmap.set_root_pixmap ();
		1802	update_background ();
		1803	}
1842		1804
1843	/* FALLTHROUGH */
1844	case ReparentNotify:
1845	if (option (Opt_transparent))
1846	check_our_parents ();
1847	break;	1805	break;
1848	}	1806	}
1849	# endif	1807	# endif
		1808
		1809	refresh_check ();
1850	}	1810	}
1851	#endif	1811	#endif
1852		1812
1853	void	1813	void
1854	rxvt_term::button_press (XButtonEvent &ev)	1814	rxvt_term::button_press (XButtonEvent &ev)
…		…
1909	mouse_report (ev);	1869	mouse_report (ev);
1910	}	1870	}
1911	#else	1871	#else
1912	MEvent.button = ev.button;	1872	MEvent.button = ev.button;
1913	mouse_report (ev);	1873	mouse_report (ev);
1914	#endif /* MOUSE_REPORT_DOUBLECLICK */	1874	#endif /* MOUSE_REPORT_DOUBLECLICK */
1915		1875
1916	}	1876	}
1917	else	1877	else
1918	{	1878	{
1919	if (ev.button != MEvent.button)	1879	if (ev.button != MEvent.button)
…		…
1967	}	1927	}
1968		1928
1969	/*	1929	/*
1970	* Scrollbar window processing of button press	1930	* Scrollbar window processing of button press
1971	*/	1931	*/
1972	if (isScrollbarWindow (ev.window))	1932	if (scrollBar.state && ev.window == scrollBar.win)
1973	{	1933	{
1974	scrollBar.setIdle ();	1934	page_dirn direction = NO_DIR;
		1935
		1936	if (scrollBar.upButton (ev.y))
		1937	direction = UP; /* up */
		1938	else if (scrollBar.dnButton (ev.y))
		1939	direction = DN; /* down */
		1940
		1941	scrollBar.state = STATE_IDLE;
1975	/*	1942	/*
1976	* Rxvt-style scrollbar:	1943	* Rxvt-style scrollbar:
1977	* move up if mouse is above slider	1944	* move up if mouse is above slider
1978	* move dn if mouse is below slider	1945	* move dn if mouse is below slider
1979	*	1946	*
…		…
1988	/*	1955	/*
1989	* Mouse report disabled scrollbar:	1956	* Mouse report disabled scrollbar:
1990	* arrow buttons - send up/down	1957	* arrow buttons - send up/down
1991	* click on scrollbar - send pageup/down	1958	* click on scrollbar - send pageup/down
1992	*/	1959	*/
1993	if ((scrollBar.style == R_SB_NEXT	1960	if (direction == UP)
1994	&& scrollbarnext_upButton (ev.y))
1995	\|\| (scrollBar.style == R_SB_RXVT
1996	&& scrollbarrxvt_upButton (ev.y)))
1997	tt_printf ("\033[A");	1961	tt_printf ("\033[A");
1998	else if ((scrollBar.style == R_SB_NEXT	1962	else if (direction == DN)
1999	&& scrollbarnext_dnButton (ev.y))
2000	\|\| (scrollBar.style == R_SB_RXVT
2001	&& scrollbarrxvt_dnButton (ev.y)))
2002	tt_printf ("\033[B");	1963	tt_printf ("\033[B");
2003	else	1964	else
2004	switch (ev.button)	1965	switch (ev.button)
2005	{	1966	{
2006	case Button2:	1967	case Button2:
…		…
2013	tt_printf ("\033[5~");	1974	tt_printf ("\033[5~");
2014	break;	1975	break;
2015	}	1976	}
2016	}	1977	}
2017	else	1978	else
2018	#endif /* NO_SCROLLBAR_REPORT */	1979	#endif /* NO_SCROLLBAR_REPORT */
2019
2020	{
2021	char upordown = 0;
2022
2023	if (scrollBar.style == R_SB_NEXT)
2024	{	1980	{
2025	if (scrollbarnext_upButton (ev.y))	1981	if (direction != NO_DIR)
2026	upordown = -1; /* up */
2027	else if (scrollbarnext_dnButton (ev.y))
2028	upordown = 1; /* down */
2029	}
2030	else if (scrollBar.style == R_SB_RXVT)
2031	{
2032	if (scrollbarrxvt_upButton (ev.y))
2033	upordown = -1; /* up */
2034	else if (scrollbarrxvt_dnButton (ev.y))
2035	upordown = 1; /* down */
2036	}
2037	if (upordown)
2038	{	1982	{
2039	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1983	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1984	if (!cont_scroll_ev.is_active ())
2040	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1985	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041	#endif	1986	#endif
2042	if (scr_page (upordown < 0 ? UP : DN, 1))	1987	if (scr_page (direction, 1))
2043	{	1988	{
2044	if (upordown < 0)	1989	if (direction == UP)
2045	scrollBar.setUp ();	1990	scrollBar.state = STATE_UP;
2046	else	1991	else
2047	scrollBar.setDn ();	1992	scrollBar.state = STATE_DOWN;
2048	}	1993	}
2049	}	1994	}
2050	else	1995	else
2051	switch (ev.button)	1996	switch (ev.button)
2052	{	1997	{
2053	case Button2:	1998	case Button2:
2054	switch (scrollbar_align)	1999	switch (scrollBar.align)
2055	{	2000	{
2056	case R_SB_ALIGN_TOP:	2001	case R_SB_ALIGN_TOP:
2057	csrO = 0;	2002	csrO = 0;
2058	break;	2003	break;
2059	case R_SB_ALIGN_CENTRE:	2004	case R_SB_ALIGN_CENTRE:
…		…
2067	if (scrollBar.style == R_SB_XTERM	2012	if (scrollBar.style == R_SB_XTERM
2068	\|\| scrollbar_above_slider (ev.y)	2013	\|\| scrollbar_above_slider (ev.y)
2069	\|\| scrollbar_below_slider (ev.y))	2014	\|\| scrollbar_below_slider (ev.y))
2070	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2015	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2071		2016
2072	scrollBar.setMotion ();	2017	scrollBar.state = STATE_MOTION;
2073	break;	2018	break;
2074		2019
2075	case Button1:	2020	case Button1:
2076	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2021	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2077	csrO = ev.y - scrollBar.top;	2022	csrO = ev.y - scrollBar.top;
2078	/* FALLTHROUGH */	2023	/* FALLTHROUGH */
2079		2024
2080	case Button3:	2025	case Button3:
2081	if (scrollBar.style != R_SB_XTERM)	2026	if (scrollBar.style != R_SB_XTERM)
…		…
2091	scr_page (DN, nrow - 1);	2036	scr_page (DN, nrow - 1);
2092	# else	2037	# else
2093	scr_page (DN, nrow / 4);	2038	scr_page (DN, nrow / 4);
2094	# endif	2039	# endif
2095	else	2040	else
2096	scrollBar.setMotion ();	2041	scrollBar.state = STATE_MOTION;
2097	}	2042	}
2098	else	2043	else
2099	{	2044	{
2100	scr_page ((ev.button == Button1 ? DN : UP),	2045	scr_page ((ev.button == Button1 ? DN : UP),
2101	(nrow	2046	(nrow
…		…
2118		2063
2119	csrO = 0; /* reset csr Offset */	2064	csrO = 0; /* reset csr Offset */
2120	if (!bypass_keystate)	2065	if (!bypass_keystate)
2121	reportmode = !! (priv_modes & PrivMode_mouse_report);	2066	reportmode = !! (priv_modes & PrivMode_mouse_report);
2122		2067
2123	if (scrollbar_isUpDn ())	2068	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2124	{	2069	{
2125	scrollBar.setIdle ();	2070	scrollBar.state = STATE_IDLE;
2126	scrollbar_show (0);	2071	scrollbar_show (0);
2127	}	2072	}
2128		2073
2129	#ifdef SELECTION_SCROLLING	2074	#ifdef SELECTION_SCROLLING
2130	if (sel_scroll_ev.active)
2131	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2132	#endif	2076	#endif
2133		2077
2134	if (ev.window == vt)	2078	if (ev.window == vt)
2135	{	2079	{
2136	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2160	mouse_report (ev);	2104	mouse_report (ev);
2161	}	2105	}
2162	#else /* MOUSE_REPORT_DOUBLECLICK */	2106	#else /* MOUSE_REPORT_DOUBLECLICK */
2163	MEvent.button = AnyButton;	2107	MEvent.button = AnyButton;
2164	mouse_report (ev);	2108	mouse_report (ev);
2165	#endif /* MOUSE_REPORT_DOUBLECLICK */	2109	#endif /* MOUSE_REPORT_DOUBLECLICK */
2166	return;	2110	return;
2167	}	2111	}
2168		2112
2169	/*	2113	/*
2170	* dumb hack to compensate for the failure of click-and-drag	2114	* dumb hack to compensate for the failure of click-and-drag
…		…
2208	{	2152	{
2209	mouse_slip_wheel_speed += v ? -1 : 1;	2153	mouse_slip_wheel_speed += v ? -1 : 1;
2210	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2154	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2155	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212		2156
2213	if (slip_wheel_ev.at < NOW)	2157	if (!slip_wheel_ev.is_active ())
2214	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2158	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216	slip_wheel_ev.start ();
2217	}	2159	}
2218	else	2160	else
		2161	# endif
2219	{	2162	{
2220	# endif
2221	scr_page (v, i);	2163	scr_page (v, i);
2222	scrollbar_show (1);	2164	scrollbar_show (1);
2223	# ifdef MOUSE_SLIP_WHEELING
2224	}	2165	}
2225	# endif
2226	}	2166	}
2227	break;	2167	break;
2228	#endif	2168	#endif
2229	}	2169	}
2230	}	2170	}
…		…
2289		2229
2290	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2230	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2291	{	2231	{
2292	refresh_count = 0;	2232	refresh_count = 0;
2293		2233
2294	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2234	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2295	{	2235	{
2296	refreshnow = true;	2236	refreshnow = true;
2297	ch = NOCHAR;	2237	ch = NOCHAR;
2298	break;	2238	break;
2299	}	2239	}
…		…
2510	}	2450	}
2511	}	2451	}
2512		2452
2513	pclose_printer (fd);	2453	pclose_printer (fd);
2514	}	2454	}
2515	#endif /* PRINTPIPE */	2455	#endif /* PRINTPIPE */
2516	/}}} /	2456	/}}} /
2517		2457
2518	/* INDENT-OFF */	2458	/* INDENT-OFF */
2519	enum {	2459	enum {
2520	C1_40 = 0x40,	2460	C1_40 = 0x40,
…		…
2624	break;	2564	break;
2625	case 'Z': /* identify the terminal type */	2565	case 'Z': /* identify the terminal type */
2626	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2566	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2627	break;	2567	break;
2628	case '<': /* turn off VT52 mode */	2568	case '<': /* turn off VT52 mode */
2629	PrivMode (0, PrivMode_vt52);	2569	set_privmode (PrivMode_vt52, 0);
2630	break;	2570	break;
2631	case 'F': /* use special graphics character set */	2571	case 'F': /* use special graphics character set */
2632	case 'G': /* use regular character set */	2572	case 'G': /* use regular character set */
2633	/* unimplemented */	2573	/* unimplemented */
2634	break;	2574	break;
…		…
2688	scr_forwardindex ();	2628	scr_forwardindex ();
2689	break;	2629	break;
2690	#endif	2630	#endif
2691	case '=':	2631	case '=':
2692	case '>':	2632	case '>':
2693	PrivMode ((ch == '='), PrivMode_aplKP);	2633	set_privmode (PrivMode_aplKP, ch == '=');
2694	break;	2634	break;
2695		2635
2696	case C1_40:	2636	case C1_40:
2697	cmd_getc ();	2637	cmd_getc ();
2698	break;	2638	break;
…		…
2806	rxvt_term::process_csi_seq ()	2746	rxvt_term::process_csi_seq ()
2807	{	2747	{
2808	unicode_t ch, priv, i;	2748	unicode_t ch, priv, i;
2809	unsigned int nargs, p;	2749	unsigned int nargs, p;
2810	int n, ndef;	2750	int n, ndef;
2811	int arg[ESC_ARGS];	2751	int arg[ESC_ARGS] = { };
2812		2752
2813	memset (arg, 0, sizeof (arg));
2814	nargs = 0;	2753	nargs = 0;
2815		2754
2816	priv = 0;	2755	priv = 0;
2817	ch = cmd_getc ();	2756	ch = cmd_getc ();
2818	if (ch >= '<' && ch <= '?')	2757	if (ch >= '<' && ch <= '?')
		2758	{
2819	{ /* '<' '=' '>' '?' */	2759	/* '<' '=' '>' '?' */
2820	priv = ch;	2760	priv = ch;
2821	ch = cmd_getc ();	2761	ch = cmd_getc ();
2822	}	2762	}
2823		2763
2824	/* read any numerical arguments */	2764	/* read any numerical arguments */
…		…
2867	{	2807	{
2868	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2808	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2809	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870	//	2810	//
2871	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2811	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2812	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873	// that we do not support xterm mouse reporting (should be 95 when we do).	2813	// versions.
2874	//	2814	//
2875	tt_printf ("\033[>%d;94;0c", 'U');	2815	tt_printf ("\033[>%d;95;0c", 'U');
2876	}	2816	}
2877	break;	2817	break;
		2818
2878	case '?':	2819	case '?':
2879	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2820	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2880	process_terminal_mode (ch, priv, nargs, arg);	2821	process_terminal_mode (ch, priv, nargs, arg);
2881	break;	2822	break;
2882	}	2823	}
…		…
3398	*buf++ = '\0';	3339	*buf++ = '\0';
3399		3340
3400	process_color_seq (op, color, name, resp);	3341	process_color_seq (op, color, name, resp);
3401	}	3342	}
3402	break;	3343	break;
		3344	case Rxvt_restoreFG:
3403	case XTerm_Color00:	3345	case XTerm_Color00:
3404	process_color_seq (op, Color_fg, str, resp);	3346	process_color_seq (op, Color_fg, str, resp);
3405	break;	3347	break;
		3348	case Rxvt_restoreBG:
3406	case XTerm_Color01:	3349	case XTerm_Color01:
3407	process_color_seq (op, Color_bg, str, resp);	3350	process_color_seq (op, Color_bg, str, resp);
3408	break;	3351	break;
3409	#ifndef NO_CURSORCOLOR	3352	#ifndef NO_CURSORCOLOR
3410	case XTerm_Color_cursor:	3353	case XTerm_Color_cursor:
…		…
3431	break;	3374	break;
3432	case URxvt_Color_IT:	3375	case URxvt_Color_IT:
3433	process_color_seq (op, Color_IT, str, resp);	3376	process_color_seq (op, Color_IT, str, resp);
3434	break;	3377	break;
3435	#endif	3378	#endif
3436	#if ENABLE_TRANSPARENCY && TINTING	3379	#if ENABLE_TRANSPARENCY
3437	case URxvt_Color_tint:	3380	case URxvt_Color_tint:
3438	process_color_seq (op, Color_tint, str, resp);	3381	process_color_seq (op, Color_tint, str, resp);
		3382	{
		3383	bool changed = false;
3439		3384
3440	check_our_parents ();	3385	if (ISSET_PIXCOLOR (Color_tint))
		3386	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3387	else
		3388	changed = bgPixmap.unset_tint ();
3441		3389
3442	if (am_transparent)	3390	if (changed)
3443	want_full_refresh = want_refresh = 1;	3391	update_background ();
		3392	}
3444		3393
3445	break;	3394	break;
3446	#endif	3395	#endif
3447		3396
3448	#if XPM_BACKGROUND	3397	#if BG_IMAGE_FROM_FILE
3449	case Rxvt_Pixmap:	3398	case Rxvt_Pixmap:
3450	{	3399	if (!strcmp (str, "?"))
3451	if (*str != ';')
3452	{	3400	{
3453	scale_pixmap (""); /* reset to default scaling */	3401	char str[256];
3454	set_bgPixmap (str); /* change pixmap */	3402
3455	scr_touch (true);	3403	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
		3404	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
		3405	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3406	process_xterm_seq (XTerm_title, str, CHAR_ST);
3456	}	3407	}
3457		3408	else
		3409	{
3458	int changed = 0;	3410	int changed = 0;
3459		3411
3460	while ((str = strchr (str, ';')) != NULL)	3412	if (*str != ';')
3461	{	3413	{
		3414	/* reset to default scaling :*/
		3415	bgPixmap.unset_geometry ();
		3416	if (bgPixmap.set_file (str)) /* change pixmap */
		3417	changed++;
		3418	str = strchr (str, ';');
		3419	if (str == NULL)
		3420	bgPixmap.set_defaultGeometry ();
		3421	}
		3422
		3423	while (str)
		3424	{
3462	str++;	3425	str++;
3463	changed += scale_pixmap (str);	3426	if (bgPixmap.set_geometry (str))
		3427	changed++;
		3428	str = strchr (str, ';');
3464	}	3429	}
3465		3430
3466	if (changed)	3431	if (changed)
3467	{	3432	update_background ();
3468	resize_pixmap ();
3469	scr_touch (true);
3470	}	3433	}
3471	#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472	if (option (Opt_transparent))
3473	check_our_parents ();
3474	#endif
3475	}
3476	break;	3434	break;
3477	#endif	3435	#endif
3478
3479	case Rxvt_restoreFG:
3480	set_window_color (Color_fg, str);
3481	break;
3482	case Rxvt_restoreBG:
3483	set_window_color (Color_bg, str);
3484	break;
3485		3436
3486	case XTerm_logfile:	3437	case XTerm_logfile:
3487	// TODO, when secure mode?	3438	// TODO, when secure mode?
3488	break;	3439	break;
3489		3440
…		…
3590	{	3541	{
3591	if (mode == 'r')	3542	if (mode == 'r')
3592	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3543	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3593	else	3544	else
3594	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3545	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3595	PrivMode (state, bit);	3546	set_privmode (bit, state);
3596	}	3547	}
3597		3548
3598	return state;	3549	return state;
3599	}	3550	}
3600		3551
…		…
3604	{	3555	{
3605	unsigned int i, j;	3556	unsigned int i, j;
3606	int state;	3557	int state;
3607		3558
3608	static const struct	3559	static const struct
3609	{	3560	{
3610	const int argval;	3561	const int argval;
3611	const unsigned long bit;	3562	const unsigned long bit;
3612	}
3613
3614	argtopriv[] = {	3563	} argtopriv[] = {
3615	{ 1, PrivMode_aplCUR },	3564	{ 1, PrivMode_aplCUR },
3616	{ 2, PrivMode_vt52 },	3565	{ 2, PrivMode_vt52 },
3617	{ 3, PrivMode_132 },	3566	{ 3, PrivMode_132 },
3618	{ 4, PrivMode_smoothScroll },	3567	{ 4, PrivMode_smoothScroll },
3619	{ 5, PrivMode_rVideo },	3568	{ 5, PrivMode_rVideo },
…		…
3635	{ 66, PrivMode_aplKP },	3584	{ 66, PrivMode_aplKP },
3636	#ifndef NO_BACKSPACE_KEY	3585	#ifndef NO_BACKSPACE_KEY
3637	{ 67, PrivMode_BackSpace },	3586	{ 67, PrivMode_BackSpace },
3638	#endif	3587	#endif
3639	{ 1000, PrivMode_MouseX11 },	3588	{ 1000, PrivMode_MouseX11 },
3640	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3589	{ 1002, PrivMode_MouseBtnEvent },
3641	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3590	{ 1003, PrivMode_MouseAnyEvent },
3642	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3643	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3591	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3644	{ 1011, PrivMode_Keypress }, // rxvt extension	3592	{ 1011, PrivMode_Keypress }, // rxvt extension
3645	// 1035 enable modifiers for alt, numlock NYI	3593	// 1035 enable modifiers for alt, numlock NYI
3646	// 1036 send ESC for meta keys NYI	3594	// 1036 send ESC for meta keys NYI
3647	// 1037 send DEL for keypad delete NYI	3595	// 1037 send DEL for keypad delete NYI
3648	{ 1047, PrivMode_Screen },	3596	{ 1047, PrivMode_Screen },
3649	// 1048 save and restore cursor	3597	// 1048 save and restore cursor
3650	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3598	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3651	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3599	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3600	{ 2004, PrivMode_BracketPaste },
3652	};	3601	};
3653		3602
3654	if (nargs == 0)	3603	if (nargs == 0)
3655	return;	3604	return;
3656		3605
…		…
3700	case 2: /* VT52 mode */	3649	case 2: /* VT52 mode */
3701	/* oddball mode. should be set regardless of set/reset	3650	/* oddball mode. should be set regardless of set/reset
3702	* parameter. Return from VT52 mode with an ESC < from	3651	* parameter. Return from VT52 mode with an ESC < from
3703	* within VT52 mode	3652	* within VT52 mode
3704	*/	3653	*/
3705	PrivMode (1, PrivMode_vt52);	3654	set_privmode (PrivMode_vt52, 1);
3706	break;	3655	break;
3707	case 3: /* 80/132 */	3656	case 3: /* 80/132 */
3708	if (priv_modes & PrivMode_132OK)	3657	if (priv_modes & PrivMode_132OK)
		3658	{
		3659	scr_poweron ();
3709	set_widthheight (((state ? 132 : 80) * fwidth), height);	3660	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3661	}
3710	break;	3662	break;
3711	case 4: /* smooth scrolling */	3663	case 4: /* smooth scrolling */
3712	set_option (Opt_jumpScroll, !state);	3664	set_option (Opt_jumpScroll, !state);
3713	break;	3665	break;
3714	case 5: /* reverse video */	3666	case 5: /* reverse video */
…		…
3721	scr_autowrap (state);	3673	scr_autowrap (state);
3722	break;	3674	break;
3723	/* case 8: - auto repeat, can't do on a per window basis */	3675	/* case 8: - auto repeat, can't do on a per window basis */
3724	case 9: /* X10 mouse reporting */	3676	case 9: /* X10 mouse reporting */
3725	if (state) /* orthogonal */	3677	if (state) /* orthogonal */
3726	priv_modes &= ~PrivMode_MouseX11;	3678	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3727	break;	3679	break;
3728	#ifdef scrollBar_esc	3680	#ifdef scrollBar_esc
3729	case scrollBar_esc:	3681	case scrollBar_esc:
3730	if (scrollbar_mapping (state))	3682	if (scrollbar_mapping (state))
3731	{	3683	{
…		…
3744	break;	3696	break;
3745	/* case 66: - application key pad */	3697	/* case 66: - application key pad */
3746	/* case 67: - backspace key */	3698	/* case 67: - backspace key */
3747	case 1000: /* X11 mouse reporting */	3699	case 1000: /* X11 mouse reporting */
3748	if (state) /* orthogonal */	3700	if (state) /* orthogonal */
3749	priv_modes &= ~PrivMode_MouseX10;	3701	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3750	break;	3702	break;
3751	#if 0
3752	case 1001:	3703	case 1002:
3753	break; /* X11 mouse highlighting */	3704	case 1003:
3754	#endif	3705	if (state)
		3706	{
		3707	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3708	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3709	vt_emask_mouse = PointerMotionMask;
		3710	}
		3711	else
		3712	vt_emask_mouse = NoEventMask;
		3713	vt_select_input ();
		3714	break;
3755	case 1010: /* scroll to bottom on TTY output inhibit */	3715	case 1010: /* scroll to bottom on TTY output inhibit */
3756	set_option (Opt_scrollTtyOutput, !state);	3716	set_option (Opt_scrollTtyOutput, !state);
3757	break;	3717	break;
3758	case 1011: /* scroll to bottom on key press */	3718	case 1011: /* scroll to bottom on key press */
3759	set_option (Opt_scrollTtyKeypress, state);	3719	set_option (Opt_scrollTtyKeypress, state);
…		…
3936	rxvt_term::process_graphics ()	3896	rxvt_term::process_graphics ()
3937	{	3897	{
3938	unicode_t ch, cmd = cmd_getc ();	3898	unicode_t ch, cmd = cmd_getc ();
3939		3899
3940	if (cmd == 'Q')	3900	if (cmd == 'Q')
		3901	{
3941	{ /* query graphics */	3902	/* query graphics */
3942	tt_printf ("\033G0\012"); /* no graphics */	3903	tt_printf ("\033G0\012"); /* no graphics */
3943	return;	3904	return;
3944	}	3905	}
3945	/* swallow other graphics sequences until terminating ':' */	3906	/* swallow other graphics sequences until terminating ':' */
3946	do	3907	do
…		…
3996	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3957	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3997		3958
3998	memcpy (v_buffer + v_buflen, data, len);	3959	memcpy (v_buffer + v_buflen, data, len);
3999	v_buflen += len;	3960	v_buflen += len;
4000		3961
4001	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3962	pty_ev.set (ev::READ \| ev::WRITE);
4002	}	3963	}
4003		3964
4004	void rxvt_term::pty_write ()	3965	void rxvt_term::pty_write ()
4005	{	3966	{
4006	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3967	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4011		3972
4012	if (v_buflen == 0)	3973	if (v_buflen == 0)
4013	{	3974	{
4014	free (v_buffer);	3975	free (v_buffer);
4015	v_buffer = 0;	3976	v_buffer = 0;
4016	v_buflen = 0;
4017		3977
4018	pty_ev.set (EVENT_READ);	3978	pty_ev.set (ev::READ);
4019	return;	3979	return;
4020	}	3980	}
4021		3981
4022	memmove (v_buffer, v_buffer + written, v_buflen);	3982	memmove (v_buffer, v_buffer + written, v_buflen);
4023	}	3983	}
4024	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3984	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4025	pty_ev.set (EVENT_READ);	3985	pty_ev.set (ev::READ);
4026	}	3986	}
4027		3987
4028	/----------------------- end-of-file (C source) -----------------------/	3988	/----------------------- end-of-file (C source) -----------------------/
4029		3989

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.339 by ayin, Fri Aug 3 14:03:28 2007 UTC vs. Revision 1.412 by ayin, Sun Feb 17 11:13:11 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.339 by ayin, Fri Aug 3 14:03:28 2007 UTC vs.
Revision 1.412 by ayin, Sun Feb 17 11:13:11 2008 UTC