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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.383 by root, Fri Dec 14 06:29:28 2007 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	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* 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	33	* 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	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	550	{
551	{	551	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	553	newlen = 1;
		554	#ifdef XK_KP_Home
		555	static const KeySym keypadtrans[] = {
		556	XK_KP_7, // XK_KP_Home
		557	XK_KP_4, // XK_KP_Left
		558	XK_KP_8, // XK_KP_Up
		559	XK_KP_6, // XK_KP_Right
		560	XK_KP_2, // XK_KP_Down
		561	#ifndef UNSHIFTED_SCROLLKEYS
		562	XK_KP_9, // XK_KP_Prior
		563	XK_KP_3, // XK_KP_Next
		564	#else
		565	XK_Prior,
		566	XK_Next,
		567	#endif
		568	XK_KP_1, // XK_KP_End
		569	XK_KP_5, // XK_KP_Begin
		570	};
		571
		572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		573	{
		574	unsigned int index = keysym - XK_KP_Home;
		575	keysym = kp ? keypadtrans[index] : XK_Home + index;
		576	}
		577	else if (keysym == XK_KP_Insert)
		578	keysym = kp ? XK_KP_0 : XK_Insert;
		579	#ifndef NO_DELETE_KEY
		580	else if (keysym == XK_KP_Delete)
		581	keysym = kp ? XK_KP_Decimal : XK_Delete;
		582	#endif
		583	#endif
554	switch (keysym)	584	switch (keysym)
555	{	585	{
556	#ifndef NO_BACKSPACE_KEY	586	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	587	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	588	if (priv_modes & PrivMode_HaveBackSpace)
…		…
564	else	594	else
565	strcpy (kbuf, rs[Rs_backspace_key]);	595	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	596	break;
567	#endif	597	#endif
568	#ifndef NO_DELETE_KEY	598	#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:	599	case XK_Delete:
580	strcpy (kbuf, rs[Rs_delete_key]);	600	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	601	break;
582	#endif	602	#endif
583	case XK_Tab:	603	case XK_Tab:
…		…
595	#endif	615	#endif
596	newlen = 0;	616	newlen = 0;
597	}	617	}
598	break;	618	break;
599		619
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" */	620	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	621	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	622	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	623	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	624	strcpy (kbuf, "\033[Z");
…		…
630	else if (priv_modes & PrivMode_aplCUR)	634	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	635	kbuf[1] = 'O';
632	break;	636	break;
633		637
634	#ifndef UNSHIFTED_SCROLLKEYS	638	#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:	639	case XK_Prior:
646	strcpy (kbuf, "\033[5~");	640	strcpy (kbuf, "\033[5~");
647	break;	641	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:	642	case XK_Next:
659	strcpy (kbuf, "\033[6~");	643	strcpy (kbuf, "\033[6~");
660	break;	644	break;
661	#endif	645	#endif
662	case XK_KP_Enter:	646	case XK_KP_Enter:
…		…
681	kbuf[0] = '\015';	665	kbuf[0] = '\015';
682	kbuf[1] = '\0';	666	kbuf[1] = '\0';
683	}	667	}
684	break;	668	break;
685		669
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" */	670	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	671	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	672	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	673	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	674	strcpy (kbuf, "\033OP");
…		…
728		706
729	case XK_Find:	707	case XK_Find:
730	strcpy (kbuf, "\033[1~");	708	strcpy (kbuf, "\033[1~");
731	break;	709	break;
732		710
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:	711	case XK_Insert:
744	strcpy (kbuf, "\033[2~");	712	strcpy (kbuf, "\033[2~");
745	break;	713	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */	714	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:	715	case DXK_Remove:
…		…
751	strcpy (kbuf, "\033[3~");	719	strcpy (kbuf, "\033[3~");
752	break;	720	break;
753	case XK_Select:	721	case XK_Select:
754	strcpy (kbuf, "\033[4~");	722	strcpy (kbuf, "\033[4~");
755	break;	723	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:	724	case XK_End:
767	strcpy (kbuf, KS_END);	725	strcpy (kbuf, KS_END);
768	break;	726	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:	727	case XK_Home:
780	strcpy (kbuf, KS_HOME);	728	strcpy (kbuf, KS_HOME);
781	break;	729	break;
782		730
783	#define FKEY(n, fkey) \	731	#define FKEY(n, fkey) \
…		…
1034		982
1035	void	983	void
1036	rxvt_term::flush ()	984	rxvt_term::flush ()
1037	{	985	{
1038	flush_ev.stop ();	986	flush_ev.stop ();
1039		987
1040	#ifdef HAVE_BG_PIXMAP	988	#ifdef HAVE_BG_PIXMAP
1041	if (bgPixmap.check_clearChanged ())	989	if (bgPixmap.check_clearChanged ())
1042	{	990	{
1043	scr_clear (true);	991	// scr_clear (true); This needs to be researched further!
1044	scr_touch (false);	992	scr_touch (false);
1045	}	993	}
1046	#endif	994	#endif
1047		995
1048	if (want_refresh)	996	if (want_refresh)
…		…
1093	}	1041	}
1094		1042
1095	display->flush ();	1043	display->flush ();
1096	}	1044	}
1097		1045
		1046	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1047	void
1099	rxvt_term::check_cb (check_watcher &w)	1048	rxvt_term::refresh_check ()
1100	{	1049	{
1101	make_current ();	1050	if (want_refresh && !flush_ev.is_active ())
		1051	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102		1052
1103	display->flush ();	1053	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107	}	1054	}
1108		1055
1109	void	1056	void
1110	rxvt_term::flush_cb (time_watcher &w)	1057	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1058	{
1112	make_current ();	1059	make_current ();
1113		1060
1114	refresh_count = 0;	1061	refresh_count = 0;
1115	flush ();	1062	flush ();
1116	}	1063	}
1117		1064
1118	#ifdef CURSOR_BLINK	1065	#ifdef CURSOR_BLINK
1119	void	1066	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1067	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1068	{
1122	hidden_cursor = !hidden_cursor;	1069	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1070	want_refresh = 1;
1124		1071	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1072	}
1127	#endif	1073	#endif
1128		1074
1129	#ifdef TEXT_BLINK	1075	#ifdef TEXT_BLINK
1130	void	1076	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1077	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1078	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1079	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1080	{
1135	hidden_text = !hidden_text;	1081	hidden_text = !hidden_text;
1136	want_refresh = 1;	1082	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1083	refresh_check ();
1138	}	1084	}
		1085	else
		1086	w.stop ();
1139	}	1087	}
1140	#endif	1088	#endif
1141		1089
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1090	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1091	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1092	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1093	{
1146	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1094	if ((scrollbar_isUp () \|\| scrollbar_isDn ())
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1095	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1148	{	1096	{
1149	want_refresh = 1;	1097	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1098	refresh_check ();
1151	}	1099	}
		1100	else
		1101	w.stop ();
1152	}	1102	}
1153	#endif	1103	#endif
1154		1104
1155	#ifdef SELECTION_SCROLLING	1105	#ifdef SELECTION_SCROLLING
1156	void	1106	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1107	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1108	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1109	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1110	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1111	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1112	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1113	refresh_check ();
1164	}	1114	}
		1115	else
		1116	w.stop ();
1165	}	1117	}
1166	#endif	1118	#endif
1167		1119
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1120	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1121	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1122	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1123	{
1172	if (mouse_slip_wheel_speed == 0	1124	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	{	1125	{
1176	if (view_start == top_row \|\| view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1126	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1127	refresh_check ();
		1128	}
		1129
		1130	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1131	{
		1132	mouse_slip_wheel_speed = 0;
		1133	w.stop ();
1181	}	1134	}
1182	}	1135	}
1183	#endif	1136	#endif
1184		1137
1185	#if LINUX_YIELD_HACK	1138	#if LINUX_YIELD_HACK
1186	static struct event_handler	1139	static struct event_handler
1187	{	1140	{
1188	check_watcher yield_ev;	1141	ev::prepare yield_ev;
1189		1142
1190	void yield_cb (check_watcher &w)	1143	void yield_cb (ev::prepare &w, int revents)
1191	{	1144	{
1192	// this should really be sched_yield(), but the linux guys thought	1145	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1146	// 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	1147	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1148	// allowed by the sus... as is returning ENOSYS.
…		…
1246		1199
1247	return false;	1200	return false;
1248	}	1201	}
1249		1202
1250	void	1203	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1204	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1205	{
1253	make_current ();	1206	make_current ();
1254		1207
1255	if (revents & EVENT_READ)	1208	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1209	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1210	while (pty_fill ())
1258	if (cmd_parse ())	1211	if (cmd_parse ())
1259	break;	1212	break;
1260		1213
1261	if (revents & EVENT_WRITE)	1214	if (revents & ev::WRITE)
1262	pty_write ();	1215	pty_write ();
		1216
		1217	refresh_check ();
1263	}	1218	}
1264		1219
1265	void	1220	void
1266	rxvt_term::pointer_unblank ()	1221	rxvt_term::pointer_unblank ()
1267	{	1222	{
…		…
1270		1225
1271	#ifdef POINTER_BLANK	1226	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1227	hidden_pointer = 0;
1273		1228
1274	if (option (Opt_pointerBlank))	1229	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1230	pointer_ev.start (pointerBlankDelay);
1276	#endif	1231	#endif
1277	}	1232	}
1278		1233
1279	#ifdef POINTER_BLANK	1234	#ifdef POINTER_BLANK
1280	void	1235	void
…		…
1288		1243
1289	hidden_pointer = 1;	1244	hidden_pointer = 1;
1290	}	1245	}
1291		1246
1292	void	1247	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1248	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1249	{
1295	make_current ();	1250	make_current ();
1296		1251
1297	pointer_blank ();	1252	pointer_blank ();
1298	}	1253	}
…		…
1301	void	1256	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1257	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1258	{
1304	int button_number, key_state = 0;	1259	int button_number, key_state = 0;
1305	int x, y;	1260	int x, y;
		1261	int code = 32;
1306		1262
1307	x = ev.x;	1263	x = Pixel2Col (ev.x);
1308	y = ev.y;	1264	y = Pixel2Row (ev.y);
1309	pixel_position (&x, &y);	1265	if (ev.type == MotionNotify)
		1266	{
		1267	if (x == mouse_row && y == mouse_col)
		1268	return;
		1269	mouse_row = x;
		1270	mouse_col = y;
		1271	code += 32;
		1272	}
1310		1273
1311	if (MEvent.button == AnyButton)	1274	if (MEvent.button == AnyButton)
1312	button_number = 3;	1275	button_number = 3;
1313	else	1276	else
1314	{	1277	{
…		…
1360	x + 1,	1323	x + 1,
1361	y + 1);	1324	y + 1);
1362	#endif	1325	#endif
1363		1326
1364	tt_printf ("\033[M%c%c%c",	1327	tt_printf ("\033[M%c%c%c",
1365	(32 + button_number + key_state),	1328	(code + button_number + key_state),
1366	(32 + x + 1),	1329	(32 + x + 1),
1367	(32 + y + 1));	1330	(32 + y + 1));
1368	}	1331	}
1369		1332
1370	/{{{ process an X event /	1333	/{{{ process an X event /
…		…
1522	break;	1485	break;
1523		1486
1524	case MapNotify:	1487	case MapNotify:
1525	mapped = 1;	1488	mapped = 1;
1526	#ifdef TEXT_BLINK	1489	#ifdef TEXT_BLINK
1527	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1490	text_blink_ev.start ();
1528	#endif	1491	#endif
1529	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1492	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530	break;	1493	break;
1531		1494
1532	case UnmapNotify:	1495	case UnmapNotify:
…		…
1553	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1516	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554	{	1517	{
1555	scr_expose (ev.xexpose.x, ev.xexpose.y,	1518	scr_expose (ev.xexpose.x, ev.xexpose.y,
1556	ev.xexpose.width, ev.xexpose.height, False);	1519	ev.xexpose.width, ev.xexpose.height, False);
1557	}	1520	}
		1521
1558	want_refresh = 1;	1522	want_refresh = 1;
1559	}	1523	}
1560	else	1524	else
1561	{	1525	{
1562	XEvent unused_event;	1526	XEvent unused_event;
…		…
1577	case MotionNotify:	1541	case MotionNotify:
1578	#ifdef POINTER_BLANK	1542	#ifdef POINTER_BLANK
1579	if (hidden_pointer)	1543	if (hidden_pointer)
1580	pointer_unblank ();	1544	pointer_unblank ();
1581	#endif	1545	#endif
		1546	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1547	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1548	mouse_report (ev.xbutton);
1582	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1549	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583	break;	1550	break;
1584		1551
1585	if (ev.xany.window == vt)	1552	if (ev.xany.window == vt)
1586	{	1553	{
…		…
1620	int dist;	1587	int dist;
1621		1588
1622	/* don't clobber the current delay if we are	1589	/* don't clobber the current delay if we are
1623	* already in the middle of scrolling.	1590	* already in the middle of scrolling.
1624	*/	1591	*/
1625	if (!sel_scroll_ev.active)	1592	if (!sel_scroll_ev.is_active ())
1626	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1593	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627		1594
1628	/* save the event params so we can highlight	1595	/* save the event params so we can highlight
1629	* the selection in the pending-scroll loop	1596	* the selection in the pending-scroll loop
1630	*/	1597	*/
1631	selection_save_x = ev.xbutton.x;	1598	selection_save_x = ev.xbutton.x;
…		…
1653	else	1620	else
1654	{	1621	{
1655	/* we are within the text window, so we	1622	/* we are within the text window, so we
1656	* shouldn't be scrolling	1623	* shouldn't be scrolling
1657	*/	1624	*/
1658	if (sel_scroll_ev.active)
1659	sel_scroll_ev.stop();	1625	sel_scroll_ev.stop();
1660	}	1626	}
1661	#endif	1627	#endif
1662	#ifdef MOUSE_THRESHOLD	1628	#ifdef MOUSE_THRESHOLD
1663	}	1629	}
1664	#endif	1630	#endif
…		…
1690	{	1656	{
1691	hidden_cursor = 0;	1657	hidden_cursor = 0;
1692	want_refresh = 1;	1658	want_refresh = 1;
1693	}	1659	}
1694		1660
1695	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1661	cursor_blink_ev.again ();
1696	}	1662	}
1697	#endif	1663	#endif
1698		1664
1699	#if defined(POINTER_BLANK)	1665	#if defined(POINTER_BLANK)
1700	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1666	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1707		1673
1708	if (ev.type == KeyPress && hidden_pointer == 0)	1674	if (ev.type == KeyPress && hidden_pointer == 0)
1709	pointer_blank ();	1675	pointer_blank ();
1710	}	1676	}
1711	#endif	1677	#endif
		1678
		1679	refresh_check ();
1712	}	1680	}
1713		1681
1714	void	1682	void
1715	rxvt_term::focus_in ()	1683	rxvt_term::focus_in ()
1716	{	1684	{
…		…
1728	XSetICFocus (Input_Context);	1696	XSetICFocus (Input_Context);
1729	}	1697	}
1730	#endif	1698	#endif
1731	#if CURSOR_BLINK	1699	#if CURSOR_BLINK
1732	if (option (Opt_cursorBlink))	1700	if (option (Opt_cursorBlink))
1733	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1701	cursor_blink_ev.again ();
1734	#endif	1702	#endif
1735	#if OFF_FOCUS_FADING	1703	#if OFF_FOCUS_FADING
1736	if (rs[Rs_fade])	1704	if (rs[Rs_fade])
1737	{	1705	{
1738	pix_colors = pix_colors_focused;	1706	pix_colors = pix_colors_focused;
…		…
1776	XUnsetICFocus (Input_Context);	1744	XUnsetICFocus (Input_Context);
1777	#endif	1745	#endif
1778	#if CURSOR_BLINK	1746	#if CURSOR_BLINK
1779	if (option (Opt_cursorBlink))	1747	if (option (Opt_cursorBlink))
1780	cursor_blink_ev.stop ();	1748	cursor_blink_ev.stop ();
		1749
1781	hidden_cursor = 0;	1750	hidden_cursor = 0;
1782	#endif	1751	#endif
1783	#if OFF_FOCUS_FADING	1752	#if OFF_FOCUS_FADING
1784	if (rs[Rs_fade])	1753	if (rs[Rs_fade])
1785	{	1754	{
…		…
1828	update_background ();	1797	update_background ();
1829	}	1798	}
1830	break;	1799	break;
1831	}	1800	}
1832	# endif	1801	# endif
		1802
		1803	refresh_check ();
