[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.375 by root, Tue Dec 11 21:10:46 2007 UTC

…		…
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;
…		…
1086		1042
1087	display->flush ();	1043	display->flush ();
1088	}	1044	}
1089		1045
1090	void	1046	void
1091	rxvt_term::check_cb (check_watcher &w)	1047	rxvt_term::prepare_cb (ev::prepare &w, int revents)
1092	{	1048	{
1093	make_current ();	1049	make_current ();
1094		1050
1095	display->flush ();	1051	display->flush ();
1096		1052
1097	if (want_refresh && !flush_ev.active)	1053	if (want_refresh && !ev_is_active (&flush_ev))
1098	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1054	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1099	}	1055	}
1100		1056
1101	void	1057	void
1102	rxvt_term::flush_cb (time_watcher &w)	1058	rxvt_term::flush_cb (ev::timer &w, int revents)
1103	{	1059	{
1104	make_current ();	1060	make_current ();
1105		1061
1106	refresh_count = 0;	1062	refresh_count = 0;
1107	flush ();	1063	flush ();
1108	}	1064	}
1109		1065
1110	#ifdef CURSOR_BLINK	1066	#ifdef CURSOR_BLINK
1111	void	1067	void
1112	rxvt_term::cursor_blink_cb (time_watcher &w)	1068	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113	{	1069	{
1114	hidden_cursor = !hidden_cursor;	1070	hidden_cursor = !hidden_cursor;
1115	want_refresh = 1;	1071	want_refresh = 1;
1116
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);
1130	}	1083	}
		1084	else
		1085	w.stop ();
