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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.416 by root, Tue Jul 15 16:41:22 2008 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 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-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* 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
34	* 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
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
162		162
163	void	163	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font f = (fs)[fs->find_font (ch)];
168	wchar_t chr, alloc, ch2, *fname;	167	wchar_t chr, alloc, ch2, **fname;
169	int len;	168	int len;
170
171	fname = rxvt_utf8towcs (f->name);
172		169
173	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
174	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
175	{	172	{
176	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
197	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
198	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
199	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
201		198
		199	int width = 0;
		200	fname = rxvt_temp_buf<wchar_t *> (len);
		201	for (int i = 0; i < len; i++)
		202	{
		203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
		204	fname[i] = rxvt_utf8towcs (f->name);
202	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
203		207
204	max_it (width, 8+5); // for char + hex	208	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
206		210
207	if (y >= 0)	211	if (y >= 0)
208	{	212	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210	x = 0;	214	x = 0;
211	}	215	}
212		216
213	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
214		218
215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216		220
217	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
218	{	222	{
…		…
237	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
238	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
239	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
240	// }	244	// }
241	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
242	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
243
244	free (fname);	249	free (fname[i]);
		250	}
245		251
246	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
247	if (alloc)	253	if (alloc)
248	delete [] alloc;	254	delete [] alloc;
249	# endif	255	# endif
…		…
282	}	288	}
283		289
284	static int	290	static int
285	hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
286	{	292	{
287	// check wether this event corresponds to a hex digit	293	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	294	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	295	for (int index = 0; index < 8; index++)
290	{	296	{
291	KeySym k = XLookupKeysym (&ev, index);	297	KeySym k = XLookupKeysym (&ev, index);
292		298
…		…
416	*/	422	*/
417	shft = ev.state & ShiftMask;	423	shft = ev.state & ShiftMask;
418	ctrl = ev.state & ControlMask;	424	ctrl = ev.state & ControlMask;
419	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
420		426
421	if (numlock_state \|\| (ev.state & ModNumLockMask))
422	{
423	numlock_state = (ev.state & ModNumLockMask);
424	set_privmode (PrivMode_aplKP, !numlock_state);
425	}
426
427	kbuf[0] = 0;	427	kbuf[0] = 0;
428		428
429	#ifdef USE_XIM	429	#ifdef USE_XIM
430	if (Input_Context)	430	if (Input_Context)
431	{	431	{
…		…
505	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
506	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
507	#else	507	#else
508	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
509	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
510	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
511	{	513	{
512	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
513	return;	515	return;
514	}	516	}
…		…
579	}	581	}
580	}	582	}
581		583
582	#if ENABLE_FRILLS \|\| ISO_14755	584	#if ENABLE_FRILLS \|\| ISO_14755
583	// ISO 14755 support	585	// ISO 14755 support
584	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
585	{	587	{
586	int hv;	588	int hv;
587		589
588	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
589	&& (keysym == XK_space \|\| keysym == XK_KP_Space	591	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
619	scr_overlay_off ();	621	scr_overlay_off ();
620	# endif	622	# endif
621	iso14755buf = 0;	623	iso14755buf = 0;
622	}	624	}
623	}	625	}
		626	else if (option (Opt_iso14755) &&
624	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
625	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	628	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
626	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
627	{	630	{
628	iso14755buf \|= ISO_14755_STARTED;	631	iso14755buf \|= ISO_14755_STARTED;
629	# if ISO_14755	632	# if ISO_14755
630	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645	{	648	{
646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	649	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647	unsigned int newlen = 1;	650	unsigned int newlen = 1;
648		651
		652	if (ev.state & ModNumLockMask)
		653	kp = false;
		654
649	switch (translate_keypad (keysym, kp))	655	keysym = translate_keypad (keysym, kp);
		656
		657	switch (keysym)
650	{	658	{
651	#ifndef NO_BACKSPACE_KEY	659	#ifndef NO_BACKSPACE_KEY
652	case XK_BackSpace:	660	case XK_BackSpace:
653	if (priv_modes & PrivMode_HaveBackSpace)	661	if (priv_modes & PrivMode_HaveBackSpace)
654	{	662	{
…		…
881	commit_iso14755 ();	889	commit_iso14755 ();
882		890
883	return;	891	return;
884	}	892	}
885		893
886	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	894	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887	if (i[0] == keysym)	895	if (i[0] == keysym)
888	{	896	{
889	iso14755buf = ISO_14755_51 \| i[1];	897	iso14755buf = ISO_14755_51 \| i[1];
890	commit_iso14755 ();	898	commit_iso14755 ();
891		899
…		…
928	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)	936	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
929	mouse_slip_wheel_speed = 0;	937	mouse_slip_wheel_speed = 0;
930	#endif	938	#endif
931	}	939	}
932		940
933	#if defined (KEYSYM_RESOURCE)
934	unsigned int
935	rxvt_term::cmd_write (const char *str, unsigned int count)
936	{
937	unsigned int n, s;
938
939	n = cmdbuf_ptr - cmdbuf_base;
940	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942	if (n > 0 && s < count)
943	{
944	memmove (cmdbuf_base, cmdbuf_ptr,
945	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946	cmdbuf_ptr = cmdbuf_base;
947	cmdbuf_endp -= n;
948	s += n;
949	}
950
951	if (count > s)
952	{
953	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954	count = s;
955	}
956
957	for (; count--;)
958	cmdbuf_endp++ = str++;
959
960	cmd_parse ();
961
962	return 0;
963	}
964	#endif
965
966	void	941	void
967	rxvt_term::flush ()	942	rxvt_term::flush ()
968	{	943	{
969	flush_ev.stop ();	944	flush_ev.stop ();
970		945
971	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_BG_PIXMAP
972	if (bgPixmap.check_clearChanged ())	947	if (bg_flags & BG_NEEDS_REFRESH)
973	{	948	{
974	// scr_clear (true); This needs to be researched further!	949	bg_flags &= ~BG_NEEDS_REFRESH;
975	scr_touch (false);	950	scr_touch (false);
976	}	951	}
977	#endif	952	#endif
978		953
979	if (want_refresh)	954	if (want_refresh)
…		…
1024	}	999	}
1025		1000
1026	display->flush ();	1001	display->flush ();
1027	}	1002	}
1028		1003
1029	/* checks wether a refresh is requested and starts the refresh timer */	1004	/* checks whether a refresh is requested and starts the refresh timer */
1030	void	1005	void
1031	rxvt_term::refresh_check ()	1006	rxvt_term::refresh_check ()
1032	{	1007	{
1033	if (want_refresh && !flush_ev.is_active ())	1008	if (want_refresh && !flush_ev.is_active ())
1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1009	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1127	{	1102	{
1128	// this should really be sched_yield(), but the linux guys thought	1103	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1104	// that giving a process calling sched_yield () less cpu time than
1130	// ones with high nice levels is a useful thing to do. It surely is is	1105	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1106	// allowed by the sus... as is returning ENOSYS.
		1107	// since the linux guys additionally thought that breaking the only
		1108	// known workaround against their unusable sched_yield hack is cool,
		1109	// we just nanosleep a bit and hope for the best.
1132		1110
1133	struct timespec ts = { 0, 0 };	1111	struct timespec ts = { 0, 1000 };
1134	nanosleep (&ts, 0);	1112	nanosleep (&ts, 0);
1135		1113
1136	w.stop ();	1114	w.stop ();
1137	}	1115	}
1138		1116
…		…
1141	{	1119	{
1142	}	1120	}
1143	} event_handler;	1121	} event_handler;
1144	#endif	1122	#endif
1145		1123
		1124	/* make sure all the cmd data is at beginning of cmdbuf */
		1125	void
		1126	rxvt_term::cmdbuf_reify ()
		1127	{
		1128	if (cmdbuf_ptr == cmdbuf_base)
		1129	return;
		1130
		1131	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1132
		1133	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1134	cmdbuf_ptr = cmdbuf_base;
		1135	cmdbuf_endp = cmdbuf_ptr + used;
		1136
		1137	}
		1138
		1139	#if defined (KEYSYM_RESOURCE)
		1140	void
		1141	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1142	{
		1143	cmdbuf_reify ();
		1144
		1145	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1146
		1147	if (count > avail)
		1148	return;
		1149
		1150	memcpy (cmdbuf_endp, str, count);
		1151	cmdbuf_endp += count;
		1152
		1153	cmd_parse ();
		1154	}
		1155	#endif
		1156
1146	bool	1157	bool
1147	rxvt_term::pty_fill ()	1158	rxvt_term::pty_fill ()
1148	{	1159	{
1149	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1160	cmdbuf_reify ();
1150		1161
1151	if (CBUFSIZ == n)	1162	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152	{	1163
1153	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1164	if (!avail)
1154	n = 0;
1155	}	1165	{
1156		1166	// normally this indicates a "too long" command sequence - just drop the data we have
1157	memmove (cmdbuf_base, cmdbuf_ptr, n);
1158	cmdbuf_ptr = cmdbuf_base;	1167	cmdbuf_ptr = cmdbuf_base;
1159	cmdbuf_endp = cmdbuf_ptr + n;	1168	cmdbuf_endp = cmdbuf_ptr;
		1169	avail = CBUFSIZ;
		1170	}
1160		1171
1161	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1172	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162		1173
1163	if (r > 0)	1174	if (r > 0)
1164	{	1175	{
1165	cmdbuf_endp += r;	1176	cmdbuf_endp += r;
1166	return true;	1177	return true;
…		…
1188	{	1199	{
1189	make_current ();	1200	make_current ();
1190		1201
1191	if (revents & ev::READ)	1202	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1203	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1204	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1205	cmd_parse ();
1195	break;
1196		1206
1197	if (revents & ev::WRITE)	1207	if (revents & ev::WRITE)
1198	pty_write ();	1208	pty_write ();
1199		1209
1200	refresh_check ();	1210	refresh_check ();
…		…
1241	{	1251	{
1242	int button_number, key_state = 0;	1252	int button_number, key_state = 0;
1243	int x, y;	1253	int x, y;
1244	int code = 32;	1254	int code = 32;
1245		1255
1246	x = Pixel2Col (ev.x);	1256	x = Pixel2Col (ev.x) + 1;
1247	y = Pixel2Row (ev.y);	1257	y = Pixel2Row (ev.y) + 1;
		1258
1248	if (ev.type == MotionNotify)	1259	if (ev.type == MotionNotify)
1249	{	1260	{
1250	if (x == mouse_row && y == mouse_col)	1261	if (x == mouse_row && y == mouse_col)
1251	return;	1262	return;
		1263
1252	mouse_row = x;	1264	mouse_row = x;
1253	mouse_col = y;	1265	mouse_col = y;
1254	code += 32;	1266	code += 32;
1255	}	1267	}
1256		1268
…		…
1259	else	1271	else
1260	{	1272	{
1261	button_number = MEvent.button - Button1;	1273	button_number = MEvent.button - Button1;
1262	/* add 0x3D for wheel events, like xterm does */	1274	/* add 0x3D for wheel events, like xterm does */
1263	if (button_number >= 3)	1275	if (button_number >= 3)
1264	button_number += (64 - 3);	1276	button_number += 64 - 3;
1265	}	1277	}
1266		1278
1267	if (priv_modes & PrivMode_MouseX10)	1279	if (priv_modes & PrivMode_MouseX10)
1268	{	1280	{
1269	/*	1281	/*
…		…
1301	fputc ('A', stderr);	1313	fputc ('A', stderr);
1302	if (key_state & 32)	1314	if (key_state & 32)
1303	fputc ('2', stderr);	1315	fputc ('2', stderr);
1304	fprintf (stderr, "]: <%d>, %d/%d\n",	1316	fprintf (stderr, "]: <%d>, %d/%d\n",
1305	button_number,	1317	button_number,
1306	x + 1,	1318	x,
1307	y + 1);	1319	y);
1308	#endif	1320	#endif
1309		1321
		1322	#if ENABLE_FRILLS
		1323	if (priv_modes & PrivMode_ExtMouseRight)
		1324	tt_printf ("\033[%d;%d;%dM",
		1325	code + button_number + key_state,
		1326	x,
		1327	y);
		1328	else if (priv_modes & PrivMode_ExtModeMouse)
		1329	tt_printf ("\033[M%c%lc%lc",
		1330	code + button_number + key_state,
		1331	wint_t (32 + x),
		1332	wint_t (32 + y));
		1333	else
		1334	#endif
1310	tt_printf ("\033[M%c%c%c",	1335	tt_printf ("\033[M%c%c%c",
1311	(code + button_number + key_state),	1336	code + button_number + key_state,
1312	(32 + x + 1),	1337	32 + x,
1313	(32 + y + 1));	1338	32 + y);
1314	}	1339	}
1315		1340
1316	/{{{ process an X event /	1341	/{{{ process an X event /
1317	void	1342	void
1318	rxvt_term::x_cb (XEvent &ev)	1343	rxvt_term::x_cb (XEvent &ev)
…		…
1420	&& ev.xfocus.mode != NotifyGrab)	1445	&& ev.xfocus.mode != NotifyGrab)
1421	focus_out ();	1446	focus_out ();
1422	break;	1447	break;
1423		1448
1424	case ConfigureNotify:	1449	case ConfigureNotify:
1425	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427	szHint.width, szHint.height);*/
1428	if (ev.xconfigure.window == parent[0])	1450	if (ev.xconfigure.window == parent)
1429	{	1451	{
1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431	;	1453	;
		1454
		1455	#ifdef HAVE_BG_PIXMAP
		1456	bool moved = false;
		1457	if (bg_window_position_sensitive ())
		1458	{
		1459	int x, y;
		1460	if (ev.xconfigure.send_event)
		1461	{
		1462	x = ev.xconfigure.x;
		1463	y = ev.xconfigure.y;
		1464	}
		1465	else
		1466	get_window_origin (x, y);
		1467
		1468	if (bg_set_position (x, y)
		1469	\|\| !(bg_flags & BG_IS_VALID))
		1470	moved = true;
		1471	}
		1472	#endif
1432		1473
1433	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1474	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1434	{	1475	{
1435	seen_resize = 1;	1476	seen_resize = 1;
1436	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1477	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437	}	1478	}
1438	else	1479	else
1439	{	1480	{
1440	#ifdef HAVE_BG_PIXMAP	1481	#ifdef HAVE_BG_PIXMAP
1441	if (bgPixmap.window_position_sensitive ())	1482	if (moved)
1442	{	1483	{
1443	if (mapped)	1484	if (mapped)
1444	update_background ();	1485	update_background ();
1445	else	1486	else
1446	bgPixmap.invalidate ();	1487	bg_invalidate ();
1447	}	1488	}
1448	#endif	1489	#endif
1449	}	1490	}
1450		1491
1451	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1492	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452	}	1493	}
1453	break;	1494	break;
1454		1495
1455	case PropertyNotify:	1496	case PropertyNotify:
1456	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1497	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458	&& ev.xproperty.state == PropertyNewValue)
1459	selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461	break;	1498	break;
1462		1499
1463	case SelectionClear:	1500	case SelectionClear:
1464	selection_clear ();	1501	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465	break;
1466
1467	case SelectionNotify:
1468	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470	break;	1502	break;
1471		1503
1472	case SelectionRequest:	1504	case SelectionRequest:
1473	selection_send (ev.xselectionrequest);	1505	selection_send (ev.xselectionrequest);
1474	break;	1506	break;
1475		1507
1476	case MapNotify:	1508	case MapNotify:
1477	#ifdef HAVE_BG_PIXMAP	1509	#ifdef HAVE_BG_PIXMAP
1478	/* This is needed spcifically to fix the case of no window manager or a	1510	/* This is needed specifically to fix the case of no window manager or a
1479	* non-reparenting window manager. In those cases we never get first	1511	* non-reparenting window manager. In those cases we never get first
1480	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1512	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1481	* care of multiplicity of ConfigureNotify events arriwing while WM does	1513	* care of multiplicity of ConfigureNotify events arriving while WM does
1482	* reparenting.	1514	* reparenting.
1483	* We should not render background immidiately, as there could be several	1515	* We should not render background immediately, as there could be several
1484	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1516	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485	* by scheduling background redraw as soon as we can, but giving a short	1517	* by scheduling background redraw as soon as we can, but giving a short
1486	* bit of time for ConfigureNotifies to arrive.	1518	* bit of time for ConfigureNotifies to arrive.
1487	* We should render background PRIOR to drawing any text, but AFTER all	1519	* We should render background PRIOR to drawing any text, but AFTER all
1488	* of ConfigureNotifys for the best results.	1520	* of ConfigureNotifys for the best results.
1489	*/	1521	*/
1490	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1522	if (!(bg_flags & BG_IS_VALID))
1491	update_background_ev.start (0.025);	1523	update_background_ev.start (0.025);
1492	#endif	1524	#endif
1493	mapped = 1;	1525	mapped = 1;
1494	#ifdef TEXT_BLINK	1526	#ifdef TEXT_BLINK
1495	text_blink_ev.start ();	1527	text_blink_ev.start ();
…		…
1510	if (ev.xany.window == vt)	1542	if (ev.xany.window == vt)
1511	{	1543	{
1512	do	1544	do
1513	{	1545	{
1514	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1515	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, false);
1516	}	1548	}
1517	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1549	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518		1550
1519	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1551	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520		1552
1521	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1553	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522	{	1554	{
1523	scr_expose (ev.xexpose.x, ev.xexpose.y,	1555	scr_expose (ev.xexpose.x, ev.xexpose.y,
1524	ev.xexpose.width, ev.xexpose.height, False);	1556	ev.xexpose.width, ev.xexpose.height, false);
1525	}	1557	}
1526		1558
1527	want_refresh = 1;	1559	want_refresh = 1;
1528	}	1560	}
1529	else	1561	else
…		…
1682	#endif	1714	#endif
1683		1715
1684	refresh_check ();	1716	refresh_check ();
1685	}	1717	}
1686		1718
		1719	#if ENABLE_FRILLS
		1720	void
		1721	rxvt_term::set_urgency (bool enable)
		1722	{
		1723	if (enable == urgency_hint)
		1724	return;
		1725
		1726	if (XWMHints *h = XGetWMHints (dpy, parent))
		1727	{
		1728	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1729	XSetWMHints (dpy, parent, h);
		1730	urgency_hint = enable;
		1731	}
		1732	}
		1733	#endif
		1734
1687	void	1735	void
1688	rxvt_term::focus_in ()	1736	rxvt_term::focus_in ()
1689	{	1737	{
1690	if (!focus)	1738	if (!focus)
1691	{	1739	{
1692	focus = 1;	1740	focus = 1;
1693	want_refresh = 1;	1741	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1742
1697	#if USE_XIM	1743	#if USE_XIM
1698	if (Input_Context != NULL)	1744	if (Input_Context != NULL)
1699	{	1745	{
1700	IMSetPosition ();	1746	IMSetPosition ();
…		…
1712	scr_recolour ();	1758	scr_recolour ();
1713	}	1759	}
1714	#endif	1760	#endif
1715	#if ENABLE_FRILLS	1761	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1762	if (option (Opt_urgentOnBell))
1717	{	1763	set_urgency (0);
1718	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719	{
1720	h->flags &= ~XUrgencyHint;
1721	XSetWMHints (dpy, parent[0], h);
1722	}
1723	}
1724	#endif	1764	#endif
		1765
		1766	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1767	}
1726	}	1768	}
1727		1769
1728	void	1770	void
1729	rxvt_term::focus_out ()	1771	rxvt_term::focus_out ()
…		…
1731	if (focus)	1773	if (focus)
1732	{	1774	{
1733	focus = 0;	1775	focus = 0;
1734	want_refresh = 1;	1776	want_refresh = 1;
1735		1777
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1778	#if ENABLE_FRILLS
1737		1779	if (option (Opt_urgentOnBell))
		1780	set_urgency (0);
		1781	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1782	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1783	if (iso14755buf)
1740	{	1784	{
1741	iso14755buf = 0;	1785	iso14755buf = 0;
1742	# if ISO_14755	1786	# if ISO_14755
…		…
1759	{	1803	{
1760	pix_colors = pix_colors_unfocused;	1804	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1805	scr_recolour ();
1762	}	1806	}
1763	#endif	1807	#endif
		1808
		1809	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1810	}
1765	}	1811	}
1766		1812
1767	void	1813	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1814	rxvt_term::update_fade_color (unsigned int idx)
…		…
1796	* use the property to determine the pixmap. We use it later on.	1842	* use the property to determine the pixmap. We use it later on.
1797	*/	1843	*/
1798	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1844	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1845	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800	{	1846	{
1801	bgPixmap.set_root_pixmap ();	1847	bg_set_root_pixmap ();
1802	update_background ();	1848	update_background ();
1803	}	1849	}
1804		1850
1805	break;	1851	break;
1806	}	1852	}
…		…
1845	/* save the xbutton state (for ButtonRelease) */	1891	/* save the xbutton state (for ButtonRelease) */
1846	MEvent.state = ev.state;	1892	MEvent.state = ev.state;
1847	#ifdef MOUSE_REPORT_DOUBLECLICK	1893	#ifdef MOUSE_REPORT_DOUBLECLICK
1848	if (ev.button == MEvent.button && clickintime)	1894	if (ev.button == MEvent.button && clickintime)
1849	{	1895	{
1850	/* same button, within alloted time */	1896	/* same button, within allowed time */
1851	MEvent.clicks++;	1897	MEvent.clicks++;
1852		1898
1853	if (MEvent.clicks > 1)	1899	if (MEvent.clicks > 1)
1854	{	1900	{
1855	/* only report double clicks */	1901	/* only report double clicks */
…		…
2126	selection_make (ev.time);	2172	selection_make (ev.time);
2127	break;	2173	break;
2128		2174
2129	case Button2:	2175	case Button2:
2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2176	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2177	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132	break;	2178	break;
2133		2179
2134	#ifdef MOUSE_WHEEL	2180	#ifdef MOUSE_WHEEL
2135	case Button4:	2181	case Button4:
2136	case Button5:	2182	case Button5:
…		…
2170	}	2216	}
2171	}	2217	}
2172		2218
2173	/}}} /	2219	/}}} /
2174		2220
2175	bool	2221	void
2176	rxvt_term::cmd_parse ()	2222	rxvt_term::cmd_parse ()
2177	{	2223	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2224	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2225	char *seq_begin; // remember start of esc-sequence here
2181		2226
2182	for (;;)	2227	for (;;)
2183	{	2228	{
2184	if (ch == NOCHAR)	2229	if (expect_false (ch == NOCHAR))
2185	{	2230	{
2186	seq_begin = cmdbuf_ptr;	2231	seq_begin = cmdbuf_ptr;
2187	ch = next_char ();	2232	ch = next_char ();
2188		2233
2189	if (ch == NOCHAR)	2234	if (ch == NOCHAR)
2190	break;	2235	break;
2191	}	2236	}
2192		2237
2193	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2238	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2194	{	2239	{
2195	if (!seen_input)	2240	if (expect_false (!seen_input))
2196	{	2241	{
2197	seen_input = 1;	2242	seen_input = 1;
2198	// many badly-written programs (e.g. jed) contain a race condition:	2243	// many badly-written programs (e.g. jed) contain a race condition:
2199	// they first read the screensize and then install a SIGWINCH handler.	2244	// they first read the screensize and then install a SIGWINCH handler.
2200	// some window managers resize the window early, and these programs	2245	// some window managers resize the window early, and these programs
…		…
2213	wchar_t *str = buf;	2258	wchar_t *str = buf;
2214	wchar_t *eol = str + min (ncol, UBUFSIZ);	2259	wchar_t *eol = str + min (ncol, UBUFSIZ);
2215		2260
2216	for (;;)	2261	for (;;)
2217	{	2262	{
2218	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2263	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219	break;	2264	break;
2220		2265
2221	*str++ = ch;	2266	*str++ = ch;
2222		2267
2223	if (ch == C0_LF \|\| str >= eol)	2268	if (expect_false (ch == C0_LF \|\| str >= eol))
2224	{	2269	{
2225	if (ch == C0_LF)	2270	if (ch == C0_LF)
2226	nlines++;	2271	nlines++;
2227		2272
2228	refresh_count++;	2273	refresh_count++;
…		…
2277	* What the heck we'll cheat and only refresh less than every page-full.	2322	* What the heck we'll cheat and only refresh less than every page-full.
2278	* if skipScroll is enabled.	2323	* if skipScroll is enabled.
2279	*/	2324	*/
2280	if (refreshnow)	2325	if (refreshnow)
2281	{	2326	{
2282	flag = true;
2283	scr_refresh ();	2327	scr_refresh ();
2284	want_refresh = 1;	2328	want_refresh = 1;
2285	}	2329	}
2286
2287	}	2330	}
2288	else	2331	else
2289	{	2332	{
2290	try	2333	try
2291	{	2334	{
…		…
2299	}	2342	}
2300		2343
2301	ch = NOCHAR;	2344	ch = NOCHAR;
2302	}	2345	}
2303	}	2346	}
2304
2305	return flag;
2306	}	2347	}
2307		2348
2308	// read the next character	2349	// read the next character
2309	wchar_t	2350	wchar_t
2310	rxvt_term::next_char () NOTHROW	2351	rxvt_term::next_char () NOTHROW
2311	{	2352	{
2312	while (cmdbuf_ptr < cmdbuf_endp)	2353	while (cmdbuf_ptr < cmdbuf_endp)
2313	{	2354	{
2314	// assume 7-bit to be ascii ALWAYS	2355	// assume 7-bit to be ascii ALWAYS
2315	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2356	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2316	return *cmdbuf_ptr++;	2357	return *cmdbuf_ptr++;
2317		2358
2318	wchar_t wc;	2359	wchar_t wc;
2319	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2360	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320		2361
…		…
2325	break;	2366	break;
2326	}	2367	}
2327		2368
2328	if (len == (size_t)-1)	2369	if (len == (size_t)-1)
2329	{	2370	{
2330	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2371	mbstate.reset (); // reset now undefined conversion state
2331	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2372	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332	}	2373	}
2333		2374
2334	// assume wchar == unicode	2375	// assume wchar == unicode
2335	cmdbuf_ptr += len;	2376	cmdbuf_ptr += len;
…		…
2348	: NOCHAR;	2389	: NOCHAR;
2349	}	2390	}
2350		2391
2351	static class out_of_input out_of_input;	2392	static class out_of_input out_of_input;
2352		2393
2353	/* rxvt_cmd_getc () - Return next input character */
2354	/*
2355	* Return the next input character after first passing any keyboard input
2356	* to the command.
2357	*/
2358	wchar_t	2394	wchar_t
2359	rxvt_term::cmd_getc () THROW ((class out_of_input))	2395	rxvt_term::cmd_getc () THROW ((class out_of_input))
2360	{	2396	{
2361	wchar_t c = next_char ();	2397	wchar_t c = next_char ();
2362		2398
…		…
2644		2680
2645	/* 8.3.87: NEXT LINE */	2681	/* 8.3.87: NEXT LINE */
2646	case C1_NEL: /* ESC E */	2682	case C1_NEL: /* ESC E */
2647	{	2683	{
2648	wchar_t nlcr[] = { C0_LF, C0_CR };	2684	wchar_t nlcr[] = { C0_LF, C0_CR };
2649	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2685	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2650	}	2686	}
2651	break;	2687	break;
2652		2688
2653	/* kidnapped escape sequence: Should be 8.3.48 */	2689	/* kidnapped escape sequence: Should be 8.3.48 */
2654	case C1_ESA: /* ESC G */	2690	case C1_ESA: /* ESC G */
2655	process_graphics ();	2691	// used by original rxvt for rob nations own graphics mode
		2692	if (cmd_getc () == 'Q')
		2693	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2656	break;	2694	break;
2657		2695
2658	/* 8.3.63: CHARACTER TABULATION SET */	2696	/* 8.3.63: CHARACTER TABULATION SET */
2659	case C1_HTS: /* ESC H */	2697	case C1_HTS: /* ESC H */
2660	scr_set_tab (1);	2698	scr_set_tab (1);
…		…
2679	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2717	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2680	case C1_SCI: /* ESC Z */	2718	case C1_SCI: /* ESC Z */
2681	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2719	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2682	break; /* steal obsolete ESC [ c */	2720	break; /* steal obsolete ESC [ c */
2683		2721
2684	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2722	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2685	case C1_CSI: /* ESC [ */	2723	case C1_CSI: /* ESC [ */
2686	process_csi_seq ();	2724	process_csi_seq ();
2687	break;	2725	break;
2688		2726
2689	/* 8.3.90: OPERATING SYSTEM COMMAND */	2727	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2690	case C1_OSC: /* ESC ] */	2728	case C1_OSC: /* ESC ] */
2691	process_osc_seq ();	2729	process_osc_seq ();
2692	break;	2730	break;
2693		2731
2694	/* 8.3.106: RESET TO INITIAL STATE */	2732	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2695	case 'c':	2733	case 'c':
2696	mbstate.reset ();	2734	mbstate.reset ();
2697	scr_poweron ();	2735	scr_poweron ();
2698	scrollBar.show (1);	2736	scrollBar.show (1);
2699	break;	2737	break;
…		…
2723	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2761	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2724	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2762	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2725	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2763	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2726	};	2764	};
2727		2765
2728	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2766	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2729	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \	2767	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \
2730	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))	2768	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))
2731	#define get_byte_array_bit(array, bit) \	2769	#define get_byte_array_bit(array, bit) \
2732	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2770	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2733		2771
2734	const unsigned char csi_defaults[] =	2772	static const unsigned char csi_defaults[] =
2735	{	2773	{
2736	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2774	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2737	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2775	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2738	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2776	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2739	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2777	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
…		…
2754		2792
2755	nargs = 0;	2793	nargs = 0;
2756		2794
2757	priv = 0;	2795	priv = 0;
2758	ch = cmd_getc ();	2796	ch = cmd_getc ();
2759	if (ch >= '<' && ch <= '?')	2797	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2760	{	2798	{
2761	/* '<' '=' '>' '?' */	2799	/* '<' '=' '>' '?' '!' */
2762	priv = ch;	2800	priv = ch;
2763	ch = cmd_getc ();	2801	ch = cmd_getc ();
2764	}	2802	}
2765		2803
2766	/* read any numerical arguments */	2804	/* read any numerical arguments */
…		…
2820		2858
2821	case '?':	2859	case '?':
2822	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2860	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2823	process_terminal_mode (ch, priv, nargs, arg);	2861	process_terminal_mode (ch, priv, nargs, arg);
2824	break;	2862	break;
		2863
		2864	case '!':
		2865	if (ch == CSI_70)
		2866	{
		2867	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2868	scr_soft_reset ();
		2869
		2870	static const int pm_h[] = { 7, 25 };
		2871	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
		2872
		2873	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
		2874	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2825	}	2875	}
		2876	break;
		2877	}
		2878
2826	return;	2879	return;
2827	}	2880	}
2828		2881
2829	switch (ch)	2882	switch (ch)
2830	{	2883	{
…		…
3064	{	3117	{
3065	/*	3118	/*
3066	* commands	3119	* commands
3067	*/	3120	*/
3068	case 1: /* deiconify window */	3121	case 1: /* deiconify window */
3069	XMapWindow (dpy, parent[0]);	3122	XMapWindow (dpy, parent);
3070	break;	3123	break;
3071	case 2: /* iconify window */	3124	case 2: /* iconify window */
3072	XIconifyWindow (dpy, parent[0], display->screen);	3125	XIconifyWindow (dpy, parent, display->screen);
3073	break;	3126	break;
3074	case 3: /* set position (pixels) */	3127	case 3: /* set position (pixels) */
3075	XMoveWindow (dpy, parent[0], args[1], args[2]);	3128	XMoveWindow (dpy, parent, args[1], args[2]);
3076	break;	3129	break;
3077	case 4: /* set size (pixels) */	3130	case 4: /* set size (pixels) */
3078	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3131	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3079	break;	3132	break;
3080	case 5: /* raise window */	3133	case 5: /* raise window */
3081	XRaiseWindow (dpy, parent[0]);	3134	XRaiseWindow (dpy, parent);
3082	break;	3135	break;
3083	case 6: /* lower window */	3136	case 6: /* lower window */
3084	XLowerWindow (dpy, parent[0]);	3137	XLowerWindow (dpy, parent);
3085	break;	3138	break;
3086	case 7: /* refresh window */	3139	case 7: /* refresh window */
3087	scr_touch (true);	3140	scr_touch (true);
3088	break;	3141	break;
3089	case 8: /* set size (chars) */	3142	case 8: /* set size (chars) */
…		…
3100		3153
3101	/*	3154	/*
3102	* reports - some output format copied from XTerm	3155	* reports - some output format copied from XTerm
3103	*/	3156	*/
3104	case 11: /* report window state */	3157	case 11: /* report window state */
3105	XGetWindowAttributes (dpy, parent[0], &wattr);	3158	XGetWindowAttributes (dpy, parent, &wattr);
3106	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3159	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3107	break;	3160	break;
3108	case 13: /* report window position */	3161	case 13: /* report window position */
3109	XGetWindowAttributes (dpy, parent[0], &wattr);	3162	XGetWindowAttributes (dpy, parent, &wattr);
3110	XTranslateCoordinates (dpy, parent[0], wattr.root,	3163	XTranslateCoordinates (dpy, parent, wattr.root,
3111	-wattr.border_width, -wattr.border_width,	3164	-wattr.border_width, -wattr.border_width,
3112	&x, &y, &wdummy);	3165	&x, &y, &wdummy);
3113	tt_printf ("\033[3;%d;%dt", x, y);	3166	tt_printf ("\033[3;%d;%dt", x, y);
3114	break;	3167	break;
3115	case 14: /* report window size (pixels) */	3168	case 14: /* report window size (pixels) */
3116	XGetWindowAttributes (dpy, parent[0], &wattr);	3169	XGetWindowAttributes (dpy, parent, &wattr);
3117	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3170	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3118	break;	3171	break;
3119	case 18: /* report text area size (chars) */	3172	case 18: /* report text area size (chars) */
3120	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3173	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3121	break;	3174	break;
…		…
3123	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3176	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3124	break;	3177	break;
3125	case 20: /* report icon label */	3178	case 20: /* report icon label */
3126	{	3179	{
3127	char *s;	3180	char *s;
3128	XGetIconName (dpy, parent[0], &s);	3181	XGetIconName (dpy, parent, &s);
3129	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3182	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3130	XFree (s);	3183	XFree (s);
3131	}	3184	}
3132	break;	3185	break;
3133	case 21: /* report window title */	3186	case 21: /* report window title */
3134	{	3187	{
3135	char *s;	3188	char *s;
3136	XFetchName (dpy, parent[0], &s);	3189	XFetchName (dpy, parent, &s);
3137	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3190	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3138	XFree (s);	3191	XFree (s);
3139	}	3192	}
3140	break;	3193	break;
3141	}	3194	}
…		…
3197	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3250	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3198	*/	3251	*/
3199	void	3252	void
3200	rxvt_term::process_dcs_seq ()	3253	rxvt_term::process_dcs_seq ()
3201	{	3254	{
3202	char *s;
3203	unicode_t eh;
3204
3205	/*	3255	/*
3206	* Not handled yet	3256	* Not handled yet
3207	*/	3257	*/
		3258
		3259	unicode_t eh;
3208	s = get_to_st (eh);	3260	char *s = get_to_st (eh);
3209	if (s)	3261	if (s)
3210	free (s);	3262	free (s);
3211		3263
3212	return;	3264	return;
3213	}	3265	}
…		…
3217	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3269	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3218	*/	3270	*/
3219	void	3271	void
3220	rxvt_term::process_osc_seq ()	3272	rxvt_term::process_osc_seq ()
3221	{	3273	{
3222	unicode_t ch, eh;
3223	int arg;	3274	int arg;
3224		3275
3225	ch = cmd_getc ();	3276	unicode_t ch = cmd_getc ();
3226	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3277	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3227	arg = arg * 10 + (ch - '0');	3278	arg = arg * 10 + (ch - '0');
3228		3279
3229	if (ch == ';')	3280	if (ch == ';')
3230	{	3281	{
		3282	unicode_t eh;
3231	char *s = get_to_st (eh);	3283	char *s = get_to_st (eh);
3232		3284
3233	if (s)	3285	if (s)
3234	{	3286	{
3235	process_xterm_seq (arg, s, eh);	3287	process_xterm_seq (arg, s, eh);
…		…
3259		3311
3260	/*	3312	/*
3261	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3313	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3262	*/	3314	*/
3263	void	3315	void
3264	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3316	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3265	{	3317	{
3266	int color;	3318	int color;
3267	char buf, name;	3319	char buf, name;
3268	bool query = str[0] == '?' && !str[1];	3320	bool query = str[0] == '?' && !str[1];
3269	int saveop = op;	3321	int saveop = op;
…		…
3296	unsigned long bytes_after;	3348	unsigned long bytes_after;
3297	unsigned char *value = 0;	3349	unsigned char *value = 0;
3298	const char *str = "";	3350	const char *str = "";
3299		3351
3300	if (prop	3352	if (prop
3301	&& XGetWindowProperty (dpy, parent[0],	3353	&& XGetWindowProperty (dpy, parent,
3302	prop, 0, 1<<16, 0, AnyPropertyType,	3354	prop, 0, 1<<16, 0, AnyPropertyType,
3303	&actual_type, &actual_format,	3355	&actual_type, &actual_format,
3304	&nitems, &bytes_after, &value) == Success	3356	&nitems, &bytes_after, &value) == Success
3305	&& actual_type != None	3357	&& actual_type != None
3306	&& actual_format == 8)	3358	&& actual_format == 8)
…		…
3310		3362
3311	XFree (value);	3363	XFree (value);
3312	}	3364	}
3313	else	3365	else
3314	{	3366	{
3315	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3367	char *eq = strchr (str, '=');
3316		3368
3317	if (eq)	3369	if (eq)
3318	{	3370	{
3319	*eq = 0;	3371	*eq = 0;
3320	set_utf8_property (display->atom (str), eq + 1);	3372	set_utf8_property (display->atom (str), eq + 1);
3321	}	3373	}
3322	else	3374	else
3323	XDeleteProperty (dpy, parent[0],	3375	XDeleteProperty (dpy, parent,
3324	display->atom (str));	3376	display->atom (str));
3325	}	3377	}
3326	break;	3378	break;
3327		3379
3328	case XTerm_Color:	3380	case XTerm_Color:
…		…
3360	process_color_seq (op, Color_pointer_fg, str, resp);	3412	process_color_seq (op, Color_pointer_fg, str, resp);
3361	break;	3413	break;
3362	case XTerm_Color_pointer_bg:	3414	case XTerm_Color_pointer_bg:
3363	process_color_seq (op, Color_pointer_bg, str, resp);	3415	process_color_seq (op, Color_pointer_bg, str, resp);
3364	break;	3416	break;
		3417	#ifdef OPTION_HC
		3418	case XTerm_Color_HC:
		3419	process_color_seq (op, Color_HC, str, resp);
		3420	break;
		3421	case XTerm_Color_HTC:
		3422	process_color_seq (op, Color_HTC, str, resp);
		3423	break;
		3424	#endif
3365	#ifndef NO_BOLD_UNDERLINE_REVERSE	3425	#ifndef NO_BOLD_UNDERLINE_REVERSE
3366	case XTerm_Color_RV:
3367	process_color_seq (op, Color_RV, str, resp);
3368	break;
3369	case Rxvt_Color_BD:
3370	case URxvt_Color_BD:	3426	case URxvt_Color_BD:
3371	process_color_seq (op, Color_BD, str, resp);	3427	process_color_seq (op, Color_BD, str, resp);
3372	break;	3428	break;
3373	case Rxvt_Color_UL:
3374	case URxvt_Color_UL:	3429	case URxvt_Color_UL:
3375	process_color_seq (op, Color_UL, str, resp);	3430	process_color_seq (op, Color_UL, str, resp);
3376	break;	3431	break;
3377	case URxvt_Color_IT:	3432	case URxvt_Color_IT:
3378	process_color_seq (op, Color_IT, str, resp);	3433	process_color_seq (op, Color_IT, str, resp);
3379	break;	3434	break;
3380	#endif	3435	#endif
		3436	case URxvt_Color_border:
		3437	process_color_seq (op, Color_border, str, resp);
		3438	break;
3381	#if ENABLE_TRANSPARENCY	3439	#if ENABLE_TRANSPARENCY
3382	case URxvt_Color_tint:	3440	case URxvt_Color_tint:
3383	process_color_seq (op, Color_tint, str, resp);	3441	process_color_seq (op, Color_tint, str, resp);
3384	{	3442	{
3385	bool changed = false;	3443	bool changed = false;
3386		3444
3387	if (ISSET_PIXCOLOR (Color_tint))	3445	if (ISSET_PIXCOLOR (Color_tint))
3388	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3446	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3389	else
3390	changed = bgPixmap.unset_tint ();
3391		3447
3392	if (changed)	3448	if (changed)
3393	update_background ();	3449	update_background ();
3394	}	3450	}
3395		3451
…		…
3400	case Rxvt_Pixmap:	3456	case Rxvt_Pixmap:
3401	if (!strcmp (str, "?"))	3457	if (!strcmp (str, "?"))
3402	{	3458	{
3403	char str[256];	3459	char str[256];
3404		3460
3405	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3461	sprintf (str, "[%dx%d+%d+%d]",
3406	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3462	min (h_scale, 32767), min (v_scale, 32767),
3407	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3463	min (h_align, 32767), min (v_align, 32767));
3408	process_xterm_seq (XTerm_title, str, CHAR_ST);	3464	process_xterm_seq (XTerm_title, str, CHAR_ST);
3409	}	3465	}
3410	else	3466	else
3411	{	3467	{
3412	int changed = 0;	3468	int changed = 0;
3413		3469
3414	if (*str != ';')	3470	if (*str != ';')
3415	{	3471	{
3416	/* reset to default scaling :*/
3417	bgPixmap.unset_geometry ();
3418	if (bgPixmap.set_file (str)) /* change pixmap */	3472	if (bg_set_file (str)) /* change pixmap */
		3473	{
3419	changed++;	3474	changed++;
3420	str = strchr (str, ';');	3475	str = strchr (str, ';');
3421	if (str == NULL)	3476	if (str == NULL)
3422	bgPixmap.set_defaultGeometry ();	3477	bg_set_default_geometry ();
		3478	else
		3479	bg_set_geometry (str+1);
		3480	}
3423	}	3481	}
3424		3482	else
3425	while (str)
3426	{	3483	{
3427	str++;	3484	str++;
3428	if (bgPixmap.set_geometry (str))	3485	if (bg_set_geometry (str, true))
3429	changed++;	3486	changed++;
3430	str = strchr (str, ';');
3431	}	3487	}
3432		3488
3433	if (changed)	3489	if (changed)
		3490	{
		3491	if (bg_window_position_sensitive ())
		3492	{
		3493	int x, y;
		3494	get_window_origin (x, y);
		3495	bg_set_position (x, y);
		3496	}
3434	update_background ();	3497	update_background ();
		3498	}
3435	}	3499	}
3436	break;	3500	break;
3437	#endif	3501	#endif
3438		3502
3439	case XTerm_logfile:	3503	case XTerm_logfile:
…		…
3509	break;	3573	break;
3510	#endif	3574	#endif
3511		3575
3512	#if ENABLE_PERL	3576	#if ENABLE_PERL
3513	case URxvt_perl:	3577	case URxvt_perl:
3514	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3578	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3515	; // no responses yet
3516	break;	3579	break;
3517	#endif	3580	#endif
3518	}	3581	}
3519	}	3582	}
3520	/----------------------------------------------------------------------/	3583	/----------------------------------------------------------------------/
…		…
3543	{	3606	{
3544	if (mode == 'r')	3607	if (mode == 'r')
3545	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3608	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3546	else	3609	else
3547	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3610	state = (mode == 't') ? ! (priv_modes & bit) : mode;
		3611
3548	set_privmode (bit, state);	3612	set_privmode (bit, state);
3549	}	3613	}
3550		3614
3551	return state;	3615	return state;
3552	}	3616	}
…		…
3561	static const struct	3625	static const struct
3562	{	3626	{
3563	const int argval;	3627	const int argval;
3564	const unsigned long bit;	3628	const unsigned long bit;
3565	} argtopriv[] = {	3629	} argtopriv[] = {
3566	{ 1, PrivMode_aplCUR },	3630	{ 1, PrivMode_aplCUR }, // DECCKM
3567	{ 2, PrivMode_vt52 },	3631	{ 2, PrivMode_vt52 },
3568	{ 3, PrivMode_132 },	3632	{ 3, PrivMode_132 }, // DECCOLM
3569	{ 4, PrivMode_smoothScroll },	3633	{ 4, PrivMode_smoothScroll }, // DECSCLM
3570	{ 5, PrivMode_rVideo },	3634	{ 5, PrivMode_rVideo }, // DECSCNM
3571	{ 6, PrivMode_relOrigin },	3635	{ 6, PrivMode_relOrigin }, // DECOM
3572	{ 7, PrivMode_Autowrap },	3636	{ 7, PrivMode_Autowrap }, // DECAWM
3573	// 8, bi-directional support mode	3637	// 8, auto-repeat keys // DECARM
3574	{ 9, PrivMode_MouseX10 },	3638	{ 9, PrivMode_MouseX10 },
3575	// 18, 19 printing-related	3639	// 18 end FF to printer after print screen
		3640	// 19 Print screen prints full screen/scroll region
3576	{ 25, PrivMode_VisibleCursor },	3641	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3577	#ifdef scrollBar_esc	3642	#ifdef scrollBar_esc
3578	{ scrollBar_esc, PrivMode_scrollBar },	3643	{ scrollBar_esc, PrivMode_scrollBar },
3579	#endif	3644	#endif
3580	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3645	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3646	// 38, tektronix mode // DECTEK
3581	{ 40, PrivMode_132OK },	3647	{ 40, PrivMode_132OK },
3582	// 41 xterm more fixes NYI	3648	// 41 xterm more fixes NYI
3583	// 45 margin bell NYI	3649	// 45 margin bell NYI
3584	// 46 start logging	3650	// 46 start logging
3585	{ 47, PrivMode_Screen },	3651	{ 47, PrivMode_Screen },
3586	{ 66, PrivMode_aplKP },	3652	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3587	#ifndef NO_BACKSPACE_KEY	3653	#ifndef NO_BACKSPACE_KEY
3588	{ 67, PrivMode_BackSpace },	3654	{ 67, PrivMode_BackSpace }, // DECBKM
3589	#endif	3655	#endif
3590	{ 1000, PrivMode_MouseX11 },	3656	{ 1000, PrivMode_MouseX11 },
3591	{ 1002, PrivMode_MouseBtnEvent },	3657	{ 1002, PrivMode_MouseBtnEvent },
3592	{ 1003, PrivMode_MouseAnyEvent },	3658	{ 1003, PrivMode_MouseAnyEvent },
		3659	#if ENABLE_FRILLS
		3660	{ 1005, PrivMode_ExtModeMouse },
		3661	#endif
3593	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3662	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3594	{ 1011, PrivMode_Keypress }, // rxvt extension	3663	{ 1011, PrivMode_Keypress }, // rxvt extension
		3664	#if ENABLE_FRILLS
		3665	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3666	#endif
3595	// 1035 enable modifiers for alt, numlock NYI	3667	// 1035 enable modifiers for alt, numlock NYI
3596	// 1036 send ESC for meta keys NYI	3668	// 1036 send ESC for meta keys NYI
3597	// 1037 send DEL for keypad delete NYI	3669	// 1037 send DEL for keypad delete NYI
3598	{ 1047, PrivMode_Screen },	3670	{ 1047, PrivMode_Screen },
3599	// 1048 save and restore cursor	3671	// 1048 save and restore cursor, implemented in code
3600	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3672	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3601	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3673	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3602	{ 2004, PrivMode_BracketPaste },	3674	{ 2004, PrivMode_BracketPaste },
3603	};	3675	};
3604		3676
…		…
3614	for (i = 0; i < nargs; i++)	3686	for (i = 0; i < nargs; i++)
3615	{	3687	{
3616	state = -1;	3688	state = -1;
3617		3689
3618	/* basic handling */	3690	/* basic handling */
3619	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3691	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3620	if (argtopriv[j].argval == arg[i])	3692	if (argtopriv[j].argval == arg[i])
3621	{	3693	{
3622	state = privcases (mode, argtopriv[j].bit);	3694	state = privcases (mode, argtopriv[j].bit);
3623	break;	3695	break;
3624	}	3696	}
…		…
3632		3704
3633	scr_touch (true);	3705	scr_touch (true);
3634	break;	3706	break;
3635	#endif	3707	#endif
3636	case 1048: /* alternative cursor save */	3708	case 1048: /* alternative cursor save */
3637	case 1049:
3638	if (option (Opt_secondaryScreen))	3709	if (option (Opt_secondaryScreen))
3639	if (mode == 0)	3710	if (mode == 0)
3640	scr_cursor (RESTORE);	3711	scr_cursor (RESTORE);
3641	else if (mode == 1)	3712	else if (mode == 1)
3642	scr_cursor (SAVE);	3713	scr_cursor (SAVE);
…		…
3655	*/	3726	*/
3656	set_privmode (PrivMode_vt52, 1);	3727	set_privmode (PrivMode_vt52, 1);
3657	break;	3728	break;
3658	case 3: /* 80/132 */	3729	case 3: /* 80/132 */
3659	if (priv_modes & PrivMode_132OK)	3730	if (priv_modes & PrivMode_132OK)
3660	{
3661	scr_poweron ();
3662	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3731	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3663	}
3664	break;	3732	break;
3665	case 4: /* smooth scrolling */	3733	case 4: /* smooth scrolling */
3666	set_option (Opt_jumpScroll, !state);	3734	set_option (Opt_jumpScroll, !state);
3667	break;	3735	break;
3668	case 5: /* reverse video */	3736	case 5: /* reverse video */
…		…
3706	case 1003:	3774	case 1003:
3707	if (state)	3775	if (state)
3708	{	3776	{
3709	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3777	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3710	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3778	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3779	mouse_row = mouse_col = 0;
3711	vt_emask_mouse = PointerMotionMask;	3780	vt_emask_mouse = PointerMotionMask;
3712	}	3781	}
3713	else	3782	else
3714	vt_emask_mouse = NoEventMask;	3783	vt_emask_mouse = NoEventMask;
		3784
3715	vt_select_input ();	3785	vt_select_input ();
3716	break;	3786	break;
3717	case 1010: /* scroll to bottom on TTY output inhibit */	3787	case 1010: /* scroll to bottom on TTY output inhibit */
3718	set_option (Opt_scrollTtyOutput, !state);	3788	set_option (Opt_scrollTtyOutput, !state);
3719	break;	3789	break;
3720	case 1011: /* scroll to bottom on key press */	3790	case 1011: /* scroll to bottom on key press */
3721	set_option (Opt_scrollTtyKeypress, state);	3791	set_option (Opt_scrollTtyKeypress, state);
3722	break;	3792	break;
3723	case 1047: /* secondary screen w/ clearing last */	3793	case 1047: /* secondary screen w/ clearing last */
3724	if (option (Opt_secondaryScreen))	3794	if (option (Opt_secondaryScreen))
3725	if (current_screen != PRIMARY)	3795	if (!state)
3726	scr_erase_screen (2);	3796	scr_erase_screen (2);
		3797
3727	scr_change_screen (state);	3798	scr_change_screen (state);
3728	break;	3799	break;
3729	case 1049: /* secondary screen w/ clearing first */	3800	case 1049: /* secondary screen w/ clearing first */
		3801	if (option (Opt_secondaryScreen))
		3802	if (state)
		3803	scr_cursor (SAVE);
		3804
3730	scr_change_screen (state);	3805	scr_change_screen (state);
		3806
3731	if (option (Opt_secondaryScreen))	3807	if (option (Opt_secondaryScreen))
3732	if (current_screen != PRIMARY)	3808	if (state)
3733	scr_erase_screen (2);	3809	scr_erase_screen (2);
		3810	else
		3811	scr_cursor (RESTORE);
3734	break;	3812	break;
3735	default:	3813	default:
3736	break;	3814	break;
3737	}	3815	}
3738	}	3816	}
…		…
3891	}	3969	}
3892	}	3970	}
3893	}	3971	}
3894	/}}} /	3972	/}}} /
3895		3973
3896	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3897	void
3898	rxvt_term::process_graphics ()
3899	{
3900	unicode_t ch, cmd = cmd_getc ();
3901
3902	if (cmd == 'Q')
3903	{
3904	/* query graphics */
3905	tt_printf ("\033G0\012"); /* no graphics */
3906	return;
3907	}
3908	/* swallow other graphics sequences until terminating ':' */
3909	do
3910	ch = cmd_getc ();
3911	while (ch != ':');
3912	}
3913	/}}} /
3914
3915	/* ------------------------------------------------------------------------- */	3974	/* ------------------------------------------------------------------------- */
3916		3975
3917	/*	3976	/*
3918	* Send printf () formatted output to the command.	3977	* Send printf () formatted output to the command.
3919	* Only use for small amounts of data.	3978	* Only use for small amounts of data.
…		…
3932		3991
3933	/* ---------------------------------------------------------------------- */	3992	/* ---------------------------------------------------------------------- */
3934	/* Write data to the pty as typed by the user, pasted with the mouse,	3993	/* Write data to the pty as typed by the user, pasted with the mouse,
3935	* or generated by us in response to a query ESC sequence.	3994	* or generated by us in response to a query ESC sequence.
3936	*/	3995	*/
3937	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	3996	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3938		3997
3939	void	3998	void
3940	rxvt_term::tt_write (const char *data, unsigned int len)	3999	rxvt_term::tt_write (const char *data, unsigned int len)
3941	{	4000	{
3942	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4001	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3947		4006
3948	if (v_buflen == 0)	4007	if (v_buflen == 0)
3949	{	4008	{
3950	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	4009	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3951		4010
		4011	max_it (written, 0);
		4012
3952	if ((unsigned int)written == len)	4013	if (written == len)
3953	return;	4014	return;
3954		4015
3955	data += written;	4016	data += written;
3956	len -= written;	4017	len -= written;
3957	}	4018	}
3958		4019
3959	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4020	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3960		4021
3961	memcpy (v_buffer + v_buflen, data, len);	4022	memcpy (v_buffer + v_buflen, data, len);
3962	v_buflen += len;	4023	v_buflen += len;
3963		4024
3964	pty_ev.set (ev::READ \| ev::WRITE);	4025	pty_ev.set (ev::READ \| ev::WRITE);

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.416 by root, Tue Jul 15 16:41:22 2008 UTC vs. Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.416 by root, Tue Jul 15 16:41:22 2008 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC