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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.353 by sasha, Wed Sep 12 19:51:41 2007 UTC vs.
Revision 1.381 by root, Fri Dec 14 05:25:23 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 ();
1094
1095	display->flush ();
1096
1097	if (want_refresh && !flush_ev.active)	1050	if (want_refresh && !flush_ev.is_active ())
1098	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1051	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1099	}	1052	}
1100		1053
1101	void	1054	void
1102	rxvt_term::flush_cb (time_watcher &w)	1055	rxvt_term::flush_cb (ev::timer &w, int revents)
1103	{	1056	{
1104	make_current ();	1057	make_current ();
1105		1058
1106	refresh_count = 0;	1059	refresh_count = 0;
1107	flush ();	1060	flush ();
1108	}	1061	}
1109		1062
1110	#ifdef CURSOR_BLINK	1063	#ifdef CURSOR_BLINK
1111	void	1064	void
1112	rxvt_term::cursor_blink_cb (time_watcher &w)	1065	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113	{	1066	{
1114	hidden_cursor = !hidden_cursor;	1067	hidden_cursor = !hidden_cursor;
1115	want_refresh = 1;	1068	want_refresh = 1;
1116		1069	refresh_check ();
1117	w.start (w.at + CURSOR_BLINK_INTERVAL);
1118	}	1070	}
1119	#endif	1071	#endif
1120		1072
1121	#ifdef TEXT_BLINK	1073	#ifdef TEXT_BLINK
1122	void	1074	void
1123	rxvt_term::text_blink_cb (time_watcher &w)	1075	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124	{	1076	{
1125	if (scr_refresh_rend (RS_Blink, RS_Blink))	1077	if (scr_refresh_rend (RS_Blink, RS_Blink))
1126	{	1078	{
1127	hidden_text = !hidden_text;	1079	hidden_text = !hidden_text;
1128	want_refresh = 1;	1080	want_refresh = 1;
1129	w.start (w.at + TEXT_BLINK_INTERVAL);	1081	refresh_check ();
1130	}	1082	}
		1083	else
		1084	w.stop ();
1131	}	1085	}
1132	#endif	1086	#endif
1133		1087
1134	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1088	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135	void	1089	void
1136	rxvt_term::cont_scroll_cb (time_watcher &w)	1090	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137	{	1091	{
1138	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1092	if ((scrollbar_isUp () \|\| scrollbar_isDn ())
1139	scr_page (scrollbar_isUp() ? UP : DN, 1))	1093	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1140	{	1094	{
1141	want_refresh = 1;	1095	want_refresh = 1;
1142	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	refresh_check ();
1143	}	1097	}
		1098	else
		1099	w.stop ();
1144	}	1100	}
1145	#endif	1101	#endif
1146		1102
1147	#ifdef SELECTION_SCROLLING	1103	#ifdef SELECTION_SCROLLING
1148	void	1104	void
1149	rxvt_term::sel_scroll_cb (time_watcher &w)	1105	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150	{	1106	{
1151	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1107	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152	{	1108	{
1153	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1109	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154	want_refresh = 1;	1110	want_refresh = 1;
1155	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1111	refresh_check ();
1156	}	1112	}
		1113	else
		1114	w.stop ();
1157	}	1115	}
1158	#endif	1116	#endif
1159		1117
1160	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1118	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161	void	1119	void
1162	rxvt_term::slip_wheel_cb (time_watcher &w)	1120	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163	{	1121	{
1164	if (mouse_slip_wheel_speed == 0	1122	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	{	1123	{
1168	if (view_start == top_row \|\| view_start == 0)
1169	mouse_slip_wheel_speed = 0;
1170
1171	want_refresh = 1;	1124	want_refresh = 1;
1172	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1125	refresh_check ();
		1126	}
		1127
		1128	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1129	{
		1130	mouse_slip_wheel_speed = 0;
		1131	w.stop ();
1173	}	1132	}
1174	}	1133	}
1175	#endif	1134	#endif
1176		1135
1177	#if LINUX_YIELD_HACK	1136	#if LINUX_YIELD_HACK
1178	static struct event_handler	1137	static struct event_handler
1179	{	1138	{
1180	check_watcher yield_ev;	1139	ev::prepare yield_ev;
1181		1140
1182	void yield_cb (check_watcher &w)	1141	void yield_cb (ev::prepare &w, int revents)
1183	{	1142	{
1184	// this should really be sched_yield(), but the linux guys thought	1143	// this should really be sched_yield(), but the linux guys thought
1185	// that giving a process calling sched_yield () less cpu time than	1144	// 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	1145	// ones with high nice levels is a useful thing to do. It surely is is
1187	// allowed by the sus... as is returning ENOSYS.	1146	// allowed by the sus... as is returning ENOSYS.
…		…
1238		1197
1239	return false;	1198	return false;
1240	}	1199	}
1241		1200
1242	void	1201	void
1243	rxvt_term::pty_cb (io_watcher &w, short revents)	1202	rxvt_term::pty_cb (ev::io &w, int revents)
1244	{	1203	{
1245	make_current ();	1204	make_current ();
1246		1205
1247	if (revents & EVENT_READ)	1206	if (revents & ev::READ)
1248	// loop, but don't allow a single term to monopolize us	1207	// loop, but don't allow a single term to monopolize us
1249	while (pty_fill ())	1208	while (pty_fill ())
1250	if (cmd_parse ())	1209	if (cmd_parse ())
1251	break;	1210	break;
1252		1211
1253	if (revents & EVENT_WRITE)	1212	if (revents & ev::WRITE)
1254	pty_write ();	1213	pty_write ();
1255	}	1214	}
1256		1215
1257	void	1216	void
1258	rxvt_term::pointer_unblank ()	1217	rxvt_term::pointer_unblank ()
…		…
1262		1221
1263	#ifdef POINTER_BLANK	1222	#ifdef POINTER_BLANK
1264	hidden_pointer = 0;	1223	hidden_pointer = 0;
1265		1224
1266	if (option (Opt_pointerBlank))	1225	if (option (Opt_pointerBlank))
1267	pointer_ev.start (NOW + pointerBlankDelay);	1226	pointer_ev.start (pointerBlankDelay);
1268	#endif	1227	#endif
1269	}	1228	}
1270		1229
1271	#ifdef POINTER_BLANK	1230	#ifdef POINTER_BLANK
1272	void	1231	void
…		…
1280		1239
1281	hidden_pointer = 1;	1240	hidden_pointer = 1;
1282	}	1241	}
1283		1242
1284	void	1243	void
1285	rxvt_term::pointer_cb (time_watcher &w)	1244	rxvt_term::pointer_cb (ev::timer &w, int revents)
1286	{	1245	{
1287	make_current ();	1246	make_current ();
1288		1247
1289	pointer_blank ();	1248	pointer_blank ();
1290	}	1249	}
…		…
1293	void	1252	void
1294	rxvt_term::mouse_report (XButtonEvent &ev)	1253	rxvt_term::mouse_report (XButtonEvent &ev)
1295	{	1254	{
1296	int button_number, key_state = 0;	1255	int button_number, key_state = 0;
1297	int x, y;	1256	int x, y;
		1257	int code = 32;
1298		1258
1299	x = ev.x;	1259	x = Pixel2Col (ev.x);
1300	y = ev.y;	1260	y = Pixel2Row (ev.y);
1301	pixel_position (&x, &y);	1261	if (ev.type == MotionNotify)
		1262	{
		1263	if (x == mouse_row && y == mouse_col)
		1264	return;
		1265	mouse_row = x;
		1266	mouse_col = y;
		1267	code += 32;
		1268	}
1302		1269
1303	if (MEvent.button == AnyButton)	1270	if (MEvent.button == AnyButton)
1304	button_number = 3;	1271	button_number = 3;
1305	else	1272	else
1306	{	1273	{
…		…
1352	x + 1,	1319	x + 1,
1353	y + 1);	1320	y + 1);
1354	#endif	1321	#endif
1355		1322
1356	tt_printf ("\033[M%c%c%c",	1323	tt_printf ("\033[M%c%c%c",
1357	(32 + button_number + key_state),	1324	(code + button_number + key_state),
1358	(32 + x + 1),	1325	(32 + x + 1),
1359	(32 + y + 1));	1326	(32 + y + 1));
1360	}	1327	}
1361		1328
1362	/{{{ process an X event /	1329	/{{{ process an X event /
…		…
1466	&& ev.xfocus.mode != NotifyGrab)	1433	&& ev.xfocus.mode != NotifyGrab)
1467	focus_out ();	1434	focus_out ();
1468	break;	1435	break;
1469		1436
1470	case ConfigureNotify:	1437	case ConfigureNotify:
1471	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1438	/* 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,	1439	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473	szHint.width, szHint.height);*/	1440	szHint.width, szHint.height); */
1474	if (ev.xconfigure.window == parent[0])	1441	if (ev.xconfigure.window == parent[0])
1475	{	1442	{
1476	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1443	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477	;	1444	;
1478		1445
…		…
1514	break;	1481	break;
1515		1482
1516	case MapNotify:	1483	case MapNotify:
1517	mapped = 1;	1484	mapped = 1;
1518	#ifdef TEXT_BLINK	1485	#ifdef TEXT_BLINK
1519	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1486	text_blink_ev.start ();
1520	#endif	1487	#endif
1521	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1488	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522	break;	1489	break;
1523		1490
1524	case UnmapNotify:	1491	case UnmapNotify:
…		…
1532	case GraphicsExpose:	1499	case GraphicsExpose:
1533	case Expose:	1500	case Expose:
1534	if (ev.xany.window == vt)	1501	if (ev.xany.window == vt)
1535	{	1502	{
1536	do	1503	do
		1504	{
1537	scr_expose (ev.xexpose.x, ev.xexpose.y,	1505	scr_expose (ev.xexpose.x, ev.xexpose.y,
1538	ev.xexpose.width, ev.xexpose.height, False);	1506	ev.xexpose.width, ev.xexpose.height, False);
		1507	}
1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1508	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540		1509
1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1510	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542		1511
1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1512	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1513	{
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1514	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1515	ev.xexpose.width, ev.xexpose.height, False);
		1516	}
1546		1517
1547	want_refresh = 1;	1518	want_refresh = 1;
1548	}	1519	}
1549	else	1520	else
1550	{	1521	{
…		…
1566	case MotionNotify:	1537	case MotionNotify:
1567	#ifdef POINTER_BLANK	1538	#ifdef POINTER_BLANK
1568	if (hidden_pointer)	1539	if (hidden_pointer)
1569	pointer_unblank ();	1540	pointer_unblank ();
1570	#endif	1541	#endif
		1542	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1543	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1544	mouse_report (ev.xbutton);
1571	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1545	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572	break;	1546	break;
1573		1547
1574	if (ev.xany.window == vt)	1548	if (ev.xany.window == vt)
1575	{	1549	{
…		…
1609	int dist;	1583	int dist;
1610		1584
1611	/* don't clobber the current delay if we are	1585	/* don't clobber the current delay if we are
1612	* already in the middle of scrolling.	1586	* already in the middle of scrolling.
1613	*/	1587	*/
1614	if (!sel_scroll_ev.active)	1588	if (!sel_scroll_ev.is_active ())
1615	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1589	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616		1590
1617	/* save the event params so we can highlight	1591	/* save the event params so we can highlight
1618	* the selection in the pending-scroll loop	1592	* the selection in the pending-scroll loop
1619	*/	1593	*/
1620	selection_save_x = ev.xbutton.x;	1594	selection_save_x = ev.xbutton.x;
…		…
1642	else	1616	else
1643	{	1617	{
1644	/* we are within the text window, so we	1618	/* we are within the text window, so we
1645	* shouldn't be scrolling	1619	* shouldn't be scrolling
1646	*/	1620	*/
1647	if (sel_scroll_ev.active)
1648	sel_scroll_ev.stop();	1621	sel_scroll_ev.stop();
1649	}	1622	}
1650	#endif	1623	#endif
1651	#ifdef MOUSE_THRESHOLD	1624	#ifdef MOUSE_THRESHOLD
1652	}	1625	}
1653	#endif	1626	#endif
…		…
1679	{	1652	{
1680	hidden_cursor = 0;	1653	hidden_cursor = 0;
1681	want_refresh = 1;	1654	want_refresh = 1;
1682	}	1655	}
1683		1656
1684	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1657	cursor_blink_ev.again ();
1685	}	1658	}
1686	#endif	1659	#endif
1687		1660
1688	#if defined(POINTER_BLANK)	1661	#if defined(POINTER_BLANK)
1689	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1662	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1696		1669
1697	if (ev.type == KeyPress && hidden_pointer == 0)	1670	if (ev.type == KeyPress && hidden_pointer == 0)
1698	pointer_blank ();	1671	pointer_blank ();
1699	}	1672	}
1700	#endif	1673	#endif
		1674
		1675	refresh_check ();
1701	}	1676	}
1702		1677
1703	void	1678	void
1704	rxvt_term::focus_in ()	1679	rxvt_term::focus_in ()
1705	{	1680	{
…		…
1717	XSetICFocus (Input_Context);	1692	XSetICFocus (Input_Context);
1718	}	1693	}
1719	#endif	1694	#endif
1720	#if CURSOR_BLINK	1695	#if CURSOR_BLINK
1721	if (option (Opt_cursorBlink))	1696	if (option (Opt_cursorBlink))
1722	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1697	cursor_blink_ev.again ();
1723	#endif	1698	#endif
1724	#if OFF_FOCUS_FADING	1699	#if OFF_FOCUS_FADING
1725	if (rs[Rs_fade])	1700	if (rs[Rs_fade])
1726	{	1701	{
1727	pix_colors = pix_colors_focused;	1702	pix_colors = pix_colors_focused;
…		…
1729	}	1704	}
1730	#endif	1705	#endif
1731	#if ENABLE_FRILLS	1706	#if ENABLE_FRILLS
1732	if (option (Opt_urgentOnBell))	1707	if (option (Opt_urgentOnBell))
1733	{	1708	{
1734	XWMHints *h;
1735
1736	h = XGetWMHints(dpy, parent[0]);	1709	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737	if (h != NULL)
1738	{	1710	{
1739	h->flags &= ~XUrgencyHint;	1711	h->flags &= ~XUrgencyHint;
1740	XSetWMHints(dpy, parent[0], h);	1712	XSetWMHints (dpy, parent[0], h);
1741	}	1713	}
1742	}	1714	}
1743	#endif	1715	#endif
1744	}	1716	}
1745	}	1717	}
…		…
1768	XUnsetICFocus (Input_Context);	1740	XUnsetICFocus (Input_Context);
1769	#endif	1741	#endif
1770	#if CURSOR_BLINK	1742	#if CURSOR_BLINK
1771	if (option (Opt_cursorBlink))	1743	if (option (Opt_cursorBlink))
1772	cursor_blink_ev.stop ();	1744	cursor_blink_ev.stop ();
		1745