1131	}	1086	}
1132	#endif	1087	#endif
1133		1088
1134	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1089	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135	void	1090	void
1136	rxvt_term::cont_scroll_cb (time_watcher &w)	1091	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137	{	1092	{
1138	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1093	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1139	scr_page (scrollbar_isUp() ? UP : DN, 1))	1094	scr_page (scrollbar_isUp() ? UP : DN, 1))
1140	{
1141	want_refresh = 1;	1095	want_refresh = 1;
1142	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	else
1143	}	1097	w.stop ();
1144	}	1098	}
1145	#endif	1099	#endif
1146		1100
1147	#ifdef SELECTION_SCROLLING	1101	#ifdef SELECTION_SCROLLING
1148	void	1102	void
1149	rxvt_term::sel_scroll_cb (time_watcher &w)	1103	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150	{	1104	{
1151	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1105	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152	{	1106	{
1153	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1107	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154	want_refresh = 1;	1108	want_refresh = 1;
1155	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1156	}	1109	}
		1110	else
		1111	w.stop ();
1157	}	1112	}
1158	#endif	1113	#endif
1159		1114
1160	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1115	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161	void	1116	void
1162	rxvt_term::slip_wheel_cb (time_watcher &w)	1117	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163	{	1118	{
1164	if (mouse_slip_wheel_speed == 0	1119	if (mouse_slip_wheel_speed == 0
1165	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1120	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166	: scr_page (UP, mouse_slip_wheel_speed))	1121	: scr_page (UP, mouse_slip_wheel_speed))
1167	{	1122	{
1168	if (view_start == top_row \|\| view_start == 0)	1123	if (view_start == top_row \|\| view_start == 0)
1169	mouse_slip_wheel_speed = 0;	1124	mouse_slip_wheel_speed = 0;
1170		1125
1171	want_refresh = 1;	1126	want_refresh = 1;
1172	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1173	}	1127	}
		1128	else
		1129	w.stop ();
1174	}	1130	}
1175	#endif	1131	#endif
1176		1132
1177	#if LINUX_YIELD_HACK	1133	#if LINUX_YIELD_HACK
1178	static struct event_handler	1134	static struct event_handler
1179	{	1135	{
1180	check_watcher yield_ev;	1136	ev::prepare yield_ev;
1181		1137
1182	void yield_cb (check_watcher &w)	1138	void yield_cb (ev::prepare &w, int revents)
1183	{	1139	{
1184	// this should really be sched_yield(), but the linux guys thought	1140	// this should really be sched_yield(), but the linux guys thought
1185	// that giving a process calling sched_yield () less cpu time than	1141	// 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	1142	// ones with high nice levels is a useful thing to do. It surely is is
1187	// allowed by the sus... as is returning ENOSYS.	1143	// allowed by the sus... as is returning ENOSYS.
…		…
1238		1194
1239	return false;	1195	return false;
1240	}	1196	}
1241		1197
1242	void	1198	void
1243	rxvt_term::pty_cb (io_watcher &w, short revents)	1199	rxvt_term::pty_cb (ev::io &w, int revents)
1244	{	1200	{
1245	make_current ();	1201	make_current ();
1246		1202
1247	if (revents & EVENT_READ)	1203	if (revents & ev::READ)
1248	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1249	while (pty_fill ())	1205	while (pty_fill ())
1250	if (cmd_parse ())	1206	if (cmd_parse ())
1251	break;	1207	break;
1252		1208
1253	if (revents & EVENT_WRITE)	1209	if (revents & ev::WRITE)
1254	pty_write ();	1210	pty_write ();
1255	}	1211	}
1256		1212
1257	void	1213	void
1258	rxvt_term::pointer_unblank ()	1214	rxvt_term::pointer_unblank ()
…		…
1262		1218
1263	#ifdef POINTER_BLANK	1219	#ifdef POINTER_BLANK
1264	hidden_pointer = 0;	1220	hidden_pointer = 0;
1265		1221
1266	if (option (Opt_pointerBlank))	1222	if (option (Opt_pointerBlank))
1267	pointer_ev.start (NOW + pointerBlankDelay);	1223	pointer_ev.start (pointerBlankDelay);
1268	#endif	1224	#endif
1269	}	1225	}
1270		1226
1271	#ifdef POINTER_BLANK	1227	#ifdef POINTER_BLANK
1272	void	1228	void
…		…
1280		1236
1281	hidden_pointer = 1;	1237	hidden_pointer = 1;
1282	}	1238	}
1283		1239
1284	void	1240	void
1285	rxvt_term::pointer_cb (time_watcher &w)	1241	rxvt_term::pointer_cb (ev::timer &w, int revents)
1286	{	1242	{
1287	make_current ();	1243	make_current ();
1288		1244
1289	pointer_blank ();	1245	pointer_blank ();
1290	}	1246	}
…		…
1293	void	1249	void
1294	rxvt_term::mouse_report (XButtonEvent &ev)	1250	rxvt_term::mouse_report (XButtonEvent &ev)
1295	{	1251	{
1296	int button_number, key_state = 0;	1252	int button_number, key_state = 0;
1297	int x, y;	1253	int x, y;
		1254	int code = 32;
1298		1255
1299	x = ev.x;	1256	x = Pixel2Col (ev.x);
1300	y = ev.y;	1257	y = Pixel2Row (ev.y);
1301	pixel_position (&x, &y);	1258	if (ev.type == MotionNotify)
		1259	{
		1260	if (x == mouse_row && y == mouse_col)
		1261	return;
		1262	mouse_row = x;
		1263	mouse_col = y;
		1264	code += 32;
		1265	}
1302		1266
1303	if (MEvent.button == AnyButton)	1267	if (MEvent.button == AnyButton)
1304	button_number = 3;	1268	button_number = 3;
1305	else	1269	else
1306	{	1270	{
…		…
1352	x + 1,	1316	x + 1,
1353	y + 1);	1317	y + 1);
1354	#endif	1318	#endif
1355		1319
1356	tt_printf ("\033[M%c%c%c",	1320	tt_printf ("\033[M%c%c%c",
1357	(32 + button_number + key_state),	1321	(code + button_number + key_state),
1358	(32 + x + 1),	1322	(32 + x + 1),
1359	(32 + y + 1));	1323	(32 + y + 1));
1360	}	1324	}
1361		1325
1362	/{{{ process an X event /	1326	/{{{ process an X event /
…		…
1466	&& ev.xfocus.mode != NotifyGrab)	1430	&& ev.xfocus.mode != NotifyGrab)
1467	focus_out ();	1431	focus_out ();
1468	break;	1432	break;
1469		1433
1470	case ConfigureNotify:	1434	case ConfigureNotify:
1471	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1435	/* 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,	1436	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473	szHint.width, szHint.height);*/	1437	szHint.width, szHint.height); */
1474	if (ev.xconfigure.window == parent[0])	1438	if (ev.xconfigure.window == parent[0])
1475	{	1439	{
1476	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1440	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477	;	1441	;
1478		1442
…		…
1514	break;	1478	break;
1515		1479
1516	case MapNotify:	1480	case MapNotify:
1517	mapped = 1;	1481	mapped = 1;
1518	#ifdef TEXT_BLINK	1482	#ifdef TEXT_BLINK
1519	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1483	text_blink_ev.start ();
1520	#endif	1484	#endif
1521	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1485	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522	break;	1486	break;
1523		1487
1524	case UnmapNotify:	1488	case UnmapNotify:
…		…
1532	case GraphicsExpose:	1496	case GraphicsExpose:
1533	case Expose:	1497	case Expose:
1534	if (ev.xany.window == vt)	1498	if (ev.xany.window == vt)
1535	{	1499	{
1536	do	1500	do
		1501	{
1537	scr_expose (ev.xexpose.x, ev.xexpose.y,	1502	scr_expose (ev.xexpose.x, ev.xexpose.y,
1538	ev.xexpose.width, ev.xexpose.height, False);	1503	ev.xexpose.width, ev.xexpose.height, False);
		1504	}
1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1505	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540		1506
1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1507	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542		1508
1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1509	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1510	{
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1511	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1512	ev.xexpose.width, ev.xexpose.height, False);
1546		1513	}
1547	want_refresh = 1;	1514	want_refresh = 1;
1548	}	1515	}
1549	else	1516	else
1550	{	1517	{
1551	XEvent unused_event;	1518	XEvent unused_event;
…		…
1566	case MotionNotify:	1533	case MotionNotify:
1567	#ifdef POINTER_BLANK	1534	#ifdef POINTER_BLANK
1568	if (hidden_pointer)	1535	if (hidden_pointer)
1569	pointer_unblank ();	1536	pointer_unblank ();
1570	#endif	1537	#endif
		1538	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1539	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1540	mouse_report (ev.xbutton);
1571	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1541	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572	break;	1542	break;
1573		1543
1574	if (ev.xany.window == vt)	1544	if (ev.xany.window == vt)
1575	{	1545	{
…		…
1609	int dist;	1579	int dist;
1610		1580
1611	/* don't clobber the current delay if we are	1581	/* don't clobber the current delay if we are
1612	* already in the middle of scrolling.	1582	* already in the middle of scrolling.
1613	*/	1583	*/
1614	if (!sel_scroll_ev.active)	1584	if (!ev_is_active (&sel_scroll_ev))
1615	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1585	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616		1586
1617	/* save the event params so we can highlight	1587	/* save the event params so we can highlight
1618	* the selection in the pending-scroll loop	1588	* the selection in the pending-scroll loop
1619	*/	1589	*/
1620	selection_save_x = ev.xbutton.x;	1590	selection_save_x = ev.xbutton.x;
…		…
1642	else	1612	else
1643	{	1613	{
1644	/* we are within the text window, so we	1614	/* we are within the text window, so we
1645	* shouldn't be scrolling	1615	* shouldn't be scrolling
1646	*/	1616	*/
1647	if (sel_scroll_ev.active)	1617	if (ev_is_active (&sel_scroll_ev))
1648	sel_scroll_ev.stop();	1618	sel_scroll_ev.stop();
1649	}	1619	}
1650	#endif	1620	#endif
1651	#ifdef MOUSE_THRESHOLD	1621	#ifdef MOUSE_THRESHOLD
1652	}	1622	}
…		…
1679	{	1649	{
1680	hidden_cursor = 0;	1650	hidden_cursor = 0;
1681	want_refresh = 1;	1651	want_refresh = 1;
1682	}	1652	}
1683		1653
1684	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1654	cursor_blink_ev.again ();
1685	}	1655	}
1686	#endif	1656	#endif
1687		1657
1688	#if defined(POINTER_BLANK)	1658	#if defined(POINTER_BLANK)
1689	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1659	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1717	XSetICFocus (Input_Context);	1687	XSetICFocus (Input_Context);
1718	}	1688	}
1719	#endif	1689	#endif
1720	#if CURSOR_BLINK	1690	#if CURSOR_BLINK
1721	if (option (Opt_cursorBlink))	1691	if (option (Opt_cursorBlink))
1722	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1692	cursor_blink_ev.again ();
1723	#endif	1693	#endif
1724	#if OFF_FOCUS_FADING	1694	#if OFF_FOCUS_FADING
1725	if (rs[Rs_fade])	1695	if (rs[Rs_fade])
1726	{	1696	{
1727	pix_colors = pix_colors_focused;	1697	pix_colors = pix_colors_focused;
…		…
1765	XUnsetICFocus (Input_Context);	1735	XUnsetICFocus (Input_Context);
1766	#endif	1736	#endif
1767	#if CURSOR_BLINK	1737	#if CURSOR_BLINK
1768	if (option (Opt_cursorBlink))	1738	if (option (Opt_cursorBlink))
1769	cursor_blink_ev.stop ();	1739	cursor_blink_ev.stop ();
		1740
1770	hidden_cursor = 0;	1741	hidden_cursor = 0;
1771	#endif	1742	#endif
1772	#if OFF_FOCUS_FADING	1743	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1744	if (rs[Rs_fade])
1774	{	1745	{
…		…
1881	mouse_report (ev);	1852	mouse_report (ev);
1882	}	1853	}
1883	#else	1854	#else
1884	MEvent.button = ev.button;	1855	MEvent.button = ev.button;
1885	mouse_report (ev);	1856	mouse_report (ev);
1886	#endif /* MOUSE_REPORT_DOUBLECLICK */	1857	#endif /* MOUSE_REPORT_DOUBLECLICK */
1887		1858
1888	}	1859	}
1889	else	1860	else
1890	{	1861	{
1891	if (ev.button != MEvent.button)	1862	if (ev.button != MEvent.button)
…		…
1985	tt_printf ("\033[5~");	1956	tt_printf ("\033[5~");
1986	break;	1957	break;
1987	}	1958	}
1988	}	1959	}
1989	else	1960	else
1990	#endif /* NO_SCROLLBAR_REPORT */	1961	#endif /* NO_SCROLLBAR_REPORT */
1991		1962
1992	{	1963	{
1993	char upordown = 0;	1964	char upordown = 0;
1994		1965
1995	if (scrollBar.style == R_SB_NEXT)	1966	if (scrollBar.style == R_SB_NEXT)
1996	{	1967	{
1997	if (scrollbarnext_upButton (ev.y))	1968	if (scrollbarnext_upButton (ev.y))
1998	upordown = -1; /* up */	1969	upordown = -1; /* up */
…		…
2007	upordown = 1; /* down */	1978	upordown = 1; /* down */
2008	}	1979	}
2009	if (upordown)	1980	if (upordown)
2010	{	1981	{
2011	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1982	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2012	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1983	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013	#endif	1984	#endif
2014	if (scr_page (upordown < 0 ? UP : DN, 1))	1985	if (scr_page (upordown < 0 ? UP : DN, 1))
2015	{	1986	{
2016	if (upordown < 0)	1987	if (upordown < 0)
2017	scrollBar.setUp ();	1988	scrollBar.setUp ();
…		…
2097	scrollBar.setIdle ();	2068	scrollBar.setIdle ();
2098	scrollbar_show (0);	2069	scrollbar_show (0);
2099	}	2070	}
2100		2071
2101	#ifdef SELECTION_SCROLLING	2072	#ifdef SELECTION_SCROLLING
2102	if (sel_scroll_ev.active)	2073	if (ev_is_active (&sel_scroll_ev))
2103	sel_scroll_ev.stop();	2074	sel_scroll_ev.stop();
2104	#endif	2075	#endif
2105		2076
2106	if (ev.window == vt)	2077	if (ev.window == vt)
2107	{	2078	{
…		…
2132	mouse_report (ev);	2103	mouse_report (ev);
2133	}	2104	}
2134	#else /* MOUSE_REPORT_DOUBLECLICK */	2105	#else /* MOUSE_REPORT_DOUBLECLICK */
2135	MEvent.button = AnyButton;	2106	MEvent.button = AnyButton;
2136	mouse_report (ev);	2107	mouse_report (ev);
2137	#endif /* MOUSE_REPORT_DOUBLECLICK */	2108	#endif /* MOUSE_REPORT_DOUBLECLICK */
2138	return;	2109	return;
2139	}	2110	}
2140		2111
2141	/*	2112	/*
2142	* dumb hack to compensate for the failure of click-and-drag	2113	* dumb hack to compensate for the failure of click-and-drag
…		…
2180	{	2151	{
2181	mouse_slip_wheel_speed += v ? -1 : 1;	2152	mouse_slip_wheel_speed += v ? -1 : 1;
2182	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2153	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2154	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184		2155
2185	if (slip_wheel_ev.at < NOW)	2156	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2186	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2187
2188	slip_wheel_ev.start ();
2189	}	2157	}
2190	else	2158	else
2191	{	2159	{
2192	# endif	2160	# endif
2193	scr_page (v, i);	2161	scr_page (v, i);
…		…
2261		2229
2262	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2230	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2263	{	2231	{
2264	refresh_count = 0;	2232	refresh_count = 0;
2265		2233
2266	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2234	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2267	{	2235	{
2268	refreshnow = true;	2236	refreshnow = true;
2269	ch = NOCHAR;	2237	ch = NOCHAR;
2270	break;	2238	break;
2271	}	2239	}
…		…
2482	}	2450	}
2483	}	2451	}
2484		2452
2485	pclose_printer (fd);	2453	pclose_printer (fd);
2486	}	2454	}
2487	#endif /* PRINTPIPE */	2455	#endif /* PRINTPIPE */
2488	/}}} /	2456	/}}} /
2489		2457
2490	/* INDENT-OFF */	2458	/* INDENT-OFF */
2491	enum {	2459	enum {
2492	C1_40 = 0x40,	2460	C1_40 = 0x40,
…		…
2785	nargs = 0;	2753	nargs = 0;
2786		2754
2787	priv = 0;	2755	priv = 0;
2788	ch = cmd_getc ();	2756	ch = cmd_getc ();
2789	if (ch >= '<' && ch <= '?')	2757	if (ch >= '<' && ch <= '?')
		2758	{
2790	{ /* '<' '=' '>' '?' */	2759	/* '<' '=' '>' '?' */
2791	priv = ch;	2760	priv = ch;
2792	ch = cmd_getc ();	2761	ch = cmd_getc ();
2793	}	2762	}
2794		2763
2795	/* read any numerical arguments */	2764	/* read any numerical arguments */
…		…
2838	{	2807	{
2839	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2808	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2809	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841	//	2810	//
2842	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2811	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2812	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2844	// that we do not support xterm mouse reporting (should be 95 when we do).	2813	// versions.
2845	//	2814	//
2846	tt_printf ("\033[>%d;94;0c", 'U');	2815	tt_printf ("\033[>%d;95;0c", 'U');
2847	}	2816	}
2848	break;	2817	break;
2849	case '?':	2818	case '?':
2850	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2819	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2851	process_terminal_mode (ch, priv, nargs, arg);	2820	process_terminal_mode (ch, priv, nargs, arg);
…		…
3615	{ 66, PrivMode_aplKP },	3584	{ 66, PrivMode_aplKP },
3616	#ifndef NO_BACKSPACE_KEY	3585	#ifndef NO_BACKSPACE_KEY
3617	{ 67, PrivMode_BackSpace },	3586	{ 67, PrivMode_BackSpace },
3618	#endif	3587	#endif
3619	{ 1000, PrivMode_MouseX11 },	3588	{ 1000, PrivMode_MouseX11 },
3620	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3589	{ 1002, PrivMode_MouseBtnEvent },
3621	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3590	{ 1003, PrivMode_MouseAnyEvent },
3622	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3623	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3591	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624	{ 1011, PrivMode_Keypress }, // rxvt extension	3592	{ 1011, PrivMode_Keypress }, // rxvt extension
3625	// 1035 enable modifiers for alt, numlock NYI	3593	// 1035 enable modifiers for alt, numlock NYI
3626	// 1036 send ESC for meta keys NYI	3594	// 1036 send ESC for meta keys NYI
3627	// 1037 send DEL for keypad delete NYI	3595	// 1037 send DEL for keypad delete NYI
…		…
3701	scr_autowrap (state);	3669	scr_autowrap (state);
3702	break;	3670	break;
3703	/* case 8: - auto repeat, can't do on a per window basis */	3671	/* case 8: - auto repeat, can't do on a per window basis */
3704	case 9: /* X10 mouse reporting */	3672	case 9: /* X10 mouse reporting */
3705	if (state) /* orthogonal */	3673	if (state) /* orthogonal */
3706	priv_modes &= ~PrivMode_MouseX11;	3674	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3707	break;	3675	break;
3708	#ifdef scrollBar_esc	3676	#ifdef scrollBar_esc
3709	case scrollBar_esc:	3677	case scrollBar_esc:
3710	if (scrollbar_mapping (state))	3678	if (scrollbar_mapping (state))
3711	{	3679	{
…		…
3724	break;	3692	break;
3725	/* case 66: - application key pad */	3693	/* case 66: - application key pad */
3726	/* case 67: - backspace key */	3694	/* case 67: - backspace key */
3727	case 1000: /* X11 mouse reporting */	3695	case 1000: /* X11 mouse reporting */
3728	if (state) /* orthogonal */	3696	if (state) /* orthogonal */
3729	priv_modes &= ~PrivMode_MouseX10;	3697	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3730	break;	3698	break;
3731	#if 0
3732	case 1001:	3699	case 1002:
3733	break; /* X11 mouse highlighting */	3700	case 1003:
3734	#endif	3701	if (state)
		3702	{
		3703	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3704	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3705	vt_emask_mouse = PointerMotionMask;
		3706	}
		3707	else
		3708	vt_emask_mouse = NoEventMask;
		3709	vt_select_input ();
		3710	break;
3735	case 1010: /* scroll to bottom on TTY output inhibit */	3711	case 1010: /* scroll to bottom on TTY output inhibit */
3736	set_option (Opt_scrollTtyOutput, !state);	3712	set_option (Opt_scrollTtyOutput, !state);
3737	break;	3713	break;
3738	case 1011: /* scroll to bottom on key press */	3714	case 1011: /* scroll to bottom on key press */
3739	set_option (Opt_scrollTtyKeypress, state);	3715	set_option (Opt_scrollTtyKeypress, state);
…		…
3916	rxvt_term::process_graphics ()	3892	rxvt_term::process_graphics ()
3917	{	3893	{
3918	unicode_t ch, cmd = cmd_getc ();	3894	unicode_t ch, cmd = cmd_getc ();
3919		3895
3920	if (cmd == 'Q')	3896	if (cmd == 'Q')
		3897	{
3921	{ /* query graphics */	3898	/* query graphics */
3922	tt_printf ("\033G0\012"); /* no graphics */	3899	tt_printf ("\033G0\012"); /* no graphics */
3923	return;	3900	return;
3924	}	3901	}
3925	/* swallow other graphics sequences until terminating ':' */	3902	/* swallow other graphics sequences until terminating ':' */
3926	do	3903	do
…		…
3976	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3953	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3977		3954
3978	memcpy (v_buffer + v_buflen, data, len);	3955	memcpy (v_buffer + v_buflen, data, len);
3979	v_buflen += len;	3956	v_buflen += len;
3980		3957
3981	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3958	pty_ev.set (ev::READ \| ev::WRITE);
3982	}	3959	}
3983		3960
3984	void rxvt_term::pty_write ()	3961	void rxvt_term::pty_write ()
3985	{	3962	{
3986	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3963	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
3992	if (v_buflen == 0)	3969	if (v_buflen == 0)
3993	{	3970	{
3994	free (v_buffer);	3971	free (v_buffer);
3995	v_buffer = 0;	3972	v_buffer = 0;
3996		3973
3997	pty_ev.set (EVENT_READ);	3974	pty_ev.set (ev::READ);
3998	return;	3975	return;
3999	}	3976	}
4000		3977
4001	memmove (v_buffer, v_buffer + written, v_buflen);	3978	memmove (v_buffer, v_buffer + written, v_buflen);
4002	}	3979	}
4003	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3980	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4004	pty_ev.set (EVENT_READ);	3981	pty_ev.set (ev::READ);
4005	}	3982	}
4006		3983
4007	/----------------------- end-of-file (C source) -----------------------/	3984	/----------------------- end-of-file (C source) -----------------------/
4008		3985

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.375 by root, Tue Dec 11 21:10:46 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.375 by root, Tue Dec 11 21:10:46 2007 UTC