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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.352 by ayin, Sun Sep 9 10:35:00 2007 UTC vs.
Revision 1.376 by root, Fri Dec 14 02:08:18 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
1040	#ifdef ENABLE_TRANSPARENCY	988	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	989	if (bgPixmap.check_clearChanged ())
1042	{	990	{
1043	want_full_refresh = 0;	991	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	992	scr_touch (false);
1046	}	993	}
1047	#endif	994	#endif
1048		995
1049	if (want_refresh)	996	if (want_refresh)
…		…
1095		1042
1096	display->flush ();	1043	display->flush ();
1097	}	1044	}
1098		1045
1099	void	1046	void
1100	rxvt_term::check_cb (check_watcher &w)	1047	rxvt_term::prepare_cb (ev::prepare &w, int revents)
1101	{	1048	{
1102	make_current ();	1049	make_current ();
1103		1050
1104	display->flush ();	1051	display->flush ();
1105		1052
1106	if (want_refresh && !flush_ev.active)	1053	if (want_refresh && !flush_ev.is_active ())
1107	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1054	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1108	}	1055	}
1109		1056
1110	void	1057	void
1111	rxvt_term::flush_cb (time_watcher &w)	1058	rxvt_term::flush_cb (ev::timer &w, int revents)
1112	{	1059	{
1113	make_current ();	1060	make_current ();
1114		1061
1115	refresh_count = 0;	1062	refresh_count = 0;
1116	flush ();	1063	flush ();
1117	}	1064	}
1118		1065
1119	#ifdef CURSOR_BLINK	1066	#ifdef CURSOR_BLINK
1120	void	1067	void
1121	rxvt_term::cursor_blink_cb (time_watcher &w)	1068	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122	{	1069	{
1123	hidden_cursor = !hidden_cursor;	1070	hidden_cursor = !hidden_cursor;
1124	want_refresh = 1;	1071	want_refresh = 1;
1125
1126	w.start (w.at + CURSOR_BLINK_INTERVAL);
1127	}	1072	}
1128	#endif	1073	#endif
1129		1074
1130	#ifdef TEXT_BLINK	1075	#ifdef TEXT_BLINK
1131	void	1076	void
1132	rxvt_term::text_blink_cb (time_watcher &w)	1077	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133	{	1078	{
1134	if (scr_refresh_rend (RS_Blink, RS_Blink))	1079	if (scr_refresh_rend (RS_Blink, RS_Blink))
1135	{	1080	{
1136	hidden_text = !hidden_text;	1081	hidden_text = !hidden_text;
1137	want_refresh = 1;	1082	want_refresh = 1;
1138	w.start (w.at + TEXT_BLINK_INTERVAL);
1139	}	1083	}
		1084	else
		1085	w.stop ();
1140	}	1086	}
1141	#endif	1087	#endif
1142		1088
1143	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1089	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144	void	1090	void
1145	rxvt_term::cont_scroll_cb (time_watcher &w)	1091	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146	{	1092	{
1147	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1093	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1148	scr_page (scrollbar_isUp() ? UP : DN, 1))	1094	scr_page (scrollbar_isUp() ? UP : DN, 1))
1149	{
1150	want_refresh = 1;	1095	want_refresh = 1;
1151	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	else
1152	}	1097	w.stop ();
1153	}	1098	}
1154	#endif	1099	#endif
1155		1100
1156	#ifdef SELECTION_SCROLLING	1101	#ifdef SELECTION_SCROLLING
1157	void	1102	void
1158	rxvt_term::sel_scroll_cb (time_watcher &w)	1103	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159	{	1104	{
1160	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1105	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161	{	1106	{
1162	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1107	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163	want_refresh = 1;	1108	want_refresh = 1;
1164	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1165	}	1109	}
		1110	else
		1111	w.stop ();
1166	}	1112	}
1167	#endif	1113	#endif
1168		1114
1169	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1115	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170	void	1116	void
1171	rxvt_term::slip_wheel_cb (time_watcher &w)	1117	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172	{	1118	{
1173	if (mouse_slip_wheel_speed == 0	1119	if (mouse_slip_wheel_speed == 0
1174	\|\| 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)
1175	: scr_page (UP, mouse_slip_wheel_speed))	1121	: scr_page (UP, mouse_slip_wheel_speed))
1176	{	1122	{
1177	if (view_start == top_row \|\| view_start == 0)	1123	if (view_start == top_row \|\| view_start == 0)
1178	mouse_slip_wheel_speed = 0;	1124	mouse_slip_wheel_speed = 0;
1179		1125
1180	want_refresh = 1;	1126	want_refresh = 1;
1181	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1182	}	1127	}
		1128	else
		1129	w.stop ();
1183	}	1130	}
1184	#endif	1131	#endif
1185		1132
1186	#if LINUX_YIELD_HACK	1133	#if LINUX_YIELD_HACK
1187	static struct event_handler	1134	static struct event_handler
1188	{	1135	{
1189	check_watcher yield_ev;	1136	ev::prepare yield_ev;
1190		1137
1191	void yield_cb (check_watcher &w)	1138	void yield_cb (ev::prepare &w, int revents)
1192	{	1139	{
1193	// this should really be sched_yield(), but the linux guys thought	1140	// this should really be sched_yield(), but the linux guys thought
1194	// that giving a process calling sched_yield () less cpu time than	1141	// that giving a process calling sched_yield () less cpu time than
1195	// 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
1196	// allowed by the sus... as is returning ENOSYS.	1143	// allowed by the sus... as is returning ENOSYS.
…		…
1247		1194
1248	return false;	1195	return false;
1249	}	1196	}
1250		1197
1251	void	1198	void
1252	rxvt_term::pty_cb (io_watcher &w, short revents)	1199	rxvt_term::pty_cb (ev::io &w, int revents)
1253	{	1200	{
1254	make_current ();	1201	make_current ();
1255		1202
1256	if (revents & EVENT_READ)	1203	if (revents & ev::READ)
1257	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1258	while (pty_fill ())	1205	while (pty_fill ())
1259	if (cmd_parse ())	1206	if (cmd_parse ())
1260	break;	1207	break;
1261		1208
1262	if (revents & EVENT_WRITE)	1209	if (revents & ev::WRITE)
1263	pty_write ();	1210	pty_write ();
1264	}	1211	}
1265		1212
1266	void	1213	void
1267	rxvt_term::pointer_unblank ()	1214	rxvt_term::pointer_unblank ()
…		…
1271		1218
1272	#ifdef POINTER_BLANK	1219	#ifdef POINTER_BLANK
1273	hidden_pointer = 0;	1220	hidden_pointer = 0;
1274		1221
1275	if (option (Opt_pointerBlank))	1222	if (option (Opt_pointerBlank))
1276	pointer_ev.start (NOW + pointerBlankDelay);	1223	pointer_ev.start (pointerBlankDelay);
1277	#endif	1224	#endif
1278	}	1225	}
1279		1226
1280	#ifdef POINTER_BLANK	1227	#ifdef POINTER_BLANK
1281	void	1228	void
…		…
1289		1236
1290	hidden_pointer = 1;	1237	hidden_pointer = 1;
1291	}	1238	}
1292		1239
1293	void	1240	void
1294	rxvt_term::pointer_cb (time_watcher &w)	1241	rxvt_term::pointer_cb (ev::timer &w, int revents)
1295	{	1242	{
1296	make_current ();	1243	make_current ();
1297		1244
1298	pointer_blank ();	1245	pointer_blank ();
1299	}	1246	}
…		…
1302	void	1249	void
1303	rxvt_term::mouse_report (XButtonEvent &ev)	1250	rxvt_term::mouse_report (XButtonEvent &ev)
1304	{	1251	{
1305	int button_number, key_state = 0;	1252	int button_number, key_state = 0;
1306	int x, y;	1253	int x, y;
		1254	int code = 32;
1307		1255
1308	x = ev.x;	1256	x = Pixel2Col (ev.x);
1309	y = ev.y;	1257	y = Pixel2Row (ev.y);
1310	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	}
1311		1266
1312	if (MEvent.button == AnyButton)	1267	if (MEvent.button == AnyButton)
1313	button_number = 3;	1268	button_number = 3;
1314	else	1269	else
1315	{	1270	{
…		…
1361	x + 1,	1316	x + 1,
1362	y + 1);	1317	y + 1);
1363	#endif	1318	#endif
1364		1319
1365	tt_printf ("\033[M%c%c%c",	1320	tt_printf ("\033[M%c%c%c",
1366	(32 + button_number + key_state),	1321	(code + button_number + key_state),
1367	(32 + x + 1),	1322	(32 + x + 1),
1368	(32 + y + 1));	1323	(32 + y + 1));
1369	}	1324	}
1370		1325
1371	/{{{ process an X event /	1326	/{{{ process an X event /
…		…
1475	&& ev.xfocus.mode != NotifyGrab)	1430	&& ev.xfocus.mode != NotifyGrab)
1476	focus_out ();	1431	focus_out ();
1477	break;	1432	break;
1478		1433
1479	case ConfigureNotify:	1434	case ConfigureNotify:
1480	/* 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",
1481	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,
1482	szHint.width, szHint.height);*/	1437	szHint.width, szHint.height); */
1483	if (ev.xconfigure.window == parent[0])	1438	if (ev.xconfigure.window == parent[0])
1484	{	1439	{
1485	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1440	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486	;	1441	;
1487		1442
…		…
1490	seen_resize = 1;	1445	seen_resize = 1;
1491	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1446	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492	}	1447	}
1493	else	1448	else
1494	{	1449	{
1495	#ifdef ENABLE_TRANSPARENCY	1450	#ifdef HAVE_BG_PIXMAP
1496	if (option (Opt_transparent))	1451	if (bgPixmap.window_position_sensitive ())
1497	update_background ();	1452	update_background ();
1498	#endif	1453	#endif
1499	}	1454	}
1500	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1455	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1501	}	1456	}
…		…
1523	break;	1478	break;
1524		1479
1525	case MapNotify:	1480	case MapNotify:
1526	mapped = 1;	1481	mapped = 1;
1527	#ifdef TEXT_BLINK	1482	#ifdef TEXT_BLINK
1528	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1483	text_blink_ev.start ();
1529	#endif	1484	#endif
1530	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1485	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531	break;	1486	break;
1532		1487
1533	case UnmapNotify:	1488	case UnmapNotify:
…		…
1535	#ifdef TEXT_BLINK	1490	#ifdef TEXT_BLINK
1536	text_blink_ev.stop ();	1491	text_blink_ev.stop ();
1537	#endif	1492	#endif
1538	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1493	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539	break;	1494	break;
1540
1541	#ifdef ENABLE_TRANSPARENCY
1542	case ReparentNotify:
1543	rootwin_cb (ev);
1544	break;
1545	#endif /* ENABLE_TRANSPARENCY */
1546		1495
1547	case GraphicsExpose:	1496	case GraphicsExpose:
1548	case Expose:	1497	case Expose:
1549	if (ev.xany.window == vt)	1498	if (ev.xany.window == vt)
1550	{	1499	{
1551	do	1500	do
		1501	{
1552	scr_expose (ev.xexpose.x, ev.xexpose.y,	1502	scr_expose (ev.xexpose.x, ev.xexpose.y,
1553	ev.xexpose.width, ev.xexpose.height, False);	1503	ev.xexpose.width, ev.xexpose.height, False);
		1504	}
1554	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1505	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1555		1506
1556	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1507	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1557		1508
1558	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1509	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1510	{
1559	scr_expose (ev.xexpose.x, ev.xexpose.y,	1511	scr_expose (ev.xexpose.x, ev.xexpose.y,
1560	ev.xexpose.width, ev.xexpose.height, False);	1512	ev.xexpose.width, ev.xexpose.height, False);
1561		1513	}
1562	want_refresh = 1;	1514	want_refresh = 1;
1563	}	1515	}
1564	else	1516	else
1565	{	1517	{
1566	XEvent unused_event;	1518	XEvent unused_event;
…		…
1581	case MotionNotify:	1533	case MotionNotify:
1582	#ifdef POINTER_BLANK	1534	#ifdef POINTER_BLANK
1583	if (hidden_pointer)	1535	if (hidden_pointer)
1584	pointer_unblank ();	1536	pointer_unblank ();
1585	#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);
1586	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1541	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1587	break;	1542	break;
1588		1543
1589	if (ev.xany.window == vt)	1544	if (ev.xany.window == vt)
1590	{	1545	{
…		…
1624	int dist;	1579	int dist;
1625		1580
1626	/* don't clobber the current delay if we are	1581	/* don't clobber the current delay if we are
1627	* already in the middle of scrolling.	1582	* already in the middle of scrolling.
1628	*/	1583	*/
1629	if (!sel_scroll_ev.active)	1584	if (!sel_scroll_ev.is_active ())
1630	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1585	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1631		1586
1632	/* save the event params so we can highlight	1587	/* save the event params so we can highlight
1633	* the selection in the pending-scroll loop	1588	* the selection in the pending-scroll loop
1634	*/	1589	*/
1635	selection_save_x = ev.xbutton.x;	1590	selection_save_x = ev.xbutton.x;
…		…
1657	else	1612	else
1658	{	1613	{
1659	/* we are within the text window, so we	1614	/* we are within the text window, so we
1660	* shouldn't be scrolling	1615	* shouldn't be scrolling
1661	*/	1616	*/
1662	if (sel_scroll_ev.active)
1663	sel_scroll_ev.stop();	1617	sel_scroll_ev.stop();
1664	}	1618	}
1665	#endif	1619	#endif
1666	#ifdef MOUSE_THRESHOLD	1620	#ifdef MOUSE_THRESHOLD
1667	}	1621	}
1668	#endif	1622	#endif
…		…
1694	{	1648	{
1695	hidden_cursor = 0;	1649	hidden_cursor = 0;
1696	want_refresh = 1;	1650	want_refresh = 1;
1697	}	1651	}
1698		1652
1699	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1653	cursor_blink_ev.again ();
1700	}	1654	}
1701	#endif	1655	#endif
1702		1656
1703	#if defined(POINTER_BLANK)	1657	#if defined(POINTER_BLANK)
1704	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1658	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1732	XSetICFocus (Input_Context);	1686	XSetICFocus (Input_Context);
1733	}	1687	}
1734	#endif	1688	#endif
1735	#if CURSOR_BLINK	1689	#if CURSOR_BLINK
1736	if (option (Opt_cursorBlink))	1690	if (option (Opt_cursorBlink))
1737	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1691	cursor_blink_ev.again ();
1738	#endif	1692	#endif
1739	#if OFF_FOCUS_FADING	1693	#if OFF_FOCUS_FADING
1740	if (rs[Rs_fade])	1694	if (rs[Rs_fade])
1741	{	1695	{
1742	pix_colors = pix_colors_focused;	1696	pix_colors = pix_colors_focused;
…		…
1744	}	1698	}
1745	#endif	1699	#endif
1746	#if ENABLE_FRILLS	1700	#if ENABLE_FRILLS
1747	if (option (Opt_urgentOnBell))	1701	if (option (Opt_urgentOnBell))
1748	{	1702	{
1749	XWMHints *h;
1750
1751	h = XGetWMHints(dpy, parent[0]);	1703	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1752	if (h != NULL)
1753	{	1704	{
1754	h->flags &= ~XUrgencyHint;	1705	h->flags &= ~XUrgencyHint;
1755	XSetWMHints(dpy, parent[0], h);	1706	XSetWMHints (dpy, parent[0], h);
1756	}	1707	}
1757	}	1708	}
1758	#endif	1709	#endif
1759	}	1710	}
1760	}	1711	}
…		…
1783	XUnsetICFocus (Input_Context);	1734	XUnsetICFocus (Input_Context);
1784	#endif	1735	#endif
1785	#if CURSOR_BLINK	1736	#if CURSOR_BLINK
1786	if (option (Opt_cursorBlink))	1737	if (option (Opt_cursorBlink))
1787	cursor_blink_ev.stop ();	1738	cursor_blink_ev.stop ();
		1739
1788	hidden_cursor = 0;	1740	hidden_cursor = 0;
1789	#endif	1741	#endif
1790	#if OFF_FOCUS_FADING	1742	#if OFF_FOCUS_FADING
1791	if (rs[Rs_fade])	1743	if (rs[Rs_fade])
1792	{	1744	{
…		…
1899	mouse_report (ev);	1851	mouse_report (ev);
1900	}	1852	}
1901	#else	1853	#else
1902	MEvent.button = ev.button;	1854	MEvent.button = ev.button;
1903	mouse_report (ev);	1855	mouse_report (ev);
1904	#endif /* MOUSE_REPORT_DOUBLECLICK */	1856	#endif /* MOUSE_REPORT_DOUBLECLICK */
1905		1857
1906	}	1858	}
1907	else	1859	else
1908	{	1860	{
1909	if (ev.button != MEvent.button)	1861	if (ev.button != MEvent.button)
…		…
2003	tt_printf ("\033[5~");	1955	tt_printf ("\033[5~");
2004	break;	1956	break;
2005	}	1957	}
2006	}	1958	}
2007	else	1959	else
2008	#endif /* NO_SCROLLBAR_REPORT */	1960	#endif /* NO_SCROLLBAR_REPORT */
2009		1961
2010	{	1962	{
2011	char upordown = 0;	1963	char upordown = 0;
2012		1964
2013	if (scrollBar.style == R_SB_NEXT)	1965	if (scrollBar.style == R_SB_NEXT)
2014	{	1966	{
2015	if (scrollbarnext_upButton (ev.y))	1967	if (scrollbarnext_upButton (ev.y))
2016	upordown = -1; /* up */	1968	upordown = -1; /* up */
…		…
2022	if (scrollbarrxvt_upButton (ev.y))	1974	if (scrollbarrxvt_upButton (ev.y))
2023	upordown = -1; /* up */	1975	upordown = -1; /* up */
2024	else if (scrollbarrxvt_dnButton (ev.y))	1976	else if (scrollbarrxvt_dnButton (ev.y))
2025	upordown = 1; /* down */	1977	upordown = 1; /* down */
2026	}	1978	}
		1979
2027	if (upordown)	1980	if (upordown)
2028	{	1981	{
2029	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1982	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1983	if (!cont_scroll_ev.is_active ())
2030	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1984	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2031	#endif	1985	#endif
2032	if (scr_page (upordown < 0 ? UP : DN, 1))	1986	if (scr_page (upordown < 0 ? UP : DN, 1))
2033	{	1987	{
2034	if (upordown < 0)	1988	if (upordown < 0)
2035	scrollBar.setUp ();	1989	scrollBar.setUp ();
…		…
2115	scrollBar.setIdle ();	2069	scrollBar.setIdle ();
2116	scrollbar_show (0);	2070	scrollbar_show (0);
2117	}	2071	}
2118		2072
2119	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
2120	if (sel_scroll_ev.active)
2121	sel_scroll_ev.stop();	2074	sel_scroll_ev.stop();
2122	#endif	2075	#endif
2123		2076
2124	if (ev.window == vt)	2077	if (ev.window == vt)
2125	{	2078	{
2126	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2079	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2150	mouse_report (ev);	2103	mouse_report (ev);
2151	}	2104	}
2152	#else /* MOUSE_REPORT_DOUBLECLICK */	2105	#else /* MOUSE_REPORT_DOUBLECLICK */
2153	MEvent.button = AnyButton;	2106	MEvent.button = AnyButton;
2154	mouse_report (ev);	2107	mouse_report (ev);
2155	#endif /* MOUSE_REPORT_DOUBLECLICK */	2108	#endif /* MOUSE_REPORT_DOUBLECLICK */
2156	return;	2109	return;
2157	}	2110	}
2158		2111
2159	/*	2112	/*
2160	* dumb hack to compensate for the failure of click-and-drag	2113	* dumb hack to compensate for the failure of click-and-drag
…		…
2198	{	2151	{
2199	mouse_slip_wheel_speed += v ? -1 : 1;	2152	mouse_slip_wheel_speed += v ? -1 : 1;
2200	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2153	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2201	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2154	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202		2155
2203	if (slip_wheel_ev.at < NOW)	2156	if (!slip_wheel_ev.is_active ())
2204	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2157	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205
2206	slip_wheel_ev.start ();
2207	}	2158	}
2208	else	2159	else
2209	{	2160	{
2210	# endif	2161	# endif
2211	scr_page (v, i);	2162	scr_page (v, i);
…		…
2279		2230
2280	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2231	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2281	{	2232	{
2282	refresh_count = 0;	2233	refresh_count = 0;
2283		2234
2284	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2235	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2285	{	2236	{
2286	refreshnow = true;	2237	refreshnow = true;
2287	ch = NOCHAR;	2238	ch = NOCHAR;
2288	break;	2239	break;
2289	}	2240	}
…		…
2500	}	2451	}
2501	}	2452	}
2502		2453
2503	pclose_printer (fd);	2454	pclose_printer (fd);
2504	}	2455	}
2505	#endif /* PRINTPIPE */	2456	#endif /* PRINTPIPE */
2506	/}}} /	2457	/}}} /
2507		2458
2508	/* INDENT-OFF */	2459	/* INDENT-OFF */
2509	enum {	2460	enum {
2510	C1_40 = 0x40,	2461	C1_40 = 0x40,
…		…
2803	nargs = 0;	2754	nargs = 0;
2804		2755
2805	priv = 0;	2756	priv = 0;
2806	ch = cmd_getc ();	2757	ch = cmd_getc ();
2807	if (ch >= '<' && ch <= '?')	2758	if (ch >= '<' && ch <= '?')
		2759	{
2808	{ /* '<' '=' '>' '?' */	2760	/* '<' '=' '>' '?' */
2809	priv = ch;	2761	priv = ch;
2810	ch = cmd_getc ();	2762	ch = cmd_getc ();
2811	}	2763	}
2812		2764
2813	/* read any numerical arguments */	2765	/* read any numerical arguments */
…		…
2856	{	2808	{
2857	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2809	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2810	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859	//	2811	//
2860	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2812	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2813	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2862	// that we do not support xterm mouse reporting (should be 95 when we do).	2814	// versions.
2863	//	2815	//
2864	tt_printf ("\033[>%d;94;0c", 'U');	2816	tt_printf ("\033[>%d;95;0c", 'U');
2865	}	2817	}
2866	break;	2818	break;
2867	case '?':	2819	case '?':
2868	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2820	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2869	process_terminal_mode (ch, priv, nargs, arg);	2821	process_terminal_mode (ch, priv, nargs, arg);
…		…
3436	}	3388	}
3437		3389
3438	break;	3390	break;
3439	#endif	3391	#endif
3440		3392
3441	#if XPM_BACKGROUND	3393	#if BG_IMAGE_FROM_FILE
3442	case Rxvt_Pixmap:	3394	case Rxvt_Pixmap:
3443	if (!strcmp (str, "?"))	3395	if (!strcmp (str, "?"))
3444	{	3396	{
3445	char str[256];	3397	char str[256];
3446		3398
…		…
3633	{ 66, PrivMode_aplKP },	3585	{ 66, PrivMode_aplKP },
3634	#ifndef NO_BACKSPACE_KEY	3586	#ifndef NO_BACKSPACE_KEY
3635	{ 67, PrivMode_BackSpace },	3587	{ 67, PrivMode_BackSpace },
3636	#endif	3588	#endif
3637	{ 1000, PrivMode_MouseX11 },	3589	{ 1000, PrivMode_MouseX11 },
3638	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3590	{ 1002, PrivMode_MouseBtnEvent },
3639	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3591	{ 1003, PrivMode_MouseAnyEvent },
3640	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3641	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3592	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3642	{ 1011, PrivMode_Keypress }, // rxvt extension	3593	{ 1011, PrivMode_Keypress }, // rxvt extension
3643	// 1035 enable modifiers for alt, numlock NYI	3594	// 1035 enable modifiers for alt, numlock NYI
3644	// 1036 send ESC for meta keys NYI	3595	// 1036 send ESC for meta keys NYI
3645	// 1037 send DEL for keypad delete NYI	3596	// 1037 send DEL for keypad delete NYI
…		…
3719	scr_autowrap (state);	3670	scr_autowrap (state);
3720	break;	3671	break;
3721	/* case 8: - auto repeat, can't do on a per window basis */	3672	/* case 8: - auto repeat, can't do on a per window basis */
3722	case 9: /* X10 mouse reporting */	3673	case 9: /* X10 mouse reporting */
3723	if (state) /* orthogonal */	3674	if (state) /* orthogonal */
3724	priv_modes &= ~PrivMode_MouseX11;	3675	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3725	break;	3676	break;
3726	#ifdef scrollBar_esc	3677	#ifdef scrollBar_esc
3727	case scrollBar_esc:	3678	case scrollBar_esc:
3728	if (scrollbar_mapping (state))	3679	if (scrollbar_mapping (state))
3729	{	3680	{
…		…
3742	break;	3693	break;
3743	/* case 66: - application key pad */	3694	/* case 66: - application key pad */
3744	/* case 67: - backspace key */	3695	/* case 67: - backspace key */
3745	case 1000: /* X11 mouse reporting */	3696	case 1000: /* X11 mouse reporting */
3746	if (state) /* orthogonal */	3697	if (state) /* orthogonal */
3747	priv_modes &= ~PrivMode_MouseX10;	3698	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3748	break;	3699	break;
3749	#if 0
3750	case 1001:	3700	case 1002:
3751	break; /* X11 mouse highlighting */	3701	case 1003:
3752	#endif	3702	if (state)
		3703	{
		3704	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3705	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3706	vt_emask_mouse = PointerMotionMask;
		3707	}
		3708	else
		3709	vt_emask_mouse = NoEventMask;
		3710	vt_select_input ();
		3711	break;
3753	case 1010: /* scroll to bottom on TTY output inhibit */	3712	case 1010: /* scroll to bottom on TTY output inhibit */
3754	set_option (Opt_scrollTtyOutput, !state);	3713	set_option (Opt_scrollTtyOutput, !state);
3755	break;	3714	break;
3756	case 1011: /* scroll to bottom on key press */	3715	case 1011: /* scroll to bottom on key press */
3757	set_option (Opt_scrollTtyKeypress, state);	3716	set_option (Opt_scrollTtyKeypress, state);
…		…
3934	rxvt_term::process_graphics ()	3893	rxvt_term::process_graphics ()
3935	{	3894	{
3936	unicode_t ch, cmd = cmd_getc ();	3895	unicode_t ch, cmd = cmd_getc ();
3937		3896
3938	if (cmd == 'Q')	3897	if (cmd == 'Q')
		3898	{
3939	{ /* query graphics */	3899	/* query graphics */
3940	tt_printf ("\033G0\012"); /* no graphics */	3900	tt_printf ("\033G0\012"); /* no graphics */
3941	return;	3901	return;
3942	}	3902	}
3943	/* swallow other graphics sequences until terminating ':' */	3903	/* swallow other graphics sequences until terminating ':' */
3944	do	3904	do
…		…
3994	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3954	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3995		3955
3996	memcpy (v_buffer + v_buflen, data, len);	3956	memcpy (v_buffer + v_buflen, data, len);
3997	v_buflen += len;	3957	v_buflen += len;
3998		3958
3999	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3959	pty_ev.set (ev::READ \| ev::WRITE);
4000	}	3960	}
4001		3961
4002	void rxvt_term::pty_write ()	3962	void rxvt_term::pty_write ()
4003	{	3963	{
4004	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3964	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4009		3969
4010	if (v_buflen == 0)	3970	if (v_buflen == 0)
4011	{	3971	{
4012	free (v_buffer);	3972	free (v_buffer);
4013	v_buffer = 0;	3973	v_buffer = 0;
4014	v_buflen = 0;
4015		3974
4016	pty_ev.set (EVENT_READ);	3975	pty_ev.set (ev::READ);
4017	return;	3976	return;
4018	}	3977	}
4019		3978
4020	memmove (v_buffer, v_buffer + written, v_buflen);	3979	memmove (v_buffer, v_buffer + written, v_buflen);
4021	}	3980	}
4022	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3981	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4023	pty_ev.set (EVENT_READ);	3982	pty_ev.set (ev::READ);
4024	}	3983	}
4025		3984
4026	/----------------------- end-of-file (C source) -----------------------/	3985	/----------------------- end-of-file (C source) -----------------------/
4027		3986

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.352 by ayin, Sun Sep 9 10:35:00 2007 UTC vs. Revision 1.376 by root, Fri Dec 14 02:08:18 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.352 by ayin, Sun Sep 9 10:35:00 2007 UTC vs.
Revision 1.376 by root, Fri Dec 14 02:08:18 2007 UTC