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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.361 by ayin, Wed Oct 31 09:55:23 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.
…		…
198	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
199	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
200		201
201	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
202		203
203	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
204	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
205		206
206	if (y >= 0)	207	if (y >= 0)
207	{	208	{
208	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
220	ch = *chr++;	221	ch = *chr++;
221		222
222	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
223	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
224	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
225	# if !UNICODE3	226	# if !UNICODE_3
226	if (ch >= 0x10000)	227	if (ch >= 0x10000)
227	ch = 0xfffd;	228	ch = 0xfffd;
228	# endif	229	# endif
229	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
230		231
…		…
278	}	279	}
279		280
280	iso14755buf = 0;	281	iso14755buf = 0;
281	}	282	}
282		283
283	int	284	static int
284	rxvt_term::hex_keyval (XKeyEvent &ev)	285	hex_keyval (XKeyEvent &ev)
285	{	286	{
286	// check wether this event corresponds to a hex digit	287	// check wether this event corresponds to a hex digit
287	// if the modifiers had not been pressed.	288	// if the modifiers had not been pressed.
288	for (int index = 0; index < 8; index++)	289	for (int index = 0; index < 8; index++)
289	{	290	{
…		…
297		298
298	return -1;	299	return -1;
299	}	300	}
300	#endif	301	#endif
301		302
		303	static inline KeySym
		304	translate_keypad (KeySym keysym, bool kp)
		305	{
		306	#ifdef XK_KP_Home
		307	static const KeySym keypadtrans[] = {
		308	XK_KP_7, // XK_KP_Home
		309	XK_KP_4, // XK_KP_Left
		310	XK_KP_8, // XK_KP_Up
		311	XK_KP_6, // XK_KP_Right
		312	XK_KP_2, // XK_KP_Down
		313	# ifndef UNSHIFTED_SCROLLKEYS
		314	XK_KP_9, // XK_KP_Prior
		315	XK_KP_3, // XK_KP_Next
		316	# else
		317	XK_Prior,
		318	XK_Next,
		319	# endif
		320	XK_KP_1, // XK_KP_End
		321	XK_KP_5, // XK_KP_Begin
		322	};
		323
		324	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		325	{
		326	unsigned int index = keysym - XK_KP_Home;
		327	keysym = kp ? keypadtrans[index] : XK_Home + index;
		328	}
		329	else if (keysym == XK_KP_Insert)
		330	keysym = kp ? XK_KP_0 : XK_Insert;
		331	# ifndef NO_DELETE_KEY
		332	else if (keysym == XK_KP_Delete)
		333	keysym = kp ? XK_KP_Decimal : XK_Delete;
		334	# endif
		335	#endif
		336	return keysym;
		337	}
		338
		339	static inline int
		340	map_function_key (KeySym keysym)
		341	{
		342	int param = 0;
		343
		344	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		345	{
		346	param = 11 + keysym - XK_F1;
		347	if (keysym >= XK_F17)
		348	param += 4;
		349	else if (keysym >= XK_F15)
		350	param += 3;
		351	else if (keysym >= XK_F11)
		352	param += 2;
		353	else if (keysym >= XK_F6)
		354	param += 1;
		355	}
		356	else
		357	switch (keysym)
		358	{
		359	case XK_Find:
		360	param = 1;
		361	break;
		362	case XK_Insert:
		363	param = 2;
		364	break;
		365	#ifdef DXK_Remove
		366	case DXK_Remove:
		367	#endif
		368	case XK_Execute:
		369	param = 3;
		370	break;
		371	case XK_Select:
		372	param = 4;
		373	break;
		374	#ifndef UNSHIFTED_SCROLLKEYS
		375	case XK_Prior:
		376	param = 5;
		377	break;
		378	case XK_Next:
		379	param = 6;
		380	break;
		381	case XK_Home:
		382	param = 7;
		383	break;
		384	case XK_End:
		385	param = 8;
		386	break;
		387	#endif
		388	case XK_Help:
		389	param = 28;
		390	break;
		391	case XK_Menu:
		392	param = 29;
		393	break;
		394	}
		395	return param;
		396	}
		397
302	void	398	void
303	rxvt_term::key_press (XKeyEvent &ev)	399	rxvt_term::key_press (XKeyEvent &ev)
304	{	400	{
305	int ctrl, meta, shft, len;	401	int ctrl, meta, shft, len;
306	unsigned int newlen;
307	KeySym keysym;	402	KeySym keysym;
308	int valid_keysym;	403	int valid_keysym;
309	char kbuf[KBUFSZ];	404	char kbuf[KBUFSZ];
310		405
311	#if ISO_14755	406	#if ISO_14755
…		…
324	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
325		420
326	if (numlock_state \|\| (ev.state & ModNumLockMask))	421	if (numlock_state \|\| (ev.state & ModNumLockMask))
327	{	422	{
328	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
329	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
330	}	425	}
331		426
332	kbuf[0] = 0;	427	kbuf[0] = 0;
333		428
334	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
546	}	641	}
547	#endif	642	#endif
548		643
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	645	{
		646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		647	unsigned int newlen = 1;
		648
		649	switch (translate_keypad (keysym, kp))
551	{	650	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	651	#ifndef NO_BACKSPACE_KEY
		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, rs[Rs_backspace_key]);
566	break;
567	#endif
568	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Delete
570	case XK_KP_Delete:
571	/* allow shift to override */
572	if (kp)
573	{
574	strcpy (kbuf, "\033On");
575	break;
576	}
577	/* FALLTHROUGH */
578	# endif
579	case XK_Delete:
580	strcpy (kbuf, rs[Rs_delete_key]);
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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
…		…
1093	}	1024	}
1094		1025
1095	display->flush ();	1026	display->flush ();
1096	}	1027	}
1097		1028
		1029	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1030	void