1833	}	1804	}
1834	#endif	1805	#endif
1835		1806
1836	void	1807	void
1837	rxvt_term::button_press (XButtonEvent &ev)	1808	rxvt_term::button_press (XButtonEvent &ev)
…		…
1892	mouse_report (ev);	1863	mouse_report (ev);
1893	}	1864	}
1894	#else	1865	#else
1895	MEvent.button = ev.button;	1866	MEvent.button = ev.button;
1896	mouse_report (ev);	1867	mouse_report (ev);
1897	#endif /* MOUSE_REPORT_DOUBLECLICK */	1868	#endif /* MOUSE_REPORT_DOUBLECLICK */
1898		1869
1899	}	1870	}
1900	else	1871	else
1901	{	1872	{
1902	if (ev.button != MEvent.button)	1873	if (ev.button != MEvent.button)
…		…
1996	tt_printf ("\033[5~");	1967	tt_printf ("\033[5~");
1997	break;	1968	break;
1998	}	1969	}
1999	}	1970	}
2000	else	1971	else
2001	#endif /* NO_SCROLLBAR_REPORT */	1972	#endif /* NO_SCROLLBAR_REPORT */
2002		1973
2003	{	1974	{
2004	char upordown = 0;	1975	char upordown = 0;
2005		1976
2006	if (scrollBar.style == R_SB_NEXT)	1977	if (scrollBar.style == R_SB_NEXT)
2007	{	1978	{
2008	if (scrollbarnext_upButton (ev.y))	1979	if (scrollbarnext_upButton (ev.y))
2009	upordown = -1; /* up */	1980	upordown = -1; /* up */
…		…
2015	if (scrollbarrxvt_upButton (ev.y))	1986	if (scrollbarrxvt_upButton (ev.y))
2016	upordown = -1; /* up */	1987	upordown = -1; /* up */
2017	else if (scrollbarrxvt_dnButton (ev.y))	1988	else if (scrollbarrxvt_dnButton (ev.y))
2018	upordown = 1; /* down */	1989	upordown = 1; /* down */
2019	}	1990	}
		1991
2020	if (upordown)	1992	if (upordown)
2021	{	1993	{
2022	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1994	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1995	if (!cont_scroll_ev.is_active ())
2023	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1996	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2024	#endif	1997	#endif
2025	if (scr_page (upordown < 0 ? UP : DN, 1))	1998	if (scr_page (upordown < 0 ? UP : DN, 1))
2026	{	1999	{
2027	if (upordown < 0)	2000	if (upordown < 0)
2028	scrollBar.setUp ();	2001	scrollBar.setUp ();
…		…
2108	scrollBar.setIdle ();	2081	scrollBar.setIdle ();
2109	scrollbar_show (0);	2082	scrollbar_show (0);
2110	}	2083	}
2111		2084
2112	#ifdef SELECTION_SCROLLING	2085	#ifdef SELECTION_SCROLLING
2113	if (sel_scroll_ev.active)
2114	sel_scroll_ev.stop();	2086	sel_scroll_ev.stop();
2115	#endif	2087	#endif
2116		2088
2117	if (ev.window == vt)	2089	if (ev.window == vt)
2118	{	2090	{
2119	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2091	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2143	mouse_report (ev);	2115	mouse_report (ev);
2144	}	2116	}
2145	#else /* MOUSE_REPORT_DOUBLECLICK */	2117	#else /* MOUSE_REPORT_DOUBLECLICK */
2146	MEvent.button = AnyButton;	2118	MEvent.button = AnyButton;
2147	mouse_report (ev);	2119	mouse_report (ev);
2148	#endif /* MOUSE_REPORT_DOUBLECLICK */	2120	#endif /* MOUSE_REPORT_DOUBLECLICK */
2149	return;	2121	return;
2150	}	2122	}
2151		2123
2152	/*	2124	/*
2153	* dumb hack to compensate for the failure of click-and-drag	2125	* dumb hack to compensate for the failure of click-and-drag
…		…
2191	{	2163	{
2192	mouse_slip_wheel_speed += v ? -1 : 1;	2164	mouse_slip_wheel_speed += v ? -1 : 1;
2193	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2165	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2194	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2166	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2195		2167
2196	if (slip_wheel_ev.at < NOW)	2168	if (!slip_wheel_ev.is_active ())
2197	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2169	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2198
2199	slip_wheel_ev.start ();
2200	}	2170	}
2201	else	2171	else
2202	{	2172	{
2203	# endif	2173	# endif
2204	scr_page (v, i);	2174	scr_page (v, i);
…		…
2272		2242
2273	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2243	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2274	{	2244	{
2275	refresh_count = 0;	2245	refresh_count = 0;
2276		2246
2277	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2247	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2278	{	2248	{
2279	refreshnow = true;	2249	refreshnow = true;
2280	ch = NOCHAR;	2250	ch = NOCHAR;
2281	break;	2251	break;
2282	}	2252	}
…		…
2493	}	2463	}
2494	}	2464	}
2495		2465
2496	pclose_printer (fd);	2466	pclose_printer (fd);
2497	}	2467	}
2498	#endif /* PRINTPIPE */	2468	#endif /* PRINTPIPE */
2499	/}}} /	2469	/}}} /
2500		2470
2501	/* INDENT-OFF */	2471	/* INDENT-OFF */
2502	enum {	2472	enum {
2503	C1_40 = 0x40,	2473	C1_40 = 0x40,
…		…
2796	nargs = 0;	2766	nargs = 0;
2797		2767
2798	priv = 0;	2768	priv = 0;
2799	ch = cmd_getc ();	2769	ch = cmd_getc ();
2800	if (ch >= '<' && ch <= '?')	2770	if (ch >= '<' && ch <= '?')
		2771	{
2801	{ /* '<' '=' '>' '?' */	2772	/* '<' '=' '>' '?' */
2802	priv = ch;	2773	priv = ch;
2803	ch = cmd_getc ();	2774	ch = cmd_getc ();
2804	}	2775	}
2805		2776
2806	/* read any numerical arguments */	2777	/* read any numerical arguments */
…		…
2849	{	2820	{
2850	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2821	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2822	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852	//	2823	//
2853	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2824	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2825	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2855	// that we do not support xterm mouse reporting (should be 95 when we do).	2826	// versions.
2856	//	2827	//
2857	tt_printf ("\033[>%d;94;0c", 'U');	2828	tt_printf ("\033[>%d;95;0c", 'U');
2858	}	2829	}
2859	break;	2830	break;
2860	case '?':	2831	case '?':
2861	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2832	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2862	process_terminal_mode (ch, priv, nargs, arg);	2833	process_terminal_mode (ch, priv, nargs, arg);
…		…
3626	{ 66, PrivMode_aplKP },	3597	{ 66, PrivMode_aplKP },
3627	#ifndef NO_BACKSPACE_KEY	3598	#ifndef NO_BACKSPACE_KEY
3628	{ 67, PrivMode_BackSpace },	3599	{ 67, PrivMode_BackSpace },
3629	#endif	3600	#endif
3630	{ 1000, PrivMode_MouseX11 },	3601	{ 1000, PrivMode_MouseX11 },
3631	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3602	{ 1002, PrivMode_MouseBtnEvent },
3632	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3603	{ 1003, PrivMode_MouseAnyEvent },
3633	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3634	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3604	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635	{ 1011, PrivMode_Keypress }, // rxvt extension	3605	{ 1011, PrivMode_Keypress }, // rxvt extension
3636	// 1035 enable modifiers for alt, numlock NYI	3606	// 1035 enable modifiers for alt, numlock NYI
3637	// 1036 send ESC for meta keys NYI	3607	// 1036 send ESC for meta keys NYI
3638	// 1037 send DEL for keypad delete NYI	3608	// 1037 send DEL for keypad delete NYI
…		…
3712	scr_autowrap (state);	3682	scr_autowrap (state);
3713	break;	3683	break;
3714	/* case 8: - auto repeat, can't do on a per window basis */	3684	/* case 8: - auto repeat, can't do on a per window basis */
3715	case 9: /* X10 mouse reporting */	3685	case 9: /* X10 mouse reporting */
3716	if (state) /* orthogonal */	3686	if (state) /* orthogonal */
3717	priv_modes &= ~PrivMode_MouseX11;	3687	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3718	break;	3688	break;
3719	#ifdef scrollBar_esc	3689	#ifdef scrollBar_esc
3720	case scrollBar_esc:	3690	case scrollBar_esc:
3721	if (scrollbar_mapping (state))	3691	if (scrollbar_mapping (state))
3722	{	3692	{
…		…
3735	break;	3705	break;
3736	/* case 66: - application key pad */	3706	/* case 66: - application key pad */
3737	/* case 67: - backspace key */	3707	/* case 67: - backspace key */
3738	case 1000: /* X11 mouse reporting */	3708	case 1000: /* X11 mouse reporting */
3739	if (state) /* orthogonal */	3709	if (state) /* orthogonal */
3740	priv_modes &= ~PrivMode_MouseX10;	3710	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3741	break;	3711	break;
3742	#if 0
3743	case 1001:	3712	case 1002:
3744	break; /* X11 mouse highlighting */	3713	case 1003:
3745	#endif	3714	if (state)
		3715	{
		3716	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3717	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3718	vt_emask_mouse = PointerMotionMask;
		3719	}
		3720	else
		3721	vt_emask_mouse = NoEventMask;
		3722	vt_select_input ();
		3723	break;
3746	case 1010: /* scroll to bottom on TTY output inhibit */	3724	case 1010: /* scroll to bottom on TTY output inhibit */
3747	set_option (Opt_scrollTtyOutput, !state);	3725	set_option (Opt_scrollTtyOutput, !state);
3748	break;	3726	break;
3749	case 1011: /* scroll to bottom on key press */	3727	case 1011: /* scroll to bottom on key press */
3750	set_option (Opt_scrollTtyKeypress, state);	3728	set_option (Opt_scrollTtyKeypress, state);
…		…
3927	rxvt_term::process_graphics ()	3905	rxvt_term::process_graphics ()
3928	{	3906	{
3929	unicode_t ch, cmd = cmd_getc ();	3907	unicode_t ch, cmd = cmd_getc ();
3930		3908
3931	if (cmd == 'Q')	3909	if (cmd == 'Q')
		3910	{
3932	{ /* query graphics */	3911	/* query graphics */
3933	tt_printf ("\033G0\012"); /* no graphics */	3912	tt_printf ("\033G0\012"); /* no graphics */
3934	return;	3913	return;
3935	}	3914	}
3936	/* swallow other graphics sequences until terminating ':' */	3915	/* swallow other graphics sequences until terminating ':' */
3937	do	3916	do
…		…
3987	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3966	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3988		3967
3989	memcpy (v_buffer + v_buflen, data, len);	3968	memcpy (v_buffer + v_buflen, data, len);
3990	v_buflen += len;	3969	v_buflen += len;
3991		3970
3992	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3971	pty_ev.set (ev::READ \| ev::WRITE);
3993	}	3972	}
3994		3973
3995	void rxvt_term::pty_write ()	3974	void rxvt_term::pty_write ()
3996	{	3975	{
3997	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3976	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4003	if (v_buflen == 0)	3982	if (v_buflen == 0)
4004	{	3983	{
4005	free (v_buffer);	3984	free (v_buffer);
4006	v_buffer = 0;	3985	v_buffer = 0;
4007		3986
4008	pty_ev.set (EVENT_READ);	3987	pty_ev.set (ev::READ);
4009	return;	3988	return;
4010	}	3989	}
4011		3990
4012	memmove (v_buffer, v_buffer + written, v_buflen);	3991	memmove (v_buffer, v_buffer + written, v_buflen);
4013	}	3992	}
4014	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3993	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4015	pty_ev.set (EVENT_READ);	3994	pty_ev.set (ev::READ);
4016	}	3995	}
4017		3996
4018	/----------------------- end-of-file (C source) -----------------------/	3997	/----------------------- end-of-file (C source) -----------------------/
4019		3998

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC vs. Revision 1.383 by root, Fri Dec 14 06:29:28 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.383 by root, Fri Dec 14 06:29:28 2007 UTC