[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.393 by sasha, Tue Jan 15 23:21:17 2008 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	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31	*	32	*
32	* This program is free software; you can redistribute it and/or modify	33	* 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	34	* 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	35	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	36	* (at your option) any later version.
…		…
198	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
199	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
200		201
201	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
202		203
203	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
204	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
205		206
206	if (y >= 0)	207	if (y >= 0)
207	{	208	{
208	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
220	ch = *chr++;	221	ch = *chr++;
221		222
222	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
223	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
224	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
225	# if !UNICODE3	226	# if !UNICODE_3
226	if (ch >= 0x10000)	227	if (ch >= 0x10000)
227	ch = 0xfffd;	228	ch = 0xfffd;
228	# endif	229	# endif
229	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
230		231
…		…
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	551	{
551	{	552	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	553	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	554	newlen = 1;
		555	#ifdef XK_KP_Home
		556	static const KeySym keypadtrans[] = {
		557	XK_KP_7, // XK_KP_Home
		558	XK_KP_4, // XK_KP_Left
		559	XK_KP_8, // XK_KP_Up
		560	XK_KP_6, // XK_KP_Right
		561	XK_KP_2, // XK_KP_Down
		562	#ifndef UNSHIFTED_SCROLLKEYS
		563	XK_KP_9, // XK_KP_Prior
		564	XK_KP_3, // XK_KP_Next
		565	#else
		566	XK_Prior,
		567	XK_Next,
		568	#endif
		569	XK_KP_1, // XK_KP_End
		570	XK_KP_5, // XK_KP_Begin
		571	};
		572
		573	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		574	{
		575	unsigned int index = keysym - XK_KP_Home;
		576	keysym = kp ? keypadtrans[index] : XK_Home + index;
		577	}
		578	else if (keysym == XK_KP_Insert)
		579	keysym = kp ? XK_KP_0 : XK_Insert;
		580	#ifndef NO_DELETE_KEY
		581	else if (keysym == XK_KP_Delete)
		582	keysym = kp ? XK_KP_Decimal : XK_Delete;
		583	#endif
		584	#endif
554	switch (keysym)	585	switch (keysym)
555	{	586	{
556	#ifndef NO_BACKSPACE_KEY	587	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	588	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	589	if (priv_modes & PrivMode_HaveBackSpace)
…		…
564	else	595	else
565	strcpy (kbuf, rs[Rs_backspace_key]);	596	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	597	break;
567	#endif	598	#endif
568	#ifndef NO_DELETE_KEY	599	#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:	600	case XK_Delete:
580	strcpy (kbuf, rs[Rs_delete_key]);	601	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	602	break;
582	#endif	603	#endif
583	case XK_Tab:	604	case XK_Tab:
…		…
595	#endif	616	#endif
596	newlen = 0;	617	newlen = 0;
597	}	618	}
598	break;	619	break;
599		620
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" */	621	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	622	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	623	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	624	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	625	strcpy (kbuf, "\033[Z");
…		…
630	else if (priv_modes & PrivMode_aplCUR)	635	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	636	kbuf[1] = 'O';
632	break;	637	break;
633		638
634	#ifndef UNSHIFTED_SCROLLKEYS	639	#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:	640	case XK_Prior:
646	strcpy (kbuf, "\033[5~");	641	strcpy (kbuf, "\033[5~");
647	break;	642	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:	643	case XK_Next:
659	strcpy (kbuf, "\033[6~");	644	strcpy (kbuf, "\033[6~");
660	break;	645	break;
661	#endif	646	#endif
662	case XK_KP_Enter:	647	case XK_KP_Enter:
…		…
681	kbuf[0] = '\015';	666	kbuf[0] = '\015';
682	kbuf[1] = '\0';	667	kbuf[1] = '\0';
683	}	668	}
684	break;	669	break;
685		670
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" */	671	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	672	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	673	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	674	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	675	strcpy (kbuf, "\033OP");
…		…
728		707
729	case XK_Find:	708	case XK_Find:
730	strcpy (kbuf, "\033[1~");	709	strcpy (kbuf, "\033[1~");
731	break;	710	break;
732		711
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:	712	case XK_Insert:
744	strcpy (kbuf, "\033[2~");	713	strcpy (kbuf, "\033[2~");
745	break;	714	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */	715	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:	716	case DXK_Remove:
…		…
751	strcpy (kbuf, "\033[3~");	720	strcpy (kbuf, "\033[3~");
752	break;	721	break;
753	case XK_Select:	722	case XK_Select:
754	strcpy (kbuf, "\033[4~");	723	strcpy (kbuf, "\033[4~");
755	break;	724	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:	725	case XK_End:
767	strcpy (kbuf, KS_END);	726	strcpy (kbuf, KS_END);
768	break;	727	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:	728	case XK_Home:
780	strcpy (kbuf, KS_HOME);	729	strcpy (kbuf, KS_HOME);
781	break;	730	break;
782		731
783	#define FKEY(n, fkey) \	732	#define FKEY(n, fkey) \
…		…
1035	void	984	void
1036	rxvt_term::flush ()	985	rxvt_term::flush ()
1037	{	986	{
1038	flush_ev.stop ();	987	flush_ev.stop ();
1039		988
1040	#ifdef ENABLE_TRANSPARENCY	989	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	990	if (bgPixmap.check_clearChanged ())
1042	{	991	{
1043	want_full_refresh = 0;	992	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	993	scr_touch (false);
1046	}	994	}
1047	#endif	995	#endif
1048		996
1049	if (want_refresh)	997	if (want_refresh)
…		…
1094	}	1042	}
1095		1043
1096	display->flush ();	1044	display->flush ();
1097	}	1045	}
1098		1046
		1047	/* checks wether a refresh is requested and starts the refresh timer */
1099	void	1048	void
1100	rxvt_term::check_cb (check_watcher &w)	1049	rxvt_term::refresh_check ()
1101	{	1050	{
1102	make_current ();	1051	if (want_refresh && !flush_ev.is_active ())
		1052	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103		1053
1104	display->flush ();	1054	display->flush ();
1105
1106	if (want_refresh && !flush_ev.active)
1107	flush_ev.start (NOW + 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		1072	refresh_check ();
1126	w.start (w.at + CURSOR_BLINK_INTERVAL);
1127	}	1073	}
1128	#endif	1074	#endif
1129		1075
1130	#ifdef TEXT_BLINK	1076	#ifdef TEXT_BLINK
1131	void	1077	void
1132	rxvt_term::text_blink_cb (time_watcher &w)	1078	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133	{	1079	{
1134	if (scr_refresh_rend (RS_Blink, RS_Blink))	1080	if (scr_refresh_rend (RS_Blink, RS_Blink))
1135	{	1081	{
1136	hidden_text = !hidden_text;	1082	hidden_text = !hidden_text;
1137	want_refresh = 1;	1083	want_refresh = 1;
1138	w.start (w.at + TEXT_BLINK_INTERVAL);	1084	refresh_check ();
1139	}	1085	}
		1086	else
		1087	w.stop ();
1140	}	1088	}
1141	#endif	1089	#endif
1142		1090
1143	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1091	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144	void	1092	void
1145	rxvt_term::cont_scroll_cb (time_watcher &w)	1093	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146	{	1094	{
1147	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1095	if ((scrollbar_isUp () \|\| scrollbar_isDn ())
1148	scr_page (scrollbar_isUp() ? UP : DN, 1))	1096	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1149	{	1097	{
1150	want_refresh = 1;	1098	want_refresh = 1;
1151	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1099	refresh_check ();
1152	}	1100	}
		1101	else
		1102	w.stop ();
1153	}	1103	}
1154	#endif	1104	#endif
1155		1105
1156	#ifdef SELECTION_SCROLLING	1106	#ifdef SELECTION_SCROLLING
1157	void	1107	void
1158	rxvt_term::sel_scroll_cb (time_watcher &w)	1108	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159	{	1109	{
1160	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1110	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161	{	1111	{
1162	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1112	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163	want_refresh = 1;	1113	want_refresh = 1;
1164	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1114	refresh_check ();
1165	}	1115	}
		1116	else
		1117	w.stop ();
1166	}	1118	}
1167	#endif	1119	#endif
1168		1120
1169	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1121	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170	void	1122	void
1171	rxvt_term::slip_wheel_cb (time_watcher &w)	1123	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172	{	1124	{
1173	if (mouse_slip_wheel_speed == 0	1125	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175	: scr_page (UP, mouse_slip_wheel_speed))
1176	{	1126	{
1177	if (view_start == top_row \|\| view_start == 0)
1178	mouse_slip_wheel_speed = 0;
1179
1180	want_refresh = 1;	1127	want_refresh = 1;
1181	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1128	refresh_check ();
		1129	}
		1130
		1131	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1132	{
		1133	mouse_slip_wheel_speed = 0;
		1134	w.stop ();
1182	}	1135	}
1183	}	1136	}
1184	#endif	1137	#endif
1185		1138
1186	#if LINUX_YIELD_HACK	1139	#if LINUX_YIELD_HACK
1187	static struct event_handler	1140	static struct event_handler
1188	{	1141	{
1189	check_watcher yield_ev;	1142	ev::prepare yield_ev;
1190		1143
1191	void yield_cb (check_watcher &w)	1144	void yield_cb (ev::prepare &w, int revents)
1192	{	1145	{
1193	// this should really be sched_yield(), but the linux guys thought	1146	// this should really be sched_yield(), but the linux guys thought
1194	// that giving a process calling sched_yield () less cpu time than	1147	// 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	1148	// ones with high nice levels is a useful thing to do. It surely is is
1196	// allowed by the sus... as is returning ENOSYS.	1149	// allowed by the sus... as is returning ENOSYS.
…		…
1247		1200
1248	return false;	1201	return false;
1249	}	1202	}
1250		1203
1251	void	1204	void
1252	rxvt_term::pty_cb (io_watcher &w, short revents)	1205	rxvt_term::pty_cb (ev::io &w, int revents)
1253	{	1206	{
1254	make_current ();	1207	make_current ();
1255		1208
1256	if (revents & EVENT_READ)	1209	if (revents & ev::READ)
1257	// loop, but don't allow a single term to monopolize us	1210	// loop, but don't allow a single term to monopolize us
1258	while (pty_fill ())	1211	while (pty_fill ())
1259	if (cmd_parse ())	1212	if (cmd_parse ())
1260	break;	1213	break;
1261		1214
1262	if (revents & EVENT_WRITE)	1215	if (revents & ev::WRITE)
1263	pty_write ();	1216	pty_write ();
		1217
		1218	refresh_check ();
1264	}	1219	}
1265		1220
1266	void	1221	void
1267	rxvt_term::pointer_unblank ()	1222	rxvt_term::pointer_unblank ()
1268	{	1223	{
…		…
1271		1226
1272	#ifdef POINTER_BLANK	1227	#ifdef POINTER_BLANK
1273	hidden_pointer = 0;	1228	hidden_pointer = 0;
1274		1229
1275	if (option (Opt_pointerBlank))	1230	if (option (Opt_pointerBlank))
1276	pointer_ev.start (NOW + pointerBlankDelay);	1231	pointer_ev.start (pointerBlankDelay);
1277	#endif	1232	#endif
1278	}	1233	}
1279		1234
1280	#ifdef POINTER_BLANK	1235	#ifdef POINTER_BLANK
1281	void	1236	void
…		…
1289		1244
1290	hidden_pointer = 1;	1245	hidden_pointer = 1;
1291	}	1246	}
1292		1247
1293	void	1248	void
1294	rxvt_term::pointer_cb (time_watcher &w)	1249	rxvt_term::pointer_cb (ev::timer &w, int revents)
1295	{	1250	{
1296	make_current ();	1251	make_current ();
1297		1252
1298	pointer_blank ();	1253	pointer_blank ();
1299	}	1254	}
…		…
1302	void	1257	void
1303	rxvt_term::mouse_report (XButtonEvent &ev)	1258	rxvt_term::mouse_report (XButtonEvent &ev)
1304	{	1259	{
1305	int button_number, key_state = 0;	1260	int button_number, key_state = 0;
1306	int x, y;	1261	int x, y;
		1262	int code = 32;
1307		1263
1308	x = ev.x;	1264	x = Pixel2Col (ev.x);
1309	y = ev.y;	1265	y = Pixel2Row (ev.y);
1310	pixel_position (&x, &y);	1266	if (ev.type == MotionNotify)
		1267	{
		1268	if (x == mouse_row && y == mouse_col)
		1269	return;
		1270	mouse_row = x;
		1271	mouse_col = y;
		1272	code += 32;
		1273	}
1311		1274
1312	if (MEvent.button == AnyButton)	1275	if (MEvent.button == AnyButton)
1313	button_number = 3;	1276	button_number = 3;
1314	else	1277	else
1315	{	1278	{
…		…
1361	x + 1,	1324	x + 1,
1362	y + 1);	1325	y + 1);
1363	#endif	1326	#endif
1364		1327
1365	tt_printf ("\033[M%c%c%c",	1328	tt_printf ("\033[M%c%c%c",
1366	(32 + button_number + key_state),	1329	(code + button_number + key_state),
1367	(32 + x + 1),	1330	(32 + x + 1),
1368	(32 + y + 1));	1331	(32 + y + 1));
1369	}	1332	}
1370		1333
1371	/{{{ process an X event /	1334	/{{{ process an X event /
…		…
1475	&& ev.xfocus.mode != NotifyGrab)	1438	&& ev.xfocus.mode != NotifyGrab)
1476	focus_out ();	1439	focus_out ();
1477	break;	1440	break;
1478		1441
1479	case ConfigureNotify:	1442	case ConfigureNotify:
1480	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1443	/*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,	1444	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1482	szHint.width, szHint.height);*/	1445	szHint.width, szHint.height); */
1483	if (ev.xconfigure.window == parent[0])	1446	if (ev.xconfigure.window == parent[0])
1484	{	1447	{
1485	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486	;	1449	;
1487		1450
…		…
1490	seen_resize = 1;	1453	seen_resize = 1;
1491	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1454	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492	}	1455	}
1493	else	1456	else
1494	{	1457	{
1495	#ifdef ENABLE_TRANSPARENCY	1458	#ifdef HAVE_BG_PIXMAP
1496	if (option (Opt_transparent))	1459	if (bgPixmap.window_position_sensitive ())
		1460	{
		1461	if (mapped)
1497	update_background ();	1462	update_background ();
		1463	else
		1464	bgPixmap.invalidate ();
		1465	}
1498	#endif	1466	#endif
1499	}	1467	}
		1468
1500	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1469	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1501	}	1470	}
1502	break;	1471	break;
1503		1472
1504	case PropertyNotify:	1473	case PropertyNotify:
…		…
1521	case SelectionRequest:	1490	case SelectionRequest:
1522	selection_send (ev.xselectionrequest);	1491	selection_send (ev.xselectionrequest);
1523	break;	1492	break;
1524		1493
1525	case MapNotify:	1494	case MapNotify:
		1495	#ifdef HAVE_BG_PIXMAP
		1496	/* This is needed spcifically to fix the case of no window manager or a
		1497	* non-reparenting window manager. In those cases we never get first
		1498	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1499	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1500	* reparenting.
		1501	* We should not render background immidiately, as there could be several
		1502	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1503	* by scheduling background redraw as soon as we can, but giving a short
		1504	* bit of time for ConfigureNotifies to arrive.
		1505	* We should render background PRIOR to drawing any text, but AFTER all
		1506	* of ConfigureNotifys for the best results.
		1507	*/
		1508	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1509	update_background_ev.start (0.025);
		1510	#endif
1526	mapped = 1;	1511	mapped = 1;
1527	#ifdef TEXT_BLINK	1512	#ifdef TEXT_BLINK
1528	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1513	text_blink_ev.start ();
1529	#endif	1514	#endif
1530	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1515	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531	break;	1516	break;
1532		1517
1533	case UnmapNotify:	1518	case UnmapNotify:
…		…
1535	#ifdef TEXT_BLINK	1520	#ifdef TEXT_BLINK
1536	text_blink_ev.stop ();	1521	text_blink_ev.stop ();
1537	#endif	1522	#endif
1538	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1523	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539	break;	1524	break;
1540
1541	#ifdef ENABLE_TRANSPARENCY
1542	case ReparentNotify:
1543	rootwin_cb (ev);
1544	break;
1545	#endif /* ENABLE_TRANSPARENCY */
1546		1525
1547	case GraphicsExpose:	1526	case GraphicsExpose:
1548	case Expose:	1527	case Expose:
1549	if (ev.xany.window == vt)	1528	if (ev.xany.window == vt)
1550	{	1529	{
1551	do	1530	do
		1531	{
1552	scr_expose (ev.xexpose.x, ev.xexpose.y,	1532	scr_expose (ev.xexpose.x, ev.xexpose.y,
1553	ev.xexpose.width, ev.xexpose.height, False);	1533	ev.xexpose.width, ev.xexpose.height, False);
		1534	}
1554	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1535	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1555		1536
1556	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1537	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1557		1538
1558	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1540	{
1559	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1560	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, False);
		1543	}
1561		1544
1562	want_refresh = 1;	1545	want_refresh = 1;
1563	}	1546	}
1564	else	1547	else
1565	{	1548	{
…		…
1568	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1551	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1569	;	1552	;
1570	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1553	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1571	;	1554	;
1572		1555
1573	if (isScrollbarWindow (ev.xany.window))	1556	if (scrollBar.state && ev.xany.window == scrollBar.win)
1574	{	1557	{
1575	scrollBar.setIdle ();	1558	scrollBar.setIdle ();
1576	scrollbar_show (0);	1559	scrollbar_show (0);
1577	}	1560	}
1578	}	1561	}
…		…
1581	case MotionNotify:	1564	case MotionNotify:
1582	#ifdef POINTER_BLANK	1565	#ifdef POINTER_BLANK
1583	if (hidden_pointer)	1566	if (hidden_pointer)
1584	pointer_unblank ();	1567	pointer_unblank ();
1585	#endif	1568	#endif
		1569	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1570	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1571	mouse_report (ev.xbutton);
1586	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1587	break;	1573	break;
1588		1574
1589	if (ev.xany.window == vt)	1575	if (ev.xany.window == vt)
1590	{	1576	{
…		…
1624	int dist;	1610	int dist;
1625		1611
1626	/* don't clobber the current delay if we are	1612	/* don't clobber the current delay if we are
1627	* already in the middle of scrolling.	1613	* already in the middle of scrolling.
1628	*/	1614	*/
1629	if (!sel_scroll_ev.active)	1615	if (!sel_scroll_ev.is_active ())
1630	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1616	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1631		1617
1632	/* save the event params so we can highlight	1618	/* save the event params so we can highlight
1633	* the selection in the pending-scroll loop	1619	* the selection in the pending-scroll loop
1634	*/	1620	*/
1635	selection_save_x = ev.xbutton.x;	1621	selection_save_x = ev.xbutton.x;
…		…
1657	else	1643	else
1658	{	1644	{
1659	/* we are within the text window, so we	1645	/* we are within the text window, so we
1660	* shouldn't be scrolling	1646	* shouldn't be scrolling
1661	*/	1647	*/
1662	if (sel_scroll_ev.active)
1663	sel_scroll_ev.stop();	1648	sel_scroll_ev.stop();
1664	}	1649	}
1665	#endif	1650	#endif
1666	#ifdef MOUSE_THRESHOLD	1651	#ifdef MOUSE_THRESHOLD
1667	}	1652	}
1668	#endif	1653	#endif
1669	}	1654	}
1670	}	1655	}
1671	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1656	else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1672	{	1657	{
1673	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1658	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1674	MotionNotify, &ev))	1659	MotionNotify, &ev))
1675	;	1660	;
1676		1661
…		…
1694	{	1679	{
1695	hidden_cursor = 0;	1680	hidden_cursor = 0;
1696	want_refresh = 1;	1681	want_refresh = 1;
1697	}	1682	}
1698		1683
1699	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1684	cursor_blink_ev.again ();
1700	}	1685	}
1701	#endif	1686	#endif
1702		1687
1703	#if defined(POINTER_BLANK)	1688	#if defined(POINTER_BLANK)
1704	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1689	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1711		1696
1712	if (ev.type == KeyPress && hidden_pointer == 0)	1697	if (ev.type == KeyPress && hidden_pointer == 0)
1713	pointer_blank ();	1698	pointer_blank ();
1714	}	1699	}
1715	#endif	1700	#endif
		1701
		1702	refresh_check ();
1716	}	1703	}
1717		1704
1718	void	1705	void
1719	rxvt_term::focus_in ()	1706	rxvt_term::focus_in ()
1720	{	1707	{
…		…
1732	XSetICFocus (Input_Context);	1719	XSetICFocus (Input_Context);
1733	}	1720	}
1734	#endif	1721	#endif
1735	#if CURSOR_BLINK	1722	#if CURSOR_BLINK
1736	if (option (Opt_cursorBlink))	1723	if (option (Opt_cursorBlink))
1737	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1724	cursor_blink_ev.again ();
1738	#endif	1725	#endif
1739	#if OFF_FOCUS_FADING	1726	#if OFF_FOCUS_FADING
1740	if (rs[Rs_fade])	1727	if (rs[Rs_fade])
1741	{	1728	{
1742	pix_colors = pix_colors_focused;	1729	pix_colors = pix_colors_focused;
…		…
1744	}	1731	}
1745	#endif	1732	#endif
1746	#if ENABLE_FRILLS	1733	#if ENABLE_FRILLS
1747	if (option (Opt_urgentOnBell))	1734	if (option (Opt_urgentOnBell))
1748	{	1735	{
1749	XWMHints *h;
1750
1751	h = XGetWMHints(dpy, parent[0]);	1736	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1752	if (h != NULL)
1753	{	1737	{
1754	h->flags &= ~XUrgencyHint;	1738	h->flags &= ~XUrgencyHint;
1755	XSetWMHints(dpy, parent[0], h);	1739	XSetWMHints (dpy, parent[0], h);
1756	}	1740	}
1757	}	1741	}
1758	#endif	1742	#endif
1759	}	1743	}
1760	}	1744	}
…		…
1783	XUnsetICFocus (Input_Context);	1767	XUnsetICFocus (Input_Context);
1784	#endif	1768	#endif
1785	#if CURSOR_BLINK	1769	#if CURSOR_BLINK
1786	if (option (Opt_cursorBlink))	1770	if (option (Opt_cursorBlink))
1787	cursor_blink_ev.stop ();	1771	cursor_blink_ev.stop ();
		1772