1099	rxvt_term::check_cb (check_watcher &w)	1031	rxvt_term::refresh_check ()
1100	{	1032	{
1101	make_current ();	1033	if (want_refresh && !flush_ev.is_active ())
		1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102		1035
1103	display->flush ();	1036	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107	}	1037	}
1108		1038
1109	void	1039	void
1110	rxvt_term::flush_cb (time_watcher &w)	1040	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1041	{
1112	make_current ();	1042	make_current ();
1113		1043
1114	refresh_count = 0;	1044	refresh_count = 0;
1115	flush ();	1045	flush ();
1116	}	1046	}
1117		1047
1118	#ifdef CURSOR_BLINK	1048	#ifdef CURSOR_BLINK
1119	void	1049	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1050	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1051	{
1122	hidden_cursor = !hidden_cursor;	1052	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1053	want_refresh = 1;
1124		1054	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1055	}
1127	#endif	1056	#endif
1128		1057
1129	#ifdef TEXT_BLINK	1058	#ifdef TEXT_BLINK
1130	void	1059	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1060	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1061	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1062	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1063	{
1135	hidden_text = !hidden_text;	1064	hidden_text = !hidden_text;
1136	want_refresh = 1;	1065	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1066	refresh_check ();
1138	}	1067	}
		1068	else
		1069	w.stop ();
1139	}	1070	}
1140	#endif	1071	#endif
1141		1072
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1073	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1074	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1075	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1076	{
1146	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1077	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1078	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148	{	1079	{
1149	want_refresh = 1;	1080	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1081	refresh_check ();
1151	}	1082	}
		1083	else
		1084	w.stop ();
1152	}	1085	}
1153	#endif	1086	#endif
1154		1087
1155	#ifdef SELECTION_SCROLLING	1088	#ifdef SELECTION_SCROLLING
1156	void	1089	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1090	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1091	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1092	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1093	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1094	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1095	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	refresh_check ();
1164	}	1097	}
		1098	else
		1099	w.stop ();
1165	}	1100	}
1166	#endif	1101	#endif
1167		1102
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1103	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1104	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1105	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1106	{
1172	if (mouse_slip_wheel_speed == 0	1107	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174	: scr_page (UP, mouse_slip_wheel_speed))
1175	{	1108	{
1176	if (view_start == top_row \|\| view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1109	want_refresh = 1;
1180	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 ();
1181	}	1117	}
1182	}	1118	}
1183	#endif	1119	#endif
1184		1120
1185	#if LINUX_YIELD_HACK	1121	#if LINUX_YIELD_HACK
1186	static struct event_handler	1122	static struct event_handler
1187	{	1123	{
1188	check_watcher yield_ev;	1124	ev::prepare yield_ev;
1189		1125
1190	void yield_cb (check_watcher &w)	1126	void yield_cb (ev::prepare &w, int revents)
1191	{	1127	{
1192	// this should really be sched_yield(), but the linux guys thought	1128	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1129	// that giving a process calling sched_yield () less cpu time than
1194	// 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
1195	// allowed by the sus... as is returning ENOSYS.	1131	// allowed by the sus... as is returning ENOSYS.
…		…
1246		1182
1247	return false;	1183	return false;
1248	}	1184	}
1249		1185
1250	void	1186	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1187	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1188	{
1253	make_current ();	1189	make_current ();
1254		1190
1255	if (revents & EVENT_READ)	1191	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1192	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1193	while (pty_fill ())
1258	if (cmd_parse ())	1194	if (cmd_parse ())
1259	break;	1195	break;
1260		1196
1261	if (revents & EVENT_WRITE)	1197	if (revents & ev::WRITE)
1262	pty_write ();	1198	pty_write ();
		1199
		1200	refresh_check ();
1263	}	1201	}
1264		1202
1265	void	1203	void
1266	rxvt_term::pointer_unblank ()	1204	rxvt_term::pointer_unblank ()
1267	{	1205	{
…		…
1270		1208
1271	#ifdef POINTER_BLANK	1209	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1210	hidden_pointer = 0;
1273		1211
1274	if (option (Opt_pointerBlank))	1212	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1213	pointer_ev.start (pointerBlankDelay);
1276	#endif	1214	#endif
1277	}	1215	}
1278		1216
1279	#ifdef POINTER_BLANK	1217	#ifdef POINTER_BLANK
1280	void	1218	void
…		…
1288		1226
1289	hidden_pointer = 1;	1227	hidden_pointer = 1;
1290	}	1228	}
1291		1229
1292	void	1230	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1231	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1232	{
1295	make_current ();	1233	make_current ();
1296		1234
1297	pointer_blank ();	1235	pointer_blank ();
1298	}	1236	}
…		…
1305	int x, y;	1243	int x, y;
1306	int code = 32;	1244	int code = 32;
1307		1245
1308	x = Pixel2Col (ev.x);	1246	x = Pixel2Col (ev.x);
1309	y = Pixel2Row (ev.y);	1247	y = Pixel2Row (ev.y);
1310	if (ev.type == MotionNotify) {	1248	if (ev.type == MotionNotify)
		1249	{
1311	if (x == mouse_row && y == mouse_col)	1250	if (x == mouse_row && y == mouse_col)
1312	return;	1251	return;
1313	mouse_row = x;	1252	mouse_row = x;
1314	mouse_col = y;	1253	mouse_col = y;
1315	code += 32;	1254	code += 32;
1316	}	1255	}
1317		1256
1318	if (MEvent.button == AnyButton)	1257	if (MEvent.button == AnyButton)
1319	button_number = 3;	1258	button_number = 3;
1320	else	1259	else
1321	{	1260	{
…		…
1481	&& ev.xfocus.mode != NotifyGrab)	1420	&& ev.xfocus.mode != NotifyGrab)
1482	focus_out ();	1421	focus_out ();
1483	break;	1422	break;
1484		1423
1485	case ConfigureNotify:	1424	case ConfigureNotify:
1486	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1425	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1426	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488	szHint.width, szHint.height); */	1427	szHint.width, szHint.height);*/
1489	if (ev.xconfigure.window == parent[0])	1428	if (ev.xconfigure.window == parent[0])
1490	{	1429	{
1491	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1492	;	1431	;
1493		1432
…		…
1498	}	1437	}
1499	else	1438	else
1500	{	1439	{
1501	#ifdef HAVE_BG_PIXMAP	1440	#ifdef HAVE_BG_PIXMAP
1502	if (bgPixmap.window_position_sensitive ())	1441	if (bgPixmap.window_position_sensitive ())
		1442	{
		1443	if (mapped)
1503	update_background ();	1444	update_background ();
		1445	else
		1446	bgPixmap.invalidate ();
		1447	}
1504	#endif	1448	#endif
1505	}	1449	}
		1450
1506	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1451	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1507	}	1452	}
1508	break;	1453	break;
1509		1454
1510	case PropertyNotify:	1455	case PropertyNotify:
…		…
1527	case SelectionRequest:	1472	case SelectionRequest:
1528	selection_send (ev.xselectionrequest);	1473	selection_send (ev.xselectionrequest);
1529	break;	1474	break;
1530		1475
1531	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
1532	mapped = 1;	1493	mapped = 1;
1533	#ifdef TEXT_BLINK	1494	#ifdef TEXT_BLINK
1534	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1495	text_blink_ev.start ();
1535	#endif	1496	#endif
1536	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1497	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1537	break;	1498	break;
1538		1499
1539	case UnmapNotify:	1500	case UnmapNotify:
…		…
1560	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1521	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561	{	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);
1564	}	1525	}
		1526
1565	want_refresh = 1;	1527	want_refresh = 1;
1566	}	1528	}
1567	else	1529	else
1568	{	1530	{
1569	XEvent unused_event;	1531	XEvent unused_event;
…		…
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	}	1543	}
1582	break;	1544	break;
1583		1545
…		…
1630	int dist;	1592	int dist;
1631		1593
1632	/* don't clobber the current delay if we are	1594	/* don't clobber the current delay if we are
1633	* already in the middle of scrolling.	1595	* already in the middle of scrolling.
1634	*/	1596	*/
1635	if (!sel_scroll_ev.active)	1597	if (!sel_scroll_ev.is_active ())
1636	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1598	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637		1599
1638	/* save the event params so we can highlight	1600	/* save the event params so we can highlight
1639	* the selection in the pending-scroll loop	1601	* the selection in the pending-scroll loop
1640	*/	1602	*/
1641	selection_save_x = ev.xbutton.x;	1603	selection_save_x = ev.xbutton.x;
…		…
1663	else	1625	else
1664	{	1626	{
1665	/* we are within the text window, so we	1627	/* we are within the text window, so we
1666	* shouldn't be scrolling	1628	* shouldn't be scrolling
1667	*/	1629	*/
1668	if (sel_scroll_ev.active)
1669	sel_scroll_ev.stop();	1630	sel_scroll_ev.stop();
1670	}	1631	}
1671	#endif	1632	#endif
1672	#ifdef MOUSE_THRESHOLD	1633	#ifdef MOUSE_THRESHOLD
1673	}	1634	}
1674	#endif	1635	#endif
1675	}	1636	}
1676	}	1637	}
1677	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1638	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1678	{	1639	{
1679	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1640	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680	MotionNotify, &ev))	1641	MotionNotify, &ev))
1681	;	1642	;
1682		1643
…		…
1700	{	1661	{
1701	hidden_cursor = 0;	1662	hidden_cursor = 0;
1702	want_refresh = 1;	1663	want_refresh = 1;
1703	}	1664	}
1704		1665
1705	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1666	cursor_blink_ev.again ();
1706	}	1667	}
1707	#endif	1668	#endif
1708		1669
1709	#if defined(POINTER_BLANK)	1670	#if defined(POINTER_BLANK)
1710	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1671	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1717		1678
1718	if (ev.type == KeyPress && hidden_pointer == 0)	1679	if (ev.type == KeyPress && hidden_pointer == 0)
1719	pointer_blank ();	1680	pointer_blank ();
1720	}	1681	}
1721	#endif	1682	#endif
		1683
		1684	refresh_check ();
1722	}	1685	}
1723		1686
1724	void	1687	void
1725	rxvt_term::focus_in ()	1688	rxvt_term::focus_in ()
1726	{	1689	{
…		…
1738	XSetICFocus (Input_Context);	1701	XSetICFocus (Input_Context);
1739	}	1702	}
1740	#endif	1703	#endif
1741	#if CURSOR_BLINK	1704	#if CURSOR_BLINK
1742	if (option (Opt_cursorBlink))	1705	if (option (Opt_cursorBlink))
1743	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1706	cursor_blink_ev.again ();
1744	#endif	1707	#endif
1745	#if OFF_FOCUS_FADING	1708	#if OFF_FOCUS_FADING
1746	if (rs[Rs_fade])	1709	if (rs[Rs_fade])
1747	{	1710	{
1748	pix_colors = pix_colors_focused;	1711	pix_colors = pix_colors_focused;
…		…
1786	XUnsetICFocus (Input_Context);	1749	XUnsetICFocus (Input_Context);
1787	#endif	1750	#endif
1788	#if CURSOR_BLINK	1751	#if CURSOR_BLINK
1789	if (option (Opt_cursorBlink))	1752	if (option (Opt_cursorBlink))
1790	cursor_blink_ev.stop ();	1753	cursor_blink_ev.stop ();
		1754
1791	hidden_cursor = 0;	1755	hidden_cursor = 0;
1792	#endif	1756	#endif
1793	#if OFF_FOCUS_FADING	1757	#if OFF_FOCUS_FADING
1794	if (rs[Rs_fade])	1758	if (rs[Rs_fade])
1795	{	1759	{
…		…
1835	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1799	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836	{	1800	{
1837	bgPixmap.set_root_pixmap ();	1801	bgPixmap.set_root_pixmap ();
1838	update_background ();	1802	update_background ();
1839	}	1803	}
		1804
1840	break;	1805	break;
1841	}	1806	}
1842	# endif	1807	# endif
		1808
		1809	refresh_check ();
1843	}	1810	}
1844	#endif	1811	#endif
1845		1812
1846	void	1813	void
1847	rxvt_term::button_press (XButtonEvent &ev)	1814	rxvt_term::button_press (XButtonEvent &ev)
…		…
1902	mouse_report (ev);	1869	mouse_report (ev);
1903	}	1870	}
1904	#else	1871	#else
1905	MEvent.button = ev.button;	1872	MEvent.button = ev.button;
1906	mouse_report (ev);	1873	mouse_report (ev);
1907	#endif /* MOUSE_REPORT_DOUBLECLICK */	1874	#endif /* MOUSE_REPORT_DOUBLECLICK */
1908		1875
1909	}	1876	}
1910	else	1877	else
1911	{	1878	{
1912	if (ev.button != MEvent.button)	1879	if (ev.button != MEvent.button)
…		…
1960	}	1927	}
1961		1928
1962	/*	1929	/*
1963	* Scrollbar window processing of button press	1930	* Scrollbar window processing of button press
1964	*/	1931	*/
1965	if (isScrollbarWindow (ev.window))	1932	if (scrollBar.state && ev.window == scrollBar.win)
1966	{	1933	{
1967	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;
1968	/*	1942	/*
1969	* Rxvt-style scrollbar:	1943	* Rxvt-style scrollbar:
1970	* move up if mouse is above slider	1944	* move up if mouse is above slider
1971	* move dn if mouse is below slider	1945	* move dn if mouse is below slider
1972	*	1946	*
…		…
1981	/*	1955	/*
1982	* Mouse report disabled scrollbar:	1956	* Mouse report disabled scrollbar:
1983	* arrow buttons - send up/down	1957	* arrow buttons - send up/down
1984	* click on scrollbar - send pageup/down	1958	* click on scrollbar - send pageup/down
1985	*/	1959	*/
1986	if ((scrollBar.style == R_SB_NEXT	1960	if (direction == UP)
1987	&& scrollbarnext_upButton (ev.y))
1988	\|\| (scrollBar.style == R_SB_RXVT
1989	&& scrollbarrxvt_upButton (ev.y)))
1990	tt_printf ("\033[A");	1961	tt_printf ("\033[A");
1991	else if ((scrollBar.style == R_SB_NEXT	1962	else if (direction == DN)
1992	&& scrollbarnext_dnButton (ev.y))
1993	\|\| (scrollBar.style == R_SB_RXVT
1994	&& scrollbarrxvt_dnButton (ev.y)))
1995	tt_printf ("\033[B");	1963	tt_printf ("\033[B");
1996	else	1964	else
1997	switch (ev.button)	1965	switch (ev.button)
1998	{	1966	{
1999	case Button2:	1967	case Button2:
…		…
2006	tt_printf ("\033[5~");	1974	tt_printf ("\033[5~");
2007	break;	1975	break;
2008	}	1976	}
2009	}	1977	}
2010	else	1978	else
2011	#endif /* NO_SCROLLBAR_REPORT */	1979	#endif /* NO_SCROLLBAR_REPORT */
2012
2013	{
2014	char upordown = 0;
2015
2016	if (scrollBar.style == R_SB_NEXT)
2017	{	1980	{
2018	if (scrollbarnext_upButton (ev.y))	1981	if (direction != NO_DIR)
2019	upordown = -1; /* up */
2020	else if (scrollbarnext_dnButton (ev.y))
2021	upordown = 1; /* down */
2022	}
2023	else if (scrollBar.style == R_SB_RXVT)
2024	{
2025	if (scrollbarrxvt_upButton (ev.y))
2026	upordown = -1; /* up */
2027	else if (scrollbarrxvt_dnButton (ev.y))
2028	upordown = 1; /* down */
2029	}
2030	if (upordown)
2031	{	1982	{
2032	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1983	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1984	if (!cont_scroll_ev.is_active ())
2033	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1985	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034	#endif	1986	#endif
2035	if (scr_page (upordown < 0 ? UP : DN, 1))	1987	if (scr_page (direction, 1))
2036	{	1988	{
2037	if (upordown < 0)	1989	if (direction == UP)
2038	scrollBar.setUp ();	1990	scrollBar.state = STATE_UP;
2039	else	1991	else
2040	scrollBar.setDn ();	1992	scrollBar.state = STATE_DOWN;
2041	}	1993	}
2042	}	1994	}
2043	else	1995	else
2044	switch (ev.button)	1996	switch (ev.button)
2045	{	1997	{
2046	case Button2:	1998	case Button2:
2047	switch (scrollbar_align)	1999	switch (scrollBar.align)
2048	{	2000	{
2049	case R_SB_ALIGN_TOP:	2001	case R_SB_ALIGN_TOP:
2050	csrO = 0;	2002	csrO = 0;
2051	break;	2003	break;
2052	case R_SB_ALIGN_CENTRE:	2004	case R_SB_ALIGN_CENTRE:
…		…
2060	if (scrollBar.style == R_SB_XTERM	2012	if (scrollBar.style == R_SB_XTERM
2061	\|\| scrollbar_above_slider (ev.y)	2013	\|\| scrollbar_above_slider (ev.y)
2062	\|\| scrollbar_below_slider (ev.y))	2014	\|\| scrollbar_below_slider (ev.y))
2063	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2015	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2064		2016
2065	scrollBar.setMotion ();	2017	scrollBar.state = STATE_MOTION;
2066	break;	2018	break;
2067		2019
2068	case Button1:	2020	case Button1:
2069	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2021	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2070	csrO = ev.y - scrollBar.top;	2022	csrO = ev.y - scrollBar.top;
2071	/* FALLTHROUGH */	2023	/* FALLTHROUGH */
2072		2024
2073	case Button3:	2025	case Button3:
2074	if (scrollBar.style != R_SB_XTERM)	2026	if (scrollBar.style != R_SB_XTERM)
…		…
2084	scr_page (DN, nrow - 1);	2036	scr_page (DN, nrow - 1);
2085	# else	2037	# else
2086	scr_page (DN, nrow / 4);	2038	scr_page (DN, nrow / 4);
2087	# endif	2039	# endif
2088	else	2040	else
2089	scrollBar.setMotion ();	2041	scrollBar.state = STATE_MOTION;
2090	}	2042	}
2091	else	2043	else
2092	{	2044	{
2093	scr_page ((ev.button == Button1 ? DN : UP),	2045	scr_page ((ev.button == Button1 ? DN : UP),
2094	(nrow	2046	(nrow
…		…
2111		2063
2112	csrO = 0; /* reset csr Offset */	2064	csrO = 0; /* reset csr Offset */
2113	if (!bypass_keystate)	2065	if (!bypass_keystate)
2114	reportmode = !! (priv_modes & PrivMode_mouse_report);	2066	reportmode = !! (priv_modes & PrivMode_mouse_report);
2115		2067
2116	if (scrollbar_isUpDn ())	2068	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2117	{	2069	{
2118	scrollBar.setIdle ();	2070	scrollBar.state = STATE_IDLE;
2119	scrollbar_show (0);	2071	scrollbar_show (0);
2120	}	2072	}
2121		2073
2122	#ifdef SELECTION_SCROLLING	2074	#ifdef SELECTION_SCROLLING
2123	if (sel_scroll_ev.active)
2124	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2125	#endif	2076	#endif
2126		2077
2127	if (ev.window == vt)	2078	if (ev.window == vt)
2128	{	2079	{
2129	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)))
…		…
2153	mouse_report (ev);	2104	mouse_report (ev);
2154	}	2105	}
2155	#else /* MOUSE_REPORT_DOUBLECLICK */	2106	#else /* MOUSE_REPORT_DOUBLECLICK */
2156	MEvent.button = AnyButton;	2107	MEvent.button = AnyButton;
2157	mouse_report (ev);	2108	mouse_report (ev);
2158	#endif /* MOUSE_REPORT_DOUBLECLICK */	2109	#endif /* MOUSE_REPORT_DOUBLECLICK */
2159	return;	2110	return;
2160	}	2111	}
2161		2112
2162	/*	2113	/*
2163	* dumb hack to compensate for the failure of click-and-drag	2114	* dumb hack to compensate for the failure of click-and-drag
…		…
2201	{	2152	{
2202	mouse_slip_wheel_speed += v ? -1 : 1;	2153	mouse_slip_wheel_speed += v ? -1 : 1;
2203	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2154	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2204	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2155	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205		2156
2206	if (slip_wheel_ev.at < NOW)	2157	if (!slip_wheel_ev.is_active ())
2207	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2158	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2208
2209	slip_wheel_ev.start ();
2210	}	2159	}
2211	else	2160	else
		2161	# endif
2212	{	2162	{
2213	# endif
2214	scr_page (v, i);	2163	scr_page (v, i);
2215	scrollbar_show (1);	2164	scrollbar_show (1);
2216	# ifdef MOUSE_SLIP_WHEELING
2217	}	2165	}
2218	# endif
2219	}	2166	}
2220	break;	2167	break;
2221	#endif	2168	#endif
2222	}	2169	}
2223	}	2170	}
…		…
2282		2229
2283	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2230	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2284	{	2231	{
2285	refresh_count = 0;	2232	refresh_count = 0;
2286		2233
2287	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2234	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2288	{	2235	{
2289	refreshnow = true;	2236	refreshnow = true;
2290	ch = NOCHAR;	2237	ch = NOCHAR;
2291	break;	2238	break;
2292	}	2239	}
…		…
2503	}	2450	}
2504	}	2451	}
2505		2452
2506	pclose_printer (fd);	2453	pclose_printer (fd);
2507	}	2454	}
2508	#endif /* PRINTPIPE */	2455	#endif /* PRINTPIPE */
2509	/}}} /	2456	/}}} /
2510		2457
2511	/* INDENT-OFF */	2458	/* INDENT-OFF */
2512	enum {	2459	enum {
2513	C1_40 = 0x40,	2460	C1_40 = 0x40,
…		…
2617	break;	2564	break;
2618	case 'Z': /* identify the terminal type */	2565	case 'Z': /* identify the terminal type */
2619	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2566	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620	break;	2567	break;
2621	case '<': /* turn off VT52 mode */	2568	case '<': /* turn off VT52 mode */
2622	PrivMode (0, PrivMode_vt52);	2569	set_privmode (PrivMode_vt52, 0);
2623	break;	2570	break;
2624	case 'F': /* use special graphics character set */	2571	case 'F': /* use special graphics character set */
2625	case 'G': /* use regular character set */	2572	case 'G': /* use regular character set */
2626	/* unimplemented */	2573	/* unimplemented */
2627	break;	2574	break;
…		…
2681	scr_forwardindex ();	2628	scr_forwardindex ();
2682	break;	2629	break;
2683	#endif	2630	#endif
2684	case '=':	2631	case '=':
2685	case '>':	2632	case '>':
2686	PrivMode ((ch == '='), PrivMode_aplKP);	2633	set_privmode (PrivMode_aplKP, ch == '=');
2687	break;	2634	break;
2688		2635
2689	case C1_40:	2636	case C1_40:
2690	cmd_getc ();	2637	cmd_getc ();
2691	break;	2638	break;
…		…
2806	nargs = 0;	2753	nargs = 0;
2807		2754
2808	priv = 0;	2755	priv = 0;
2809	ch = cmd_getc ();	2756	ch = cmd_getc ();
2810	if (ch >= '<' && ch <= '?')	2757	if (ch >= '<' && ch <= '?')
		2758	{
2811	{ /* '<' '=' '>' '?' */	2759	/* '<' '=' '>' '?' */
2812	priv = ch;	2760	priv = ch;
2813	ch = cmd_getc ();	2761	ch = cmd_getc ();
2814	}	2762	}
2815		2763
2816	/* read any numerical arguments */	2764	/* read any numerical arguments */
…		…
2865	// versions.	2813	// versions.
2866	//	2814	//
2867	tt_printf ("\033[>%d;95;0c", 'U');	2815	tt_printf ("\033[>%d;95;0c", 'U');
2868	}	2816	}
2869	break;	2817	break;
		2818
2870	case '?':	2819	case '?':
2871	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2820	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2872	process_terminal_mode (ch, priv, nargs, arg);	2821	process_terminal_mode (ch, priv, nargs, arg);
2873	break;	2822	break;
2874	}	2823	}
…		…
3390	*buf++ = '\0';	3339	*buf++ = '\0';
3391		3340
3392	process_color_seq (op, color, name, resp);	3341	process_color_seq (op, color, name, resp);
3393	}	3342	}
3394	break;	3343	break;
		3344	case Rxvt_restoreFG:
3395	case XTerm_Color00:	3345	case XTerm_Color00:
3396	process_color_seq (op, Color_fg, str, resp);	3346	process_color_seq (op, Color_fg, str, resp);
3397	break;	3347	break;
		3348	case Rxvt_restoreBG:
3398	case XTerm_Color01:	3349	case XTerm_Color01:
3399	process_color_seq (op, Color_bg, str, resp);	3350	process_color_seq (op, Color_bg, str, resp);
3400	break;	3351	break;
3401	#ifndef NO_CURSORCOLOR	3352	#ifndef NO_CURSORCOLOR
3402	case XTerm_Color_cursor:	3353	case XTerm_Color_cursor:
…		…
3428	#if ENABLE_TRANSPARENCY	3379	#if ENABLE_TRANSPARENCY
3429	case URxvt_Color_tint:	3380	case URxvt_Color_tint:
3430	process_color_seq (op, Color_tint, str, resp);	3381	process_color_seq (op, Color_tint, str, resp);
3431	{	3382	{
3432	bool changed = false;	3383	bool changed = false;
		3384
3433	if (ISSET_PIXCOLOR (Color_tint))	3385	if (ISSET_PIXCOLOR (Color_tint))
3434	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3386	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3435	else	3387	else
3436	changed = bgPixmap.unset_tint ();	3388	changed = bgPixmap.unset_tint ();
		3389
3437	if (changed)	3390	if (changed)
3438	update_background ();	3391	update_background ();
3439	}	3392	}
3440		3393
3441	break;	3394	break;
…		…
3464	changed++;	3417	changed++;
3465	str = strchr (str, ';');	3418	str = strchr (str, ';');
3466	if (str == NULL)	3419	if (str == NULL)
3467	bgPixmap.set_defaultGeometry ();	3420	bgPixmap.set_defaultGeometry ();
3468	}	3421	}
		3422
3469	while (str)	3423	while (str)
3470	{	3424	{
3471	str++;	3425	str++;
3472	if (bgPixmap.set_geometry (str))	3426	if (bgPixmap.set_geometry (str))
3473	changed++;	3427	changed++;
3474	str = strchr (str, ';');	3428	str = strchr (str, ';');
3475	}	3429	}
		3430
3476	if (changed)	3431	if (changed)
3477	update_background ();	3432	update_background ();
3478	}	3433	}
3479	break;	3434	break;
3480	#endif	3435	#endif
3481
3482	case Rxvt_restoreFG:
3483	set_window_color (Color_fg, str);
3484	break;
3485	case Rxvt_restoreBG:
3486	set_window_color (Color_bg, str);
3487	break;
3488		3436
3489	case XTerm_logfile:	3437	case XTerm_logfile:
3490	// TODO, when secure mode?	3438	// TODO, when secure mode?
3491	break;	3439	break;
3492		3440
…		…
3593	{	3541	{
3594	if (mode == 'r')	3542	if (mode == 'r')
3595	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3543	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3596	else	3544	else
3597	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3545	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3598	PrivMode (state, bit);	3546	set_privmode (bit, state);
3599	}	3547	}
3600		3548
3601	return state;	3549	return state;
3602	}	3550	}
3603		3551
…		…
3636	{ 66, PrivMode_aplKP },	3584	{ 66, PrivMode_aplKP },
3637	#ifndef NO_BACKSPACE_KEY	3585	#ifndef NO_BACKSPACE_KEY
3638	{ 67, PrivMode_BackSpace },	3586	{ 67, PrivMode_BackSpace },
3639	#endif	3587	#endif
3640	{ 1000, PrivMode_MouseX11 },	3588	{ 1000, PrivMode_MouseX11 },
3641	// 1001 Use Hilite Mouse Tracking. NYI, TODO
3642	{ 1002, PrivMode_MouseBtnEvent },	3589	{ 1002, PrivMode_MouseBtnEvent },
3643	{ 1003, PrivMode_MouseAnyEvent },	3590	{ 1003, PrivMode_MouseAnyEvent },
3644	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3591	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3645	{ 1011, PrivMode_Keypress }, // rxvt extension	3592	{ 1011, PrivMode_Keypress }, // rxvt extension
3646	// 1035 enable modifiers for alt, numlock NYI	3593	// 1035 enable modifiers for alt, numlock NYI
…		…
3648	// 1037 send DEL for keypad delete NYI	3595	// 1037 send DEL for keypad delete NYI
3649	{ 1047, PrivMode_Screen },	3596	{ 1047, PrivMode_Screen },
3650	// 1048 save and restore cursor	3597	// 1048 save and restore cursor
3651	{ 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 */
3652	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3599	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3600	{ 2004, PrivMode_BracketPaste },
3653	};	3601	};
3654		3602
3655	if (nargs == 0)	3603	if (nargs == 0)
3656	return;	3604	return;
3657		3605
…		…
3701	case 2: /* VT52 mode */	3649	case 2: /* VT52 mode */
3702	/* oddball mode. should be set regardless of set/reset	3650	/* oddball mode. should be set regardless of set/reset
3703	* parameter. Return from VT52 mode with an ESC < from	3651	* parameter. Return from VT52 mode with an ESC < from
3704	* within VT52 mode	3652	* within VT52 mode
3705	*/	3653	*/
3706	PrivMode (1, PrivMode_vt52);	3654	set_privmode (PrivMode_vt52, 1);
3707	break;	3655	break;
3708	case 3: /* 80/132 */	3656	case 3: /* 80/132 */
3709	if (priv_modes & PrivMode_132OK)	3657	if (priv_modes & PrivMode_132OK)
		3658	{
		3659	scr_poweron ();
3710	set_widthheight (((state ? 132 : 80) * fwidth), height);	3660	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3661	}
3711	break;	3662	break;
3712	case 4: /* smooth scrolling */	3663	case 4: /* smooth scrolling */
3713	set_option (Opt_jumpScroll, !state);	3664	set_option (Opt_jumpScroll, !state);
3714	break;	3665	break;
3715	case 5: /* reverse video */	3666	case 5: /* reverse video */
…		…
3747	/* case 67: - backspace key */	3698	/* case 67: - backspace key */
3748	case 1000: /* X11 mouse reporting */	3699	case 1000: /* X11 mouse reporting */
3749	if (state) /* orthogonal */	3700	if (state) /* orthogonal */
3750	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3701	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3751	break;	3702	break;
3752	#if 0
3753	case 1001:
3754	break; /* X11 mouse highlighting */
3755	#endif
3756	case 1002:	3703	case 1002:
3757	case 1003:	3704	case 1003:
3758	if (state) {	3705	if (state)
		3706	{
3759	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3707	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3760	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3708	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761	vt_emask_mouse = PointerMotionMask;	3709	vt_emask_mouse = PointerMotionMask;
		3710	}
3762	} else	3711	else
3763	vt_emask_mouse = NoEventMask;	3712	vt_emask_mouse = NoEventMask;
3764	vt_select_input ();	3713	vt_select_input ();
3765	break;	3714	break;
3766	case 1010: /* scroll to bottom on TTY output inhibit */	3715	case 1010: /* scroll to bottom on TTY output inhibit */
3767	set_option (Opt_scrollTtyOutput, !state);	3716	set_option (Opt_scrollTtyOutput, !state);
…		…
3947	rxvt_term::process_graphics ()	3896	rxvt_term::process_graphics ()
3948	{	3897	{
3949	unicode_t ch, cmd = cmd_getc ();	3898	unicode_t ch, cmd = cmd_getc ();
3950		3899
3951	if (cmd == 'Q')	3900	if (cmd == 'Q')
		3901	{
3952	{ /* query graphics */	3902	/* query graphics */
3953	tt_printf ("\033G0\012"); /* no graphics */	3903	tt_printf ("\033G0\012"); /* no graphics */
3954	return;	3904	return;
3955	}	3905	}
3956	/* swallow other graphics sequences until terminating ':' */	3906	/* swallow other graphics sequences until terminating ':' */
3957	do	3907	do
…		…
4007	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3957	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4008		3958
4009	memcpy (v_buffer + v_buflen, data, len);	3959	memcpy (v_buffer + v_buflen, data, len);
4010	v_buflen += len;	3960	v_buflen += len;
4011		3961
4012	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3962	pty_ev.set (ev::READ \| ev::WRITE);
4013	}	3963	}
4014		3964
4015	void rxvt_term::pty_write ()	3965	void rxvt_term::pty_write ()
4016	{	3966	{
4017	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));
…		…
4023	if (v_buflen == 0)	3973	if (v_buflen == 0)
4024	{	3974	{
4025	free (v_buffer);	3975	free (v_buffer);
4026	v_buffer = 0;	3976	v_buffer = 0;
4027		3977
4028	pty_ev.set (EVENT_READ);	3978	pty_ev.set (ev::READ);
4029	return;	3979	return;
4030	}	3980	}
4031		3981
4032	memmove (v_buffer, v_buffer + written, v_buflen);	3982	memmove (v_buffer, v_buffer + written, v_buflen);
4033	}	3983	}
4034	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3984	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4035	pty_ev.set (EVENT_READ);	3985	pty_ev.set (ev::READ);
4036	}	3986	}
4037		3987
4038	/----------------------- end-of-file (C source) -----------------------/	3988	/----------------------- end-of-file (C source) -----------------------/
4039		3989

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.361 by ayin, Wed Oct 31 09:55:23 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.361 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.412 by ayin, Sun Feb 17 11:13:11 2008 UTC