1773	hidden_cursor = 0;	1746	hidden_cursor = 0;
1774	#endif	1747	#endif
1775	#if OFF_FOCUS_FADING	1748	#if OFF_FOCUS_FADING
1776	if (rs[Rs_fade])	1749	if (rs[Rs_fade])
1777	{	1750	{
…		…
1820	update_background ();	1793	update_background ();
1821	}	1794	}
1822	break;	1795	break;
1823	}	1796	}
1824	# endif	1797	# endif
		1798
		1799	refresh_check ();
1825	}	1800	}
1826	#endif	1801	#endif
1827		1802
1828	void	1803	void
1829	rxvt_term::button_press (XButtonEvent &ev)	1804	rxvt_term::button_press (XButtonEvent &ev)
…		…
1884	mouse_report (ev);	1859	mouse_report (ev);
1885	}	1860	}
1886	#else	1861	#else
1887	MEvent.button = ev.button;	1862	MEvent.button = ev.button;
1888	mouse_report (ev);	1863	mouse_report (ev);
1889	#endif /* MOUSE_REPORT_DOUBLECLICK */	1864	#endif /* MOUSE_REPORT_DOUBLECLICK */
1890		1865
1891	}	1866	}
1892	else	1867	else
1893	{	1868	{
1894	if (ev.button != MEvent.button)	1869	if (ev.button != MEvent.button)
…		…
1988	tt_printf ("\033[5~");	1963	tt_printf ("\033[5~");
1989	break;	1964	break;
1990	}	1965	}
1991	}	1966	}
1992	else	1967	else
1993	#endif /* NO_SCROLLBAR_REPORT */	1968	#endif /* NO_SCROLLBAR_REPORT */
1994		1969
1995	{	1970	{
1996	char upordown = 0;	1971	char upordown = 0;
1997		1972
1998	if (scrollBar.style == R_SB_NEXT)	1973	if (scrollBar.style == R_SB_NEXT)
1999	{	1974	{
2000	if (scrollbarnext_upButton (ev.y))	1975	if (scrollbarnext_upButton (ev.y))
2001	upordown = -1; /* up */	1976	upordown = -1; /* up */
…		…
2007	if (scrollbarrxvt_upButton (ev.y))	1982	if (scrollbarrxvt_upButton (ev.y))
2008	upordown = -1; /* up */	1983	upordown = -1; /* up */
2009	else if (scrollbarrxvt_dnButton (ev.y))	1984	else if (scrollbarrxvt_dnButton (ev.y))
2010	upordown = 1; /* down */	1985	upordown = 1; /* down */
2011	}	1986	}
		1987
2012	if (upordown)	1988	if (upordown)
2013	{	1989	{
2014	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1990	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1991	if (!cont_scroll_ev.is_active ())
2015	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1992	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016	#endif	1993	#endif
2017	if (scr_page (upordown < 0 ? UP : DN, 1))	1994	if (scr_page (upordown < 0 ? UP : DN, 1))
2018	{	1995	{
2019	if (upordown < 0)	1996	if (upordown < 0)
2020	scrollBar.setUp ();	1997	scrollBar.setUp ();
…		…
2100	scrollBar.setIdle ();	2077	scrollBar.setIdle ();
2101	scrollbar_show (0);	2078	scrollbar_show (0);
2102	}	2079	}
2103		2080
2104	#ifdef SELECTION_SCROLLING	2081	#ifdef SELECTION_SCROLLING
2105	if (sel_scroll_ev.active)
2106	sel_scroll_ev.stop();	2082	sel_scroll_ev.stop();
2107	#endif	2083	#endif
2108		2084
2109	if (ev.window == vt)	2085	if (ev.window == vt)
2110	{	2086	{
2111	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2087	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2135	mouse_report (ev);	2111	mouse_report (ev);
2136	}	2112	}
2137	#else /* MOUSE_REPORT_DOUBLECLICK */	2113	#else /* MOUSE_REPORT_DOUBLECLICK */
2138	MEvent.button = AnyButton;	2114	MEvent.button = AnyButton;
2139	mouse_report (ev);	2115	mouse_report (ev);
2140	#endif /* MOUSE_REPORT_DOUBLECLICK */	2116	#endif /* MOUSE_REPORT_DOUBLECLICK */
2141	return;	2117	return;
2142	}	2118	}
2143		2119
2144	/*	2120	/*
2145	* dumb hack to compensate for the failure of click-and-drag	2121	* dumb hack to compensate for the failure of click-and-drag
…		…
2183	{	2159	{
2184	mouse_slip_wheel_speed += v ? -1 : 1;	2160	mouse_slip_wheel_speed += v ? -1 : 1;
2185	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2161	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2162	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187		2163
2188	if (slip_wheel_ev.at < NOW)	2164	if (!slip_wheel_ev.is_active ())
2189	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2165	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2190
2191	slip_wheel_ev.start ();
2192	}	2166	}
2193	else	2167	else
2194	{	2168	{
2195	# endif	2169	# endif
2196	scr_page (v, i);	2170	scr_page (v, i);
…		…
2264		2238
2265	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2239	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2266	{	2240	{
2267	refresh_count = 0;	2241	refresh_count = 0;
2268		2242
2269	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2243	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2270	{	2244	{
2271	refreshnow = true;	2245	refreshnow = true;
2272	ch = NOCHAR;	2246	ch = NOCHAR;
2273	break;	2247	break;
2274	}	2248	}
…		…
2334	}	2308	}
2335		2309
2336	ch = NOCHAR;	2310	ch = NOCHAR;
2337	}	2311	}
2338	}	2312	}
		2313
		2314	refresh_check ();
2339		2315
2340	return flag;	2316	return flag;
2341	}	2317	}
2342		2318
2343	// read the next character	2319	// read the next character
…		…
2485	}	2461	}
2486	}	2462	}
2487		2463
2488	pclose_printer (fd);	2464	pclose_printer (fd);
2489	}	2465	}
2490	#endif /* PRINTPIPE */	2466	#endif /* PRINTPIPE */
2491	/}}} /	2467	/}}} /
2492		2468
2493	/* INDENT-OFF */	2469	/* INDENT-OFF */
2494	enum {	2470	enum {
2495	C1_40 = 0x40,	2471	C1_40 = 0x40,
…		…
2788	nargs = 0;	2764	nargs = 0;
2789		2765
2790	priv = 0;	2766	priv = 0;
2791	ch = cmd_getc ();	2767	ch = cmd_getc ();
2792	if (ch >= '<' && ch <= '?')	2768	if (ch >= '<' && ch <= '?')
		2769	{
2793	{ /* '<' '=' '>' '?' */	2770	/* '<' '=' '>' '?' */
2794	priv = ch;	2771	priv = ch;
2795	ch = cmd_getc ();	2772	ch = cmd_getc ();
2796	}	2773	}
2797		2774
2798	/* read any numerical arguments */	2775	/* read any numerical arguments */
…		…
2841	{	2818	{
2842	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2819	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2820	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844	//	2821	//
2845	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2822	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2823	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847	// that we do not support xterm mouse reporting (should be 95 when we do).	2824	// versions.
2848	//	2825	//
2849	tt_printf ("\033[>%d;94;0c", 'U');	2826	tt_printf ("\033[>%d;95;0c", 'U');
2850	}	2827	}
2851	break;	2828	break;
2852	case '?':	2829	case '?':
2853	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2830	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2854	process_terminal_mode (ch, priv, nargs, arg);	2831	process_terminal_mode (ch, priv, nargs, arg);
…		…
3421	}	3398	}
3422		3399
3423	break;	3400	break;
3424	#endif	3401	#endif
3425		3402
3426	#if XPM_BACKGROUND	3403	#if BG_IMAGE_FROM_FILE
3427	case Rxvt_Pixmap:	3404	case Rxvt_Pixmap:
3428	if (!strcmp (str, "?"))	3405	if (!strcmp (str, "?"))
3429	{	3406	{
3430	char str[256];	3407	char str[256];
3431		3408
…		…
3618	{ 66, PrivMode_aplKP },	3595	{ 66, PrivMode_aplKP },
3619	#ifndef NO_BACKSPACE_KEY	3596	#ifndef NO_BACKSPACE_KEY
3620	{ 67, PrivMode_BackSpace },	3597	{ 67, PrivMode_BackSpace },
3621	#endif	3598	#endif
3622	{ 1000, PrivMode_MouseX11 },	3599	{ 1000, PrivMode_MouseX11 },
3623	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3600	{ 1002, PrivMode_MouseBtnEvent },
3624	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3601	{ 1003, PrivMode_MouseAnyEvent },
3625	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3602	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627	{ 1011, PrivMode_Keypress }, // rxvt extension	3603	{ 1011, PrivMode_Keypress }, // rxvt extension
3628	// 1035 enable modifiers for alt, numlock NYI	3604	// 1035 enable modifiers for alt, numlock NYI
3629	// 1036 send ESC for meta keys NYI	3605	// 1036 send ESC for meta keys NYI
3630	// 1037 send DEL for keypad delete NYI	3606	// 1037 send DEL for keypad delete NYI
…		…
3704	scr_autowrap (state);	3680	scr_autowrap (state);
3705	break;	3681	break;
3706	/* case 8: - auto repeat, can't do on a per window basis */	3682	/* case 8: - auto repeat, can't do on a per window basis */
3707	case 9: /* X10 mouse reporting */	3683	case 9: /* X10 mouse reporting */
3708	if (state) /* orthogonal */	3684	if (state) /* orthogonal */
3709	priv_modes &= ~PrivMode_MouseX11;	3685	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3710	break;	3686	break;
3711	#ifdef scrollBar_esc	3687	#ifdef scrollBar_esc
3712	case scrollBar_esc:	3688	case scrollBar_esc:
3713	if (scrollbar_mapping (state))	3689	if (scrollbar_mapping (state))
3714	{	3690	{
…		…
3727	break;	3703	break;
3728	/* case 66: - application key pad */	3704	/* case 66: - application key pad */
3729	/* case 67: - backspace key */	3705	/* case 67: - backspace key */
3730	case 1000: /* X11 mouse reporting */	3706	case 1000: /* X11 mouse reporting */
3731	if (state) /* orthogonal */	3707	if (state) /* orthogonal */
3732	priv_modes &= ~PrivMode_MouseX10;	3708	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3733	break;	3709	break;
3734	#if 0
3735	case 1001:	3710	case 1002:
3736	break; /* X11 mouse highlighting */	3711	case 1003:
3737	#endif	3712	if (state)
		3713	{
		3714	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3715	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3716	vt_emask_mouse = PointerMotionMask;
		3717	}
		3718	else
		3719	vt_emask_mouse = NoEventMask;
		3720	vt_select_input ();
		3721	break;
3738	case 1010: /* scroll to bottom on TTY output inhibit */	3722	case 1010: /* scroll to bottom on TTY output inhibit */
3739	set_option (Opt_scrollTtyOutput, !state);	3723	set_option (Opt_scrollTtyOutput, !state);
3740	break;	3724	break;
3741	case 1011: /* scroll to bottom on key press */	3725	case 1011: /* scroll to bottom on key press */
3742	set_option (Opt_scrollTtyKeypress, state);	3726	set_option (Opt_scrollTtyKeypress, state);
…		…
3919	rxvt_term::process_graphics ()	3903	rxvt_term::process_graphics ()
3920	{	3904	{
3921	unicode_t ch, cmd = cmd_getc ();	3905	unicode_t ch, cmd = cmd_getc ();
3922		3906
3923	if (cmd == 'Q')	3907	if (cmd == 'Q')
		3908	{
3924	{ /* query graphics */	3909	/* query graphics */
3925	tt_printf ("\033G0\012"); /* no graphics */	3910	tt_printf ("\033G0\012"); /* no graphics */
3926	return;	3911	return;
3927	}	3912	}
3928	/* swallow other graphics sequences until terminating ':' */	3913	/* swallow other graphics sequences until terminating ':' */
3929	do	3914	do
…		…
3979	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3964	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3980		3965
3981	memcpy (v_buffer + v_buflen, data, len);	3966	memcpy (v_buffer + v_buflen, data, len);
3982	v_buflen += len;	3967	v_buflen += len;
3983		3968
3984	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3969	pty_ev.set (ev::READ \| ev::WRITE);
3985	}	3970	}
3986		3971
3987	void rxvt_term::pty_write ()	3972	void rxvt_term::pty_write ()
3988	{	3973	{
3989	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3974	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
3994		3979
3995	if (v_buflen == 0)	3980	if (v_buflen == 0)
3996	{	3981	{
3997	free (v_buffer);	3982	free (v_buffer);
3998	v_buffer = 0;	3983	v_buffer = 0;
3999	v_buflen = 0;
4000		3984
4001	pty_ev.set (EVENT_READ);	3985	pty_ev.set (ev::READ);
4002	return;	3986	return;
4003	}	3987	}
4004		3988
4005	memmove (v_buffer, v_buffer + written, v_buflen);	3989	memmove (v_buffer, v_buffer + written, v_buflen);
4006	}	3990	}
4007	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3991	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4008	pty_ev.set (EVENT_READ);	3992	pty_ev.set (ev::READ);
4009	}	3993	}
4010		3994
4011	/----------------------- end-of-file (C source) -----------------------/	3995	/----------------------- end-of-file (C source) -----------------------/
4012		3996

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.353 by sasha, Wed Sep 12 19:51:41 2007 UTC vs. Revision 1.381 by root, Fri Dec 14 05:25:23 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.353 by sasha, Wed Sep 12 19:51:41 2007 UTC vs.
Revision 1.381 by root, Fri Dec 14 05:25:23 2007 UTC