1788	hidden_cursor = 0;	1773	hidden_cursor = 0;
1789	#endif	1774	#endif
1790	#if OFF_FOCUS_FADING	1775	#if OFF_FOCUS_FADING
1791	if (rs[Rs_fade])	1776	if (rs[Rs_fade])
1792	{	1777	{
…		…
1832	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1817	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1833	{	1818	{
1834	bgPixmap.set_root_pixmap ();	1819	bgPixmap.set_root_pixmap ();
1835	update_background ();	1820	update_background ();
1836	}	1821	}
		1822
1837	break;	1823	break;
1838	}	1824	}
1839	# endif	1825	# endif
		1826
		1827	refresh_check ();
1840	}	1828	}
1841	#endif	1829	#endif
1842		1830
1843	void	1831	void
1844	rxvt_term::button_press (XButtonEvent &ev)	1832	rxvt_term::button_press (XButtonEvent &ev)
…		…
1899	mouse_report (ev);	1887	mouse_report (ev);
1900	}	1888	}
1901	#else	1889	#else
1902	MEvent.button = ev.button;	1890	MEvent.button = ev.button;
1903	mouse_report (ev);	1891	mouse_report (ev);
1904	#endif /* MOUSE_REPORT_DOUBLECLICK */	1892	#endif /* MOUSE_REPORT_DOUBLECLICK */
1905		1893
1906	}	1894	}
1907	else	1895	else
1908	{	1896	{
1909	if (ev.button != MEvent.button)	1897	if (ev.button != MEvent.button)
…		…
1957	}	1945	}
1958		1946
1959	/*	1947	/*
1960	* Scrollbar window processing of button press	1948	* Scrollbar window processing of button press
1961	*/	1949	*/
1962	if (isScrollbarWindow (ev.window))	1950	if (scrollBar.state && ev.window == scrollBar.win)
1963	{	1951	{
1964	scrollBar.setIdle ();	1952	scrollBar.setIdle ();
1965	/*	1953	/*
1966	* Rxvt-style scrollbar:	1954	* Rxvt-style scrollbar:
1967	* move up if mouse is above slider	1955	* move up if mouse is above slider
…		…
2003	tt_printf ("\033[5~");	1991	tt_printf ("\033[5~");
2004	break;	1992	break;
2005	}	1993	}
2006	}	1994	}
2007	else	1995	else
2008	#endif /* NO_SCROLLBAR_REPORT */	1996	#endif /* NO_SCROLLBAR_REPORT */
2009		1997
2010	{	1998	{
2011	char upordown = 0;	1999	char upordown = 0;
2012		2000
2013	if (scrollBar.style == R_SB_NEXT)	2001	if (scrollBar.style == R_SB_NEXT)
2014	{	2002	{
2015	if (scrollbarnext_upButton (ev.y))	2003	if (scrollbarnext_upButton (ev.y))
2016	upordown = -1; /* up */	2004	upordown = -1; /* up */
…		…
2022	if (scrollbarrxvt_upButton (ev.y))	2010	if (scrollbarrxvt_upButton (ev.y))
2023	upordown = -1; /* up */	2011	upordown = -1; /* up */
2024	else if (scrollbarrxvt_dnButton (ev.y))	2012	else if (scrollbarrxvt_dnButton (ev.y))
2025	upordown = 1; /* down */	2013	upordown = 1; /* down */
2026	}	2014	}
		2015
2027	if (upordown)	2016	if (upordown)
2028	{	2017	{
2029	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2018	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		2019	if (!cont_scroll_ev.is_active ())
2030	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2020	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2031	#endif	2021	#endif
2032	if (scr_page (upordown < 0 ? UP : DN, 1))	2022	if (scr_page (upordown < 0 ? UP : DN, 1))
2033	{	2023	{
2034	if (upordown < 0)	2024	if (upordown < 0)
2035	scrollBar.setUp ();	2025	scrollBar.setUp ();
…		…
2039	}	2029	}
2040	else	2030	else
2041	switch (ev.button)	2031	switch (ev.button)
2042	{	2032	{
2043	case Button2:	2033	case Button2:
2044	switch (scrollbar_align)	2034	switch (scrollBar.align)
2045	{	2035	{
2046	case R_SB_ALIGN_TOP:	2036	case R_SB_ALIGN_TOP:
2047	csrO = 0;	2037	csrO = 0;
2048	break;	2038	break;
2049	case R_SB_ALIGN_CENTRE:	2039	case R_SB_ALIGN_CENTRE:
…		…
2061		2051
2062	scrollBar.setMotion ();	2052	scrollBar.setMotion ();
2063	break;	2053	break;
2064		2054
2065	case Button1:	2055	case Button1:
2066	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2056	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2067	csrO = ev.y - scrollBar.top;	2057	csrO = ev.y - scrollBar.top;
2068	/* FALLTHROUGH */	2058	/* FALLTHROUGH */
2069		2059
2070	case Button3:	2060	case Button3:
2071	if (scrollBar.style != R_SB_XTERM)	2061	if (scrollBar.style != R_SB_XTERM)
…		…
2115	scrollBar.setIdle ();	2105	scrollBar.setIdle ();
2116	scrollbar_show (0);	2106	scrollbar_show (0);
2117	}	2107	}
2118		2108
2119	#ifdef SELECTION_SCROLLING	2109	#ifdef SELECTION_SCROLLING
2120	if (sel_scroll_ev.active)
2121	sel_scroll_ev.stop();	2110	sel_scroll_ev.stop();
2122	#endif	2111	#endif
2123		2112
2124	if (ev.window == vt)	2113	if (ev.window == vt)
2125	{	2114	{
2126	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2115	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2150	mouse_report (ev);	2139	mouse_report (ev);
2151	}	2140	}
2152	#else /* MOUSE_REPORT_DOUBLECLICK */	2141	#else /* MOUSE_REPORT_DOUBLECLICK */
2153	MEvent.button = AnyButton;	2142	MEvent.button = AnyButton;
2154	mouse_report (ev);	2143	mouse_report (ev);
2155	#endif /* MOUSE_REPORT_DOUBLECLICK */	2144	#endif /* MOUSE_REPORT_DOUBLECLICK */
2156	return;	2145	return;
2157	}	2146	}
2158		2147
2159	/*	2148	/*
2160	* dumb hack to compensate for the failure of click-and-drag	2149	* dumb hack to compensate for the failure of click-and-drag
…		…
2198	{	2187	{
2199	mouse_slip_wheel_speed += v ? -1 : 1;	2188	mouse_slip_wheel_speed += v ? -1 : 1;
2200	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2189	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2201	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2190	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202		2191
2203	if (slip_wheel_ev.at < NOW)	2192	if (!slip_wheel_ev.is_active ())
2204	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2193	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205
2206	slip_wheel_ev.start ();
2207	}	2194	}
2208	else	2195	else
		2196	# endif
2209	{	2197	{
2210	# endif
2211	scr_page (v, i);	2198	scr_page (v, i);
2212	scrollbar_show (1);	2199	scrollbar_show (1);
2213	# ifdef MOUSE_SLIP_WHEELING
2214	}	2200	}
2215	# endif
2216	}	2201	}
2217	break;	2202	break;
2218	#endif	2203	#endif
2219	}	2204	}
2220	}	2205	}
…		…
2279		2264
2280	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2265	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2281	{	2266	{
2282	refresh_count = 0;	2267	refresh_count = 0;
2283		2268
2284	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2269	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2285	{	2270	{
2286	refreshnow = true;	2271	refreshnow = true;
2287	ch = NOCHAR;	2272	ch = NOCHAR;
2288	break;	2273	break;
2289	}	2274	}
…		…
2500	}	2485	}
2501	}	2486	}
2502		2487
2503	pclose_printer (fd);	2488	pclose_printer (fd);
2504	}	2489	}
2505	#endif /* PRINTPIPE */	2490	#endif /* PRINTPIPE */
2506	/}}} /	2491	/}}} /
2507		2492
2508	/* INDENT-OFF */	2493	/* INDENT-OFF */
2509	enum {	2494	enum {
2510	C1_40 = 0x40,	2495	C1_40 = 0x40,
…		…
2803	nargs = 0;	2788	nargs = 0;
2804		2789
2805	priv = 0;	2790	priv = 0;
2806	ch = cmd_getc ();	2791	ch = cmd_getc ();
2807	if (ch >= '<' && ch <= '?')	2792	if (ch >= '<' && ch <= '?')
		2793	{
2808	{ /* '<' '=' '>' '?' */	2794	/* '<' '=' '>' '?' */
2809	priv = ch;	2795	priv = ch;
2810	ch = cmd_getc ();	2796	ch = cmd_getc ();
2811	}	2797	}
2812		2798
2813	/* read any numerical arguments */	2799	/* read any numerical arguments */
…		…
2856	{	2842	{
2857	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2843	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2844	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859	//	2845	//
2860	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2846	// 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	2847	// 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).	2848	// versions.
2863	//	2849	//
2864	tt_printf ("\033[>%d;94;0c", 'U');	2850	tt_printf ("\033[>%d;95;0c", 'U');
2865	}	2851	}
2866	break;	2852	break;
2867	case '?':	2853	case '?':
2868	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2854	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2869	process_terminal_mode (ch, priv, nargs, arg);	2855	process_terminal_mode (ch, priv, nargs, arg);
…		…
3425	#if ENABLE_TRANSPARENCY	3411	#if ENABLE_TRANSPARENCY
3426	case URxvt_Color_tint:	3412	case URxvt_Color_tint:
3427	process_color_seq (op, Color_tint, str, resp);	3413	process_color_seq (op, Color_tint, str, resp);
3428	{	3414	{
3429	bool changed = false;	3415	bool changed = false;
		3416
3430	if (ISSET_PIXCOLOR (Color_tint))	3417	if (ISSET_PIXCOLOR (Color_tint))
3431	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3418	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3432	else	3419	else
3433	changed = bgPixmap.unset_tint ();	3420	changed = bgPixmap.unset_tint ();
		3421
3434	if (changed)	3422	if (changed)
3435	update_background ();	3423	update_background ();
3436	}	3424	}
3437		3425
3438	break;	3426	break;
3439	#endif	3427	#endif
3440		3428
3441	#if XPM_BACKGROUND	3429	#if BG_IMAGE_FROM_FILE
3442	case Rxvt_Pixmap:	3430	case Rxvt_Pixmap:
3443	if (!strcmp (str, "?"))	3431	if (!strcmp (str, "?"))
3444	{	3432	{
3445	char str[256];	3433	char str[256];
3446		3434
…		…
3461	changed++;	3449	changed++;
3462	str = strchr (str, ';');	3450	str = strchr (str, ';');
3463	if (str == NULL)	3451	if (str == NULL)
3464	bgPixmap.set_defaultGeometry ();	3452	bgPixmap.set_defaultGeometry ();
3465	}	3453	}
		3454
3466	while (str)	3455	while (str)
3467	{	3456	{
3468	str++;	3457	str++;
3469	if (bgPixmap.set_geometry (str))	3458	if (bgPixmap.set_geometry (str))
3470	changed++;	3459	changed++;
3471	str = strchr (str, ';');	3460	str = strchr (str, ';');
3472	}	3461	}
		3462
3473	if (changed)	3463	if (changed)
3474	update_background ();	3464	update_background ();
3475	}	3465	}
3476	break;	3466	break;
3477	#endif	3467	#endif
3478		3468
3479	case Rxvt_restoreFG:	3469	case Rxvt_restoreFG:
…		…
3633	{ 66, PrivMode_aplKP },	3623	{ 66, PrivMode_aplKP },
3634	#ifndef NO_BACKSPACE_KEY	3624	#ifndef NO_BACKSPACE_KEY
3635	{ 67, PrivMode_BackSpace },	3625	{ 67, PrivMode_BackSpace },
3636	#endif	3626	#endif
3637	{ 1000, PrivMode_MouseX11 },	3627	{ 1000, PrivMode_MouseX11 },
3638	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3628	{ 1002, PrivMode_MouseBtnEvent },
3639	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3629	{ 1003, PrivMode_MouseAnyEvent },
3640	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3641	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3630	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3642	{ 1011, PrivMode_Keypress }, // rxvt extension	3631	{ 1011, PrivMode_Keypress }, // rxvt extension
3643	// 1035 enable modifiers for alt, numlock NYI	3632	// 1035 enable modifiers for alt, numlock NYI
3644	// 1036 send ESC for meta keys NYI	3633	// 1036 send ESC for meta keys NYI
3645	// 1037 send DEL for keypad delete NYI	3634	// 1037 send DEL for keypad delete NYI
…		…
3702	*/	3691	*/
3703	PrivMode (1, PrivMode_vt52);	3692	PrivMode (1, PrivMode_vt52);
3704	break;	3693	break;
3705	case 3: /* 80/132 */	3694	case 3: /* 80/132 */
3706	if (priv_modes & PrivMode_132OK)	3695	if (priv_modes & PrivMode_132OK)
		3696	{
		3697	scr_poweron ();
3707	set_widthheight (((state ? 132 : 80) * fwidth), height);	3698	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3699	}
3708	break;	3700	break;
3709	case 4: /* smooth scrolling */	3701	case 4: /* smooth scrolling */
3710	set_option (Opt_jumpScroll, !state);	3702	set_option (Opt_jumpScroll, !state);
3711	break;	3703	break;
3712	case 5: /* reverse video */	3704	case 5: /* reverse video */
…		…
3719	scr_autowrap (state);	3711	scr_autowrap (state);
3720	break;	3712	break;
3721	/* case 8: - auto repeat, can't do on a per window basis */	3713	/* case 8: - auto repeat, can't do on a per window basis */
3722	case 9: /* X10 mouse reporting */	3714	case 9: /* X10 mouse reporting */
3723	if (state) /* orthogonal */	3715	if (state) /* orthogonal */
3724	priv_modes &= ~PrivMode_MouseX11;	3716	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3725	break;	3717	break;
3726	#ifdef scrollBar_esc	3718	#ifdef scrollBar_esc
3727	case scrollBar_esc:	3719	case scrollBar_esc:
3728	if (scrollbar_mapping (state))	3720	if (scrollbar_mapping (state))
3729	{	3721	{
…		…
3742	break;	3734	break;
3743	/* case 66: - application key pad */	3735	/* case 66: - application key pad */
3744	/* case 67: - backspace key */	3736	/* case 67: - backspace key */
3745	case 1000: /* X11 mouse reporting */	3737	case 1000: /* X11 mouse reporting */
3746	if (state) /* orthogonal */	3738	if (state) /* orthogonal */
3747	priv_modes &= ~PrivMode_MouseX10;	3739	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3748	break;	3740	break;
3749	#if 0
3750	case 1001:	3741	case 1002:
3751	break; /* X11 mouse highlighting */	3742	case 1003:
3752	#endif	3743	if (state)
		3744	{
		3745	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3746	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3747	vt_emask_mouse = PointerMotionMask;
		3748	}
		3749	else
		3750	vt_emask_mouse = NoEventMask;
		3751	vt_select_input ();
		3752	break;
3753	case 1010: /* scroll to bottom on TTY output inhibit */	3753	case 1010: /* scroll to bottom on TTY output inhibit */
3754	set_option (Opt_scrollTtyOutput, !state);	3754	set_option (Opt_scrollTtyOutput, !state);
3755	break;	3755	break;
3756	case 1011: /* scroll to bottom on key press */	3756	case 1011: /* scroll to bottom on key press */
3757	set_option (Opt_scrollTtyKeypress, state);	3757	set_option (Opt_scrollTtyKeypress, state);
…		…
3934	rxvt_term::process_graphics ()	3934	rxvt_term::process_graphics ()
3935	{	3935	{
3936	unicode_t ch, cmd = cmd_getc ();	3936	unicode_t ch, cmd = cmd_getc ();
3937		3937
3938	if (cmd == 'Q')	3938	if (cmd == 'Q')
		3939	{
3939	{ /* query graphics */	3940	/* query graphics */
3940	tt_printf ("\033G0\012"); /* no graphics */	3941	tt_printf ("\033G0\012"); /* no graphics */
3941	return;	3942	return;
3942	}	3943	}
3943	/* swallow other graphics sequences until terminating ':' */	3944	/* swallow other graphics sequences until terminating ':' */
3944	do	3945	do
…		…
3994	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3995	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3995		3996
3996	memcpy (v_buffer + v_buflen, data, len);	3997	memcpy (v_buffer + v_buflen, data, len);
3997	v_buflen += len;	3998	v_buflen += len;
3998		3999
3999	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4000	pty_ev.set (ev::READ \| ev::WRITE);
4000	}	4001	}
4001		4002
4002	void rxvt_term::pty_write ()	4003	void rxvt_term::pty_write ()
4003	{	4004	{
4004	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4005	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4009		4010
4010	if (v_buflen == 0)	4011	if (v_buflen == 0)
4011	{	4012	{
4012	free (v_buffer);	4013	free (v_buffer);
4013	v_buffer = 0;	4014	v_buffer = 0;
4014	v_buflen = 0;
4015		4015
4016	pty_ev.set (EVENT_READ);	4016	pty_ev.set (ev::READ);
4017	return;	4017	return;
4018	}	4018	}
4019		4019
4020	memmove (v_buffer, v_buffer + written, v_buflen);	4020	memmove (v_buffer, v_buffer + written, v_buflen);
4021	}	4021	}
4022	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	4022	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4023	pty_ev.set (EVENT_READ);	4023	pty_ev.set (ev::READ);
4024	}	4024	}
4025		4025
4026	/----------------------- end-of-file (C source) -----------------------/	4026	/----------------------- end-of-file (C source) -----------------------/
4027		4027

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.393 by sasha, Tue Jan 15 23:21:17 2008 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.393 by sasha, Tue Jan 15 23:21:17 2008 UTC