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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.356 by root, Mon Sep 17 08:31:54 2007 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 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) \
…		…
1035	void	983	void
1036	rxvt_term::flush ()	984	rxvt_term::flush ()
1037	{	985	{
1038	flush_ev.stop ();	986	flush_ev.stop ();
1039		987
		988	#ifdef HAVE_BG_PIXMAP
		989	if (bgPixmap.check_clearChanged ())
		990	{
		991	// scr_clear (true); This needs to be researched further!
		992	scr_touch (false);
		993	}
		994	#endif
		995
1040	if (want_refresh)	996	if (want_refresh)
1041	{	997	{
1042	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	998	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043	{	999	{
1044	int row = view_start;	1000	int row = view_start;
…		…
1085	}	1041	}
1086		1042
1087	display->flush ();	1043	display->flush ();
1088	}	1044	}
1089		1045
		1046	/* checks wether a refresh is requested and starts the refresh timer */
1090	void	1047	void
1091	rxvt_term::check_cb (check_watcher &w)	1048	rxvt_term::refresh_check ()
1092	{	1049	{
1093	make_current ();	1050	if (want_refresh && !flush_ev.is_active ())
		1051	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094		1052
1095	display->flush ();	1053	display->flush ();
1096
1097	if (want_refresh && !flush_ev.active)
1098	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099	}	1054	}
1100		1055
1101	void	1056	void
1102	rxvt_term::flush_cb (time_watcher &w)	1057	rxvt_term::flush_cb (ev::timer &w, int revents)
1103	{	1058	{
1104	make_current ();	1059	make_current ();
1105		1060
1106	refresh_count = 0;	1061	refresh_count = 0;
1107	flush ();	1062	flush ();
1108	}	1063	}
1109		1064
1110	#ifdef CURSOR_BLINK	1065	#ifdef CURSOR_BLINK
1111	void	1066	void
1112	rxvt_term::cursor_blink_cb (time_watcher &w)	1067	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113	{	1068	{
1114	hidden_cursor = !hidden_cursor;	1069	hidden_cursor = !hidden_cursor;
1115	want_refresh = 1;	1070	want_refresh = 1;
1116		1071	refresh_check ();
1117	w.start (w.at + CURSOR_BLINK_INTERVAL);
1118	}	1072	}
1119	#endif	1073	#endif
1120		1074
1121	#ifdef TEXT_BLINK	1075	#ifdef TEXT_BLINK
1122	void	1076	void
1123	rxvt_term::text_blink_cb (time_watcher &w)	1077	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124	{	1078	{
1125	if (scr_refresh_rend (RS_Blink, RS_Blink))	1079	if (scr_refresh_rend (RS_Blink, RS_Blink))
1126	{	1080	{
1127	hidden_text = !hidden_text;	1081	hidden_text = !hidden_text;
1128	want_refresh = 1;	1082	want_refresh = 1;
1129	w.start (w.at + TEXT_BLINK_INTERVAL);	1083	refresh_check ();
1130	}	1084	}
		1085	else
		1086	w.stop ();
1131	}	1087	}
1132	#endif	1088	#endif
1133		1089
1134	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1090	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135	void	1091	void
1136	rxvt_term::cont_scroll_cb (time_watcher &w)	1092	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137	{	1093	{
1138	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1094	if ((scrollbar_isUp () \|\| scrollbar_isDn ())
1139	scr_page (scrollbar_isUp() ? UP : DN, 1))	1095	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1140	{	1096	{
1141	want_refresh = 1;	1097	want_refresh = 1;
1142	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1098	refresh_check ();
1143	}	1099	}
		1100	else
		1101	w.stop ();
1144	}	1102	}
1145	#endif	1103	#endif
1146		1104
1147	#ifdef SELECTION_SCROLLING	1105	#ifdef SELECTION_SCROLLING
1148	void	1106	void
1149	rxvt_term::sel_scroll_cb (time_watcher &w)	1107	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150	{	1108	{
1151	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1109	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152	{	1110	{
1153	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1111	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154	want_refresh = 1;	1112	want_refresh = 1;
1155	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1113	refresh_check ();
1156	}	1114	}
		1115	else
		1116	w.stop ();
1157	}	1117	}
1158	#endif	1118	#endif
1159		1119
1160	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1120	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161	void	1121	void
1162	rxvt_term::slip_wheel_cb (time_watcher &w)	1122	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163	{	1123	{
1164	if (mouse_slip_wheel_speed == 0	1124	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166	: scr_page (UP, mouse_slip_wheel_speed))
1167	{	1125	{
1168	if (view_start == top_row \|\| view_start == 0)
1169	mouse_slip_wheel_speed = 0;
1170
1171	want_refresh = 1;	1126	want_refresh = 1;
1172	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 ();
1173	}	1134	}
1174	}	1135	}
1175	#endif	1136	#endif
1176		1137
1177	#if LINUX_YIELD_HACK	1138	#if LINUX_YIELD_HACK
1178	static struct event_handler	1139	static struct event_handler
1179	{	1140	{
1180	check_watcher yield_ev;	1141	ev::prepare yield_ev;
1181		1142
1182	void yield_cb (check_watcher &w)	1143	void yield_cb (ev::prepare &w, int revents)
1183	{	1144	{
1184	// this should really be sched_yield(), but the linux guys thought	1145	// this should really be sched_yield(), but the linux guys thought
1185	// that giving a process calling sched_yield () less cpu time than	1146	// that giving a process calling sched_yield () less cpu time than
1186	// 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
1187	// allowed by the sus... as is returning ENOSYS.	1148	// allowed by the sus... as is returning ENOSYS.
…		…
1238		1199
1239	return false;	1200	return false;
1240	}	1201	}
1241		1202
1242	void	1203	void
1243	rxvt_term::pty_cb (io_watcher &w, short revents)	1204	rxvt_term::pty_cb (ev::io &w, int revents)
1244	{	1205	{
1245	make_current ();	1206	make_current ();
1246		1207
1247	if (revents & EVENT_READ)	1208	if (revents & ev::READ)
1248	// loop, but don't allow a single term to monopolize us	1209	// loop, but don't allow a single term to monopolize us
1249	while (pty_fill ())	1210	while (pty_fill ())
1250	if (cmd_parse ())	1211	if (cmd_parse ())
1251	break;	1212	break;
1252		1213
1253	if (revents & EVENT_WRITE)	1214	if (revents & ev::WRITE)
1254	pty_write ();	1215	pty_write ();
1255	}	1216	}
1256		1217
1257	void	1218	void
1258	rxvt_term::pointer_unblank ()	1219	rxvt_term::pointer_unblank ()
…		…
1262		1223
1263	#ifdef POINTER_BLANK	1224	#ifdef POINTER_BLANK
1264	hidden_pointer = 0;	1225	hidden_pointer = 0;
1265		1226
1266	if (option (Opt_pointerBlank))	1227	if (option (Opt_pointerBlank))
1267	pointer_ev.start (NOW + pointerBlankDelay);	1228	pointer_ev.start (pointerBlankDelay);
1268	#endif	1229	#endif
1269	}	1230	}
1270		1231
1271	#ifdef POINTER_BLANK	1232	#ifdef POINTER_BLANK
1272	void	1233	void
…		…
1280		1241
1281	hidden_pointer = 1;	1242	hidden_pointer = 1;
1282	}	1243	}
1283		1244
1284	void	1245	void
1285	rxvt_term::pointer_cb (time_watcher &w)	1246	rxvt_term::pointer_cb (ev::timer &w, int revents)
1286	{	1247	{
1287	make_current ();	1248	make_current ();
1288		1249
1289	pointer_blank ();	1250	pointer_blank ();
1290	}	1251	}
…		…
1293	void	1254	void
1294	rxvt_term::mouse_report (XButtonEvent &ev)	1255	rxvt_term::mouse_report (XButtonEvent &ev)
1295	{	1256	{
1296	int button_number, key_state = 0;	1257	int button_number, key_state = 0;
1297	int x, y;	1258	int x, y;
		1259	int code = 32;
1298		1260
1299	x = ev.x;	1261	x = Pixel2Col (ev.x);
1300	y = ev.y;	1262	y = Pixel2Row (ev.y);
1301	pixel_position (&x, &y);	1263	if (ev.type == MotionNotify)
		1264	{
		1265	if (x == mouse_row && y == mouse_col)
		1266	return;
		1267	mouse_row = x;
		1268	mouse_col = y;
		1269	code += 32;
		1270	}
1302		1271
1303	if (MEvent.button == AnyButton)	1272	if (MEvent.button == AnyButton)
1304	button_number = 3;	1273	button_number = 3;
1305	else	1274	else
1306	{	1275	{
…		…
1352	x + 1,	1321	x + 1,
1353	y + 1);	1322	y + 1);
1354	#endif	1323	#endif
1355		1324
1356	tt_printf ("\033[M%c%c%c",	1325	tt_printf ("\033[M%c%c%c",
1357	(32 + button_number + key_state),	1326	(code + button_number + key_state),
1358	(32 + x + 1),	1327	(32 + x + 1),
1359	(32 + y + 1));	1328	(32 + y + 1));
1360	}	1329	}
1361		1330
1362	/{{{ process an X event /	1331	/{{{ process an X event /
…		…
1466	&& ev.xfocus.mode != NotifyGrab)	1435	&& ev.xfocus.mode != NotifyGrab)
1467	focus_out ();	1436	focus_out ();
1468	break;	1437	break;
1469		1438
1470	case ConfigureNotify:	1439	case ConfigureNotify:
1471	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1440	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1441	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473	szHint.width, szHint.height);*/	1442	szHint.width, szHint.height); */
1474	if (ev.xconfigure.window == parent[0])	1443	if (ev.xconfigure.window == parent[0])
1475	{	1444	{
1476	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1445	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477	;	1446	;
1478		1447
…		…
1514	break;	1483	break;
1515		1484
1516	case MapNotify:	1485	case MapNotify:
1517	mapped = 1;	1486	mapped = 1;
1518	#ifdef TEXT_BLINK	1487	#ifdef TEXT_BLINK
1519	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1488	text_blink_ev.start ();
1520	#endif	1489	#endif
1521	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1490	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522	break;	1491	break;
1523		1492
1524	case UnmapNotify:	1493	case UnmapNotify:
…		…
1532	case GraphicsExpose:	1501	case GraphicsExpose:
1533	case Expose:	1502	case Expose:
1534	if (ev.xany.window == vt)	1503	if (ev.xany.window == vt)
1535	{	1504	{
1536	do	1505	do
		1506	{
1537	scr_expose (ev.xexpose.x, ev.xexpose.y,	1507	scr_expose (ev.xexpose.x, ev.xexpose.y,
1538	ev.xexpose.width, ev.xexpose.height, False);	1508	ev.xexpose.width, ev.xexpose.height, False);
		1509	}
1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1510	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540		1511
1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1512	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542		1513
1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1514	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1515	{
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1516	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1517	ev.xexpose.width, ev.xexpose.height, False);
		1518	}
1546		1519
1547	want_refresh = 1;	1520	want_refresh = 1;
1548	}	1521	}
1549	else	1522	else
1550	{	1523	{
…		…
1566	case MotionNotify:	1539	case MotionNotify:
1567	#ifdef POINTER_BLANK	1540	#ifdef POINTER_BLANK
1568	if (hidden_pointer)	1541	if (hidden_pointer)
1569	pointer_unblank ();	1542	pointer_unblank ();
1570	#endif	1543	#endif
		1544	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1545	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1546	mouse_report (ev.xbutton);
1571	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1547	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572	break;	1548	break;
1573		1549
1574	if (ev.xany.window == vt)	1550	if (ev.xany.window == vt)
1575	{	1551	{
…		…
1609	int dist;	1585	int dist;
1610		1586
1611	/* don't clobber the current delay if we are	1587	/* don't clobber the current delay if we are
1612	* already in the middle of scrolling.	1588	* already in the middle of scrolling.
1613	*/	1589	*/
1614	if (!sel_scroll_ev.active)	1590	if (!sel_scroll_ev.is_active ())
1615	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1591	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616		1592
1617	/* save the event params so we can highlight	1593	/* save the event params so we can highlight
1618	* the selection in the pending-scroll loop	1594	* the selection in the pending-scroll loop
1619	*/	1595	*/
1620	selection_save_x = ev.xbutton.x;	1596	selection_save_x = ev.xbutton.x;
…		…
1642	else	1618	else
1643	{	1619	{
1644	/* we are within the text window, so we	1620	/* we are within the text window, so we
1645	* shouldn't be scrolling	1621	* shouldn't be scrolling
1646	*/	1622	*/
1647	if (sel_scroll_ev.active)
1648	sel_scroll_ev.stop();	1623	sel_scroll_ev.stop();
1649	}	1624	}
1650	#endif	1625	#endif
1651	#ifdef MOUSE_THRESHOLD	1626	#ifdef MOUSE_THRESHOLD
1652	}	1627	}
1653	#endif	1628	#endif
…		…
1679	{	1654	{
1680	hidden_cursor = 0;	1655	hidden_cursor = 0;
1681	want_refresh = 1;	1656	want_refresh = 1;
1682	}	1657	}
1683		1658
1684	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1659	cursor_blink_ev.again ();
1685	}	1660	}
1686	#endif	1661	#endif
1687		1662
1688	#if defined(POINTER_BLANK)	1663	#if defined(POINTER_BLANK)
1689	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1664	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1696		1671
1697	if (ev.type == KeyPress && hidden_pointer == 0)	1672	if (ev.type == KeyPress && hidden_pointer == 0)
1698	pointer_blank ();	1673	pointer_blank ();
1699	}	1674	}
1700	#endif	1675	#endif
		1676
		1677	refresh_check ();
1701	}	1678	}
1702		1679
1703	void	1680	void
1704	rxvt_term::focus_in ()	1681	rxvt_term::focus_in ()
1705	{	1682	{
…		…
1717	XSetICFocus (Input_Context);	1694	XSetICFocus (Input_Context);
1718	}	1695	}
1719	#endif	1696	#endif
1720	#if CURSOR_BLINK	1697	#if CURSOR_BLINK
1721	if (option (Opt_cursorBlink))	1698	if (option (Opt_cursorBlink))
1722	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1699	cursor_blink_ev.again ();
1723	#endif	1700	#endif
1724	#if OFF_FOCUS_FADING	1701	#if OFF_FOCUS_FADING
1725	if (rs[Rs_fade])	1702	if (rs[Rs_fade])
1726	{	1703	{
1727	pix_colors = pix_colors_focused;	1704	pix_colors = pix_colors_focused;
…		…
1765	XUnsetICFocus (Input_Context);	1742	XUnsetICFocus (Input_Context);
1766	#endif	1743	#endif
1767	#if CURSOR_BLINK	1744	#if CURSOR_BLINK
1768	if (option (Opt_cursorBlink))	1745	if (option (Opt_cursorBlink))
1769	cursor_blink_ev.stop ();	1746	cursor_blink_ev.stop ();
		1747
1770	hidden_cursor = 0;	1748	hidden_cursor = 0;
1771	#endif	1749	#endif
1772	#if OFF_FOCUS_FADING	1750	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1751	if (rs[Rs_fade])
1774	{	1752	{
…		…
1817	update_background ();	1795	update_background ();
1818	}	1796	}
1819	break;	1797	break;
1820	}	1798	}
1821	# endif	1799	# endif
		1800
		1801	refresh_check ();
1822	}	1802	}
1823	#endif	1803	#endif
1824		1804
1825	void	1805	void
1826	rxvt_term::button_press (XButtonEvent &ev)	1806	rxvt_term::button_press (XButtonEvent &ev)
…		…
1881	mouse_report (ev);	1861	mouse_report (ev);
1882	}	1862	}
1883	#else	1863	#else
1884	MEvent.button = ev.button;	1864	MEvent.button = ev.button;
1885	mouse_report (ev);	1865	mouse_report (ev);
1886	#endif /* MOUSE_REPORT_DOUBLECLICK */	1866	#endif /* MOUSE_REPORT_DOUBLECLICK */
1887		1867
1888	}	1868	}
1889	else	1869	else
1890	{	1870	{
1891	if (ev.button != MEvent.button)	1871	if (ev.button != MEvent.button)
…		…
1985	tt_printf ("\033[5~");	1965	tt_printf ("\033[5~");
1986	break;	1966	break;
1987	}	1967	}
1988	}	1968	}
1989	else	1969	else
1990	#endif /* NO_SCROLLBAR_REPORT */	1970	#endif /* NO_SCROLLBAR_REPORT */
1991		1971
1992	{	1972	{
1993	char upordown = 0;	1973	char upordown = 0;
1994		1974
1995	if (scrollBar.style == R_SB_NEXT)	1975	if (scrollBar.style == R_SB_NEXT)
1996	{	1976	{
1997	if (scrollbarnext_upButton (ev.y))	1977	if (scrollbarnext_upButton (ev.y))
1998	upordown = -1; /* up */	1978	upordown = -1; /* up */
…		…
2004	if (scrollbarrxvt_upButton (ev.y))	1984	if (scrollbarrxvt_upButton (ev.y))
2005	upordown = -1; /* up */	1985	upordown = -1; /* up */
2006	else if (scrollbarrxvt_dnButton (ev.y))	1986	else if (scrollbarrxvt_dnButton (ev.y))
2007	upordown = 1; /* down */	1987	upordown = 1; /* down */
2008	}	1988	}
		1989
2009	if (upordown)	1990	if (upordown)
2010	{	1991	{
2011	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1992	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1993	if (!cont_scroll_ev.is_active ())
2012	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1994	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013	#endif	1995	#endif
2014	if (scr_page (upordown < 0 ? UP : DN, 1))	1996	if (scr_page (upordown < 0 ? UP : DN, 1))
2015	{	1997	{
2016	if (upordown < 0)	1998	if (upordown < 0)
2017	scrollBar.setUp ();	1999	scrollBar.setUp ();
…		…
2097	scrollBar.setIdle ();	2079	scrollBar.setIdle ();
2098	scrollbar_show (0);	2080	scrollbar_show (0);
2099	}	2081	}
2100		2082
2101	#ifdef SELECTION_SCROLLING	2083	#ifdef SELECTION_SCROLLING
2102	if (sel_scroll_ev.active)
2103	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2104	#endif	2085	#endif
2105		2086
2106	if (ev.window == vt)	2087	if (ev.window == vt)
2107	{	2088	{
2108	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2132	mouse_report (ev);	2113	mouse_report (ev);
2133	}	2114	}
2134	#else /* MOUSE_REPORT_DOUBLECLICK */	2115	#else /* MOUSE_REPORT_DOUBLECLICK */
2135	MEvent.button = AnyButton;	2116	MEvent.button = AnyButton;
2136	mouse_report (ev);	2117	mouse_report (ev);
2137	#endif /* MOUSE_REPORT_DOUBLECLICK */	2118	#endif /* MOUSE_REPORT_DOUBLECLICK */
2138	return;	2119	return;
2139	}	2120	}
2140		2121
2141	/*	2122	/*
2142	* dumb hack to compensate for the failure of click-and-drag	2123	* dumb hack to compensate for the failure of click-and-drag
…		…
2180	{	2161	{
2181	mouse_slip_wheel_speed += v ? -1 : 1;	2162	mouse_slip_wheel_speed += v ? -1 : 1;
2182	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2163	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2164	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184		2165
2185	if (slip_wheel_ev.at < NOW)	2166	if (!slip_wheel_ev.is_active ())
2186	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2167	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188	slip_wheel_ev.start ();
2189	}	2168	}
2190	else	2169	else
2191	{	2170	{
2192	# endif	2171	# endif
2193	scr_page (v, i);	2172	scr_page (v, i);
…		…
2261		2240
2262	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2241	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2263	{	2242	{
2264	refresh_count = 0;	2243	refresh_count = 0;
2265		2244
2266	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2245	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2267	{	2246	{
2268	refreshnow = true;	2247	refreshnow = true;
2269	ch = NOCHAR;	2248	ch = NOCHAR;
2270	break;	2249	break;
2271	}	2250	}
…		…
2331	}	2310	}
2332		2311
2333	ch = NOCHAR;	2312	ch = NOCHAR;
2334	}	2313	}
2335	}	2314	}
		2315
		2316	refresh_check ();
2336		2317
2337	return flag;	2318	return flag;
2338	}	2319	}
2339		2320
2340	// read the next character	2321	// read the next character
…		…
2482	}	2463	}
2483	}	2464	}
2484		2465
2485	pclose_printer (fd);	2466	pclose_printer (fd);
2486	}	2467	}
2487	#endif /* PRINTPIPE */	2468	#endif /* PRINTPIPE */
2488	/}}} /	2469	/}}} /
2489		2470
2490	/* INDENT-OFF */	2471	/* INDENT-OFF */
2491	enum {	2472	enum {
2492	C1_40 = 0x40,	2473	C1_40 = 0x40,
…		…
2785	nargs = 0;	2766	nargs = 0;
2786		2767
2787	priv = 0;	2768	priv = 0;
2788	ch = cmd_getc ();	2769	ch = cmd_getc ();
2789	if (ch >= '<' && ch <= '?')	2770	if (ch >= '<' && ch <= '?')
		2771	{
2790	{ /* '<' '=' '>' '?' */	2772	/* '<' '=' '>' '?' */
2791	priv = ch;	2773	priv = ch;
2792	ch = cmd_getc ();	2774	ch = cmd_getc ();
2793	}	2775	}
2794		2776
2795	/* read any numerical arguments */	2777	/* read any numerical arguments */
…		…
2838	{	2820	{
2839	// 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,
2840	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2822	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841	//	2823	//
2842	// 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
2843	// 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
2844	// that we do not support xterm mouse reporting (should be 95 when we do).	2826	// versions.
2845	//	2827	//
2846	tt_printf ("\033[>%d;94;0c", 'U');	2828	tt_printf ("\033[>%d;95;0c", 'U');
2847	}	2829	}
2848	break;	2830	break;
2849	case '?':	2831	case '?':
2850	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2832	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2851	process_terminal_mode (ch, priv, nargs, arg);	2833	process_terminal_mode (ch, priv, nargs, arg);
…		…
3615	{ 66, PrivMode_aplKP },	3597	{ 66, PrivMode_aplKP },
3616	#ifndef NO_BACKSPACE_KEY	3598	#ifndef NO_BACKSPACE_KEY
3617	{ 67, PrivMode_BackSpace },	3599	{ 67, PrivMode_BackSpace },
3618	#endif	3600	#endif
3619	{ 1000, PrivMode_MouseX11 },	3601	{ 1000, PrivMode_MouseX11 },
3620	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3602	{ 1002, PrivMode_MouseBtnEvent },
3621	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3603	{ 1003, PrivMode_MouseAnyEvent },
3622	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3623	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3604	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624	{ 1011, PrivMode_Keypress }, // rxvt extension	3605	{ 1011, PrivMode_Keypress }, // rxvt extension
3625	// 1035 enable modifiers for alt, numlock NYI	3606	// 1035 enable modifiers for alt, numlock NYI
3626	// 1036 send ESC for meta keys NYI	3607	// 1036 send ESC for meta keys NYI
3627	// 1037 send DEL for keypad delete NYI	3608	// 1037 send DEL for keypad delete NYI
…		…
3701	scr_autowrap (state);	3682	scr_autowrap (state);
3702	break;	3683	break;
3703	/* 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 */
3704	case 9: /* X10 mouse reporting */	3685	case 9: /* X10 mouse reporting */
3705	if (state) /* orthogonal */	3686	if (state) /* orthogonal */
3706	priv_modes &= ~PrivMode_MouseX11;	3687	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3707	break;	3688	break;
3708	#ifdef scrollBar_esc	3689	#ifdef scrollBar_esc
3709	case scrollBar_esc:	3690	case scrollBar_esc:
3710	if (scrollbar_mapping (state))	3691	if (scrollbar_mapping (state))
3711	{	3692	{
…		…
3724	break;	3705	break;
3725	/* case 66: - application key pad */	3706	/* case 66: - application key pad */
3726	/* case 67: - backspace key */	3707	/* case 67: - backspace key */
3727	case 1000: /* X11 mouse reporting */	3708	case 1000: /* X11 mouse reporting */
3728	if (state) /* orthogonal */	3709	if (state) /* orthogonal */
3729	priv_modes &= ~PrivMode_MouseX10;	3710	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3730	break;	3711	break;
3731	#if 0
3732	case 1001:	3712	case 1002:
3733	break; /* X11 mouse highlighting */	3713	case 1003:
3734	#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;
3735	case 1010: /* scroll to bottom on TTY output inhibit */	3724	case 1010: /* scroll to bottom on TTY output inhibit */
3736	set_option (Opt_scrollTtyOutput, !state);	3725	set_option (Opt_scrollTtyOutput, !state);
3737	break;	3726	break;
3738	case 1011: /* scroll to bottom on key press */	3727	case 1011: /* scroll to bottom on key press */
3739	set_option (Opt_scrollTtyKeypress, state);	3728	set_option (Opt_scrollTtyKeypress, state);
…		…
3916	rxvt_term::process_graphics ()	3905	rxvt_term::process_graphics ()
3917	{	3906	{
3918	unicode_t ch, cmd = cmd_getc ();	3907	unicode_t ch, cmd = cmd_getc ();
3919		3908
3920	if (cmd == 'Q')	3909	if (cmd == 'Q')
		3910	{
3921	{ /* query graphics */	3911	/* query graphics */
3922	tt_printf ("\033G0\012"); /* no graphics */	3912	tt_printf ("\033G0\012"); /* no graphics */
3923	return;	3913	return;
3924	}	3914	}
3925	/* swallow other graphics sequences until terminating ':' */	3915	/* swallow other graphics sequences until terminating ':' */
3926	do	3916	do
…		…
3976	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3966	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3977		3967
3978	memcpy (v_buffer + v_buflen, data, len);	3968	memcpy (v_buffer + v_buflen, data, len);
3979	v_buflen += len;	3969	v_buflen += len;
3980		3970
3981	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3971	pty_ev.set (ev::READ \| ev::WRITE);
3982	}	3972	}
3983		3973
3984	void rxvt_term::pty_write ()	3974	void rxvt_term::pty_write ()
3985	{	3975	{
3986	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));
…		…
3992	if (v_buflen == 0)	3982	if (v_buflen == 0)
3993	{	3983	{
3994	free (v_buffer);	3984	free (v_buffer);
3995	v_buffer = 0;	3985	v_buffer = 0;
3996		3986
3997	pty_ev.set (EVENT_READ);	3987	pty_ev.set (ev::READ);
3998	return;	3988	return;
3999	}	3989	}
4000		3990
4001	memmove (v_buffer, v_buffer + written, v_buflen);	3991	memmove (v_buffer, v_buffer + written, v_buflen);
4002	}	3992	}
4003	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3993	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4004	pty_ev.set (EVENT_READ);	3994	pty_ev.set (ev::READ);
4005	}	3995	}
4006		3996
4007	/----------------------- end-of-file (C source) -----------------------/	3997	/----------------------- end-of-file (C source) -----------------------/
4008		3998

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.356 by root, Mon Sep 17 08:31:54 2007 UTC vs. Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.356 by root, Mon Sep 17 08:31:54 2007 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC