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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.433 by root, Sat May 30 06:56:20 2009 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 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
…		…
251	#endif	257	#endif
252		258
253	void	259	void
254	rxvt_term::commit_iso14755 ()	260	rxvt_term::commit_iso14755 ()
255	{	261	{
256	wchar_t ch[2];
257
258	ch[0] = iso14755buf & ISO_14755_MASK;	262	wchar_t ch = iso14755buf & ISO_14755_MASK;
259	ch[1] = 0;
260		263
261	if (iso14755buf & ISO_14755_51)	264	if (iso14755buf & ISO_14755_51)
262	{	265	{
263	char mb[16];	266	char mb[MB_LEN_MAX];
264	int len;	267	int len;
265		268
266	// allow verbatim 0-bytes and control-bytes to be entered	269	// allow verbatim 0-bytes and control-bytes to be entered
267	if (ch[0] >= 0x20)	270	if (ch >= 0x20)
268	len = wcstombs (mb, ch, 16);	271	len = wctomb (mb, ch);
269	else	272	else
270	{	273	{
271	mb[0] = ch[0];	274	mb[0] = ch;
272	len = 1;	275	len = 1;
273	}	276	}
274		277
275	if (len > 0)	278	if (len > 0)
276	tt_write (mb, len);	279	tt_write (mb, len);
…		…
282	}	285	}
283		286
284	static int	287	static int
285	hex_keyval (XKeyEvent &ev)	288	hex_keyval (XKeyEvent &ev)
286	{	289	{
287	// check wether this event corresponds to a hex digit	290	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	291	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	292	for (int index = 0; index < 8; index++)
290	{	293	{
291	KeySym k = XLookupKeysym (&ev, index);	294	KeySym k = XLookupKeysym (&ev, index);
292		295
…		…
416	*/	419	*/
417	shft = ev.state & ShiftMask;	420	shft = ev.state & ShiftMask;
418	ctrl = ev.state & ControlMask;	421	ctrl = ev.state & ControlMask;
419	meta = ev.state & ModMetaMask;	422	meta = ev.state & ModMetaMask;
420		423
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;	424	kbuf[0] = 0;
428		425
429	#ifdef USE_XIM	426	#ifdef USE_XIM
430	if (Input_Context)	427	if (Input_Context)
431	{	428	{
…		…
505	#ifdef PAGING_CONTEXT_LINES	502	#ifdef PAGING_CONTEXT_LINES
506	lnsppg = nrow - PAGING_CONTEXT_LINES;	503	lnsppg = nrow - PAGING_CONTEXT_LINES;
507	#else	504	#else
508	lnsppg = nrow * 4 / 5;	505	lnsppg = nrow * 4 / 5;
509	#endif	506	#endif
		507	max_it (lnsppg, 1);
		508
510	if (keysym == XK_Prior)	509	if (keysym == XK_Prior)
511	{	510	{
512	scr_page (UP, lnsppg);	511	scr_page (UP, lnsppg);
513	return;	512	return;
514	}	513	}
…		…
567	selection_request (ev.time);	566	selection_request (ev.time);
568	return;	567	return;
569	#if TODO	568	#if TODO
570	/* rxvt extras */	569	/* rxvt extras */
571	case XK_KP_Add: /* Shift+KP_Add = bigger font */	570	case XK_KP_Add: /* Shift+KP_Add = bigger font */
572	change_font (FONT_UP);
573	return;	571	return;
574	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575	change_font (FONT_DN);
576	return;	573	return;
577	#endif	574	#endif
578	}	575	}
579	}	576	}
580	}	577	}
581		578
582	#if ENABLE_FRILLS \|\| ISO_14755	579	#if ENABLE_FRILLS \|\| ISO_14755
583	// ISO 14755 support	580	// ISO 14755 support
584	if (shft && ctrl)	581	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
585	{	582	{
586	int hv;	583	int hv;
587		584
588	if (iso14755buf & ISO_14755_51	585	if (iso14755buf & ISO_14755_51
589	&& (keysym == XK_space \|\| keysym == XK_KP_Space	586	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
619	scr_overlay_off ();	616	scr_overlay_off ();
620	# endif	617	# endif
621	iso14755buf = 0;	618	iso14755buf = 0;
622	}	619	}
623	}	620	}
		621	else if (option (Opt_iso14755) &&
624	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	622	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
625	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	623	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
626	if (!(iso14755buf & ISO_14755_STARTED))	624	if (!(iso14755buf & ISO_14755_STARTED))
627	{	625	{
628	iso14755buf \|= ISO_14755_STARTED;	626	iso14755buf \|= ISO_14755_STARTED;
629	# if ISO_14755	627	# if ISO_14755
630	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	628	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	642	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645	{	643	{
646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	644	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647	unsigned int newlen = 1;	645	unsigned int newlen = 1;
648		646
		647	if (ev.state & ModNumLockMask)
		648	kp = false;
		649
649	switch (translate_keypad (keysym, kp))	650	keysym = translate_keypad (keysym, kp);
		651
		652	switch (keysym)
650	{	653	{
651	#ifndef NO_BACKSPACE_KEY	654	#ifndef NO_BACKSPACE_KEY
652	case XK_BackSpace:	655	case XK_BackSpace:
653	if (priv_modes & PrivMode_HaveBackSpace)	656	if (priv_modes & PrivMode_HaveBackSpace)
654	{	657	{
…		…
881	commit_iso14755 ();	884	commit_iso14755 ();
882		885
883	return;	886	return;
884	}	887	}
885		888
886	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	889	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887	if (i[0] == keysym)	890	if (i[0] == keysym)
888	{	891	{
889	iso14755buf = ISO_14755_51 \| i[1];	892	iso14755buf = ISO_14755_51 \| i[1];
890	commit_iso14755 ();	893	commit_iso14755 ();
891		894
…		…
928	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)	931	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
929	mouse_slip_wheel_speed = 0;	932	mouse_slip_wheel_speed = 0;
930	#endif	933	#endif
931	}	934	}
932		935
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	936	void
967	rxvt_term::flush ()	937	rxvt_term::flush ()
968	{	938	{
969	flush_ev.stop ();	939	flush_ev.stop ();
970		940
971	#ifdef HAVE_BG_PIXMAP	941	#ifdef HAVE_BG_PIXMAP
972	if (bgPixmap.check_clearChanged ())	942	if (bg_flags & BG_NEEDS_REFRESH)
973	{	943	{
974	// scr_clear (true); This needs to be researched further!	944	bg_flags &= ~BG_NEEDS_REFRESH;
975	scr_touch (false);	945	scr_touch (false);
976	}	946	}
977	#endif	947	#endif
978		948
979	if (want_refresh)	949	if (want_refresh)
…		…
1017	}	987	}
1018		988
1019	scr_refresh ();	989	scr_refresh ();
1020	scrollBar.show (1);	990	scrollBar.show (1);
1021	#ifdef USE_XIM	991	#ifdef USE_XIM
1022	IMSendSpot ();	992	im_send_spot ();
1023	#endif	993	#endif
1024	}	994	}
1025		995
1026	display->flush ();	996	display->flush ();
1027	}	997	}
1028		998
1029	/* checks wether a refresh is requested and starts the refresh timer */	999	/* checks whether a refresh is requested and starts the refresh timer */
1030	void	1000	void
1031	rxvt_term::refresh_check ()	1001	rxvt_term::refresh_check ()
1032	{	1002	{
1033	if (want_refresh && !flush_ev.is_active ())	1003	if (want_refresh && !flush_ev.is_active ())
1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1004	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1128	// this should really be sched_yield(), but the linux guys thought	1098	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1099	// 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	1100	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1101	// allowed by the sus... as is returning ENOSYS.
1132	// since the linux guys additionally thought that breaking the only	1102	// since the linux guys additionally thought that breaking the only
1133	// known workaroudn against their unusable sched_yield hack is cool,	1103	// known workaround against their unusable sched_yield hack is cool,
1134	// we just nanosleep a bit and hope for the best.	1104	// we just nanosleep a bit and hope for the best.
1135		1105
1136	struct timespec ts = { 0, 1000 };	1106	struct timespec ts = { 0, 1000 };
1137	nanosleep (&ts, 0);	1107	nanosleep (&ts, 0);
1138		1108
…		…
1144	{	1114	{
1145	}	1115	}
1146	} event_handler;	1116	} event_handler;
1147	#endif	1117	#endif
1148		1118
		1119	/* make sure all the cmd data is at beginning of cmdbuf */
		1120	void
		1121	rxvt_term::cmdbuf_reify ()
		1122	{
		1123	if (cmdbuf_ptr == cmdbuf_base)
		1124	return;
		1125
		1126	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1127
		1128	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1129	cmdbuf_ptr = cmdbuf_base;
		1130	cmdbuf_endp = cmdbuf_ptr + used;
		1131
		1132	}
		1133
		1134	#if defined (KEYSYM_RESOURCE)
		1135	void
		1136	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1137	{
		1138	cmdbuf_reify ();
		1139
		1140	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1141
		1142	if (count > avail)
		1143	return;
		1144
		1145	memcpy (cmdbuf_endp, str, count);
		1146	cmdbuf_endp += count;
		1147
		1148	cmd_parse ();
		1149	}
		1150	#endif
		1151
1149	bool	1152	bool
1150	rxvt_term::pty_fill ()	1153	rxvt_term::pty_fill ()
1151	{	1154	{
1152	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1155	cmdbuf_reify ();
1153		1156
1154	if (CBUFSIZ == n)	1157	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155	{	1158
1156	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1159	if (!avail)
1157	n = 0;
1158	}	1160	{
1159		1161	// normally this indicates a "too long" command sequence - just drop the data we have
1160	memmove (cmdbuf_base, cmdbuf_ptr, n);
1161	cmdbuf_ptr = cmdbuf_base;	1162	cmdbuf_ptr = cmdbuf_base;
1162	cmdbuf_endp = cmdbuf_ptr + n;	1163	cmdbuf_endp = cmdbuf_ptr;
		1164	avail = CBUFSIZ;
		1165	}
1163		1166
1164	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1167	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165		1168
1166	if (r > 0)	1169	if (r > 0)
1167	{	1170	{
1168	cmdbuf_endp += r;	1171	cmdbuf_endp += r;
1169	return true;	1172	return true;
…		…
1243	{	1246	{
1244	int button_number, key_state = 0;	1247	int button_number, key_state = 0;
1245	int x, y;	1248	int x, y;
1246	int code = 32;	1249	int code = 32;
1247		1250
1248	x = Pixel2Col (ev.x);	1251	x = Pixel2Col (ev.x) + 1;
1249	y = Pixel2Row (ev.y);	1252	y = Pixel2Row (ev.y) + 1;
		1253
1250	if (ev.type == MotionNotify)	1254	if (ev.type == MotionNotify)
1251	{	1255	{
1252	if (x == mouse_row && y == mouse_col)	1256	if (x == mouse_row && y == mouse_col)
1253	return;	1257	return;
		1258
1254	mouse_row = x;	1259	mouse_row = x;
1255	mouse_col = y;	1260	mouse_col = y;
1256	code += 32;	1261	code += 32;
1257	}	1262	}
1258		1263
…		…
1261	else	1266	else
1262	{	1267	{
1263	button_number = MEvent.button - Button1;	1268	button_number = MEvent.button - Button1;
1264	/* add 0x3D for wheel events, like xterm does */	1269	/* add 0x3D for wheel events, like xterm does */
1265	if (button_number >= 3)	1270	if (button_number >= 3)
1266	button_number += (64 - 3);	1271	button_number += 64 - 3;
1267	}	1272	}
1268		1273
1269	if (priv_modes & PrivMode_MouseX10)	1274	if (priv_modes & PrivMode_MouseX10)
1270	{	1275	{
1271	/*	1276	/*
…		…
1303	fputc ('A', stderr);	1308	fputc ('A', stderr);
1304	if (key_state & 32)	1309	if (key_state & 32)
1305	fputc ('2', stderr);	1310	fputc ('2', stderr);
1306	fprintf (stderr, "]: <%d>, %d/%d\n",	1311	fprintf (stderr, "]: <%d>, %d/%d\n",
1307	button_number,	1312	button_number,
1308	x + 1,	1313	x,
1309	y + 1);	1314	y);
1310	#endif	1315	#endif
1311		1316
		1317	#if ENABLE_FRILLS
		1318	if (priv_modes & PrivMode_ExtMouseRight)
		1319	tt_printf ("\033[%d;%d;%dM",
		1320	code + button_number + key_state,
		1321	x,
		1322	y);
		1323	else if (priv_modes & PrivMode_ExtModeMouse)
		1324	tt_printf ("\033[M%c%lc%lc",
		1325	code + button_number + key_state,
		1326	wint_t (32 + x),
		1327	wint_t (32 + y));
		1328	else
		1329	#endif
1312	tt_printf ("\033[M%c%c%c",	1330	tt_printf ("\033[M%c%c%c",
1313	(code + button_number + key_state),	1331	code + button_number + key_state,
1314	(32 + x + 1),	1332	32 + x,
1315	(32 + y + 1));	1333	32 + y);
1316	}	1334	}
1317		1335
1318	/{{{ process an X event /	1336	/{{{ process an X event /
1319	void	1337	void
1320	rxvt_term::x_cb (XEvent &ev)	1338	rxvt_term::x_cb (XEvent &ev)
…		…
1422	&& ev.xfocus.mode != NotifyGrab)	1440	&& ev.xfocus.mode != NotifyGrab)
1423	focus_out ();	1441	focus_out ();
1424	break;	1442	break;
1425		1443
1426	case ConfigureNotify:	1444	case ConfigureNotify:
1427	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429	szHint.width, szHint.height);*/
1430	if (ev.xconfigure.window == parent[0])	1445	if (ev.xconfigure.window == parent)
1431	{	1446	{
1432	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433	;	1448	;
		1449
		1450	#ifdef HAVE_BG_PIXMAP
		1451	bool moved = false;
		1452	if (bg_window_position_sensitive ())
		1453	{
		1454	int x, y;
		1455	if (ev.xconfigure.send_event)
		1456	{
		1457	x = ev.xconfigure.x;
		1458	y = ev.xconfigure.y;
		1459	}
		1460	else
		1461	get_window_origin (x, y);
		1462
		1463	if (bg_set_position (x, y)
		1464	\|\| !(bg_flags & BG_IS_VALID))
		1465	moved = true;
		1466	}
		1467	#endif
1434		1468
1435	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1436	{	1470	{
1437	seen_resize = 1;	1471	seen_resize = 1;
1438	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439	}	1473	}
1440	else	1474	else
1441	{	1475	{
1442	#ifdef HAVE_BG_PIXMAP	1476	#ifdef HAVE_BG_PIXMAP
1443	if (bgPixmap.window_position_sensitive ())
1444	{
1445	if (mapped)	1477	if (moved)
1446	update_background ();	1478	update_background ();
1447	else
1448	bgPixmap.invalidate ();
1449	}
1450	#endif	1479	#endif
1451	}	1480	}
1452		1481
1453	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454	}	1483	}
1455	break;	1484	break;
1456		1485
1457	case PropertyNotify:	1486	case PropertyNotify:
1458	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1487	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460	&& ev.xproperty.state == PropertyNewValue)
1461	selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463	break;	1488	break;
1464		1489
1465	case SelectionClear:	1490	case SelectionClear:
1466	selection_clear ();	1491	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467	break;
1468
1469	case SelectionNotify:
1470	if (selection_wait == Sel_normal)
1471	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472	break;	1492	break;
1473		1493
1474	case SelectionRequest:	1494	case SelectionRequest:
1475	selection_send (ev.xselectionrequest);	1495	selection_send (ev.xselectionrequest);
1476	break;	1496	break;
1477		1497
1478	case MapNotify:	1498	case MapNotify:
1479	#ifdef HAVE_BG_PIXMAP	1499	#ifdef HAVE_BG_PIXMAP
1480	/* This is needed spcifically to fix the case of no window manager or a	1500	/* This is needed specifically to fix the case of no window manager or a
1481	* non-reparenting window manager. In those cases we never get first	1501	* non-reparenting window manager. In those cases we never get first
1482	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1502	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1483	* care of multiplicity of ConfigureNotify events arriwing while WM does	1503	* care of multiplicity of ConfigureNotify events arriving while WM does
1484	* reparenting.	1504	* reparenting.
1485	* We should not render background immidiately, as there could be several	1505	* We should not render background immediately, as there could be several
1486	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1506	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487	* by scheduling background redraw as soon as we can, but giving a short	1507	* by scheduling background redraw as soon as we can, but giving a short
1488	* bit of time for ConfigureNotifies to arrive.	1508	* bit of time for ConfigureNotifies to arrive.
1489	* We should render background PRIOR to drawing any text, but AFTER all	1509	* We should render background PRIOR to drawing any text, but AFTER all
1490	* of ConfigureNotifys for the best results.	1510	* of ConfigureNotifys for the best results.
1491	*/	1511	*/
1492	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1512	if (!(bg_flags & BG_IS_VALID))
1493	update_background_ev.start (0.025);	1513	update_background_ev.start (0.025);
1494	#endif	1514	#endif
1495	mapped = 1;	1515	mapped = 1;
1496	#ifdef TEXT_BLINK	1516	#ifdef TEXT_BLINK
1497	text_blink_ev.start ();	1517	text_blink_ev.start ();
…		…
1512	if (ev.xany.window == vt)	1532	if (ev.xany.window == vt)
1513	{	1533	{
1514	do	1534	do
1515	{	1535	{
1516	scr_expose (ev.xexpose.x, ev.xexpose.y,	1536	scr_expose (ev.xexpose.x, ev.xexpose.y,
1517	ev.xexpose.width, ev.xexpose.height, False);	1537	ev.xexpose.width, ev.xexpose.height, false);
1518	}	1538	}
1519	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520		1540
1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522		1542
1523	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524	{	1544	{
1525	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1526	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, false);
1527	}	1547	}
1528		1548
1529	want_refresh = 1;	1549	want_refresh = 1;
1530	}	1550	}
1531	else	1551	else
…		…
1646	XQueryPointer (dpy, scrollBar.win,	1666	XQueryPointer (dpy, scrollBar.win,
1647	&unused_root, &unused_child,	1667	&unused_root, &unused_child,
1648	&unused_root_x, &unused_root_y,	1668	&unused_root_x, &unused_root_y,
1649	&ev.xbutton.x, &ev.xbutton.y,	1669	&ev.xbutton.x, &ev.xbutton.y,
1650	&unused_mask);	1670	&unused_mask);
1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1671	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652	scrollBar.size ());	1672	scrollBar.size ());
1653	want_refresh = 1;	1673	want_refresh = 1;
1654	scrollBar.show (1);	1674	scrollBar.show (1);
1655	}	1675	}
1656	break;	1676	break;
…		…
1691	rxvt_term::set_urgency (bool enable)	1711	rxvt_term::set_urgency (bool enable)
1692	{	1712	{
1693	if (enable == urgency_hint)	1713	if (enable == urgency_hint)
1694	return;	1714	return;
1695		1715
1696	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1716	if (XWMHints *h = XGetWMHints (dpy, parent))
1697	{	1717	{
1698	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1718	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1699	XSetWMHints (dpy, parent[0], h);	1719	XSetWMHints (dpy, parent, h);
1700	urgency_hint = enable;	1720	urgency_hint = enable;
1701	}	1721	}
1702	}	1722	}
1703	#endif	1723	#endif
1704		1724
…		…
1711	want_refresh = 1;	1731	want_refresh = 1;
1712		1732
1713	#if USE_XIM	1733	#if USE_XIM
1714	if (Input_Context != NULL)	1734	if (Input_Context != NULL)
1715	{	1735	{
1716	IMSetPosition ();	1736	im_set_position ();
1717	XSetICFocus (Input_Context);	1737	XSetICFocus (Input_Context);
1718	}	1738	}
1719	#endif	1739	#endif
1720	#if CURSOR_BLINK	1740	#if CURSOR_BLINK
1721	if (option (Opt_cursorBlink))	1741	if (option (Opt_cursorBlink))
…		…
1812	* use the property to determine the pixmap. We use it later on.	1832	* use the property to determine the pixmap. We use it later on.
1813	*/	1833	*/
1814	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1834	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1815	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1835	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1816	{	1836	{
1817	bgPixmap.set_root_pixmap ();	1837	bg_set_root_pixmap ();
1818	update_background ();	1838	update_background ();
1819	}	1839	}
1820		1840
1821	break;	1841	break;
1822	}	1842	}
…		…
1861	/* save the xbutton state (for ButtonRelease) */	1881	/* save the xbutton state (for ButtonRelease) */
1862	MEvent.state = ev.state;	1882	MEvent.state = ev.state;
1863	#ifdef MOUSE_REPORT_DOUBLECLICK	1883	#ifdef MOUSE_REPORT_DOUBLECLICK
1864	if (ev.button == MEvent.button && clickintime)	1884	if (ev.button == MEvent.button && clickintime)
1865	{	1885	{
1866	/* same button, within alloted time */	1886	/* same button, within allowed time */
1867	MEvent.clicks++;	1887	MEvent.clicks++;
1868		1888
1869	if (MEvent.clicks > 1)	1889	if (MEvent.clicks > 1)
1870	{	1890	{
1871	/* only report double clicks */	1891	/* only report double clicks */
…		…
2024	csrO = scrollBar.bot - scrollBar.top;	2044	csrO = scrollBar.bot - scrollBar.top;
2025	break;	2045	break;
2026	}	2046	}
2027		2047
2028	if (scrollBar.style == R_SB_XTERM	2048	if (scrollBar.style == R_SB_XTERM
2029	\|\| scrollbar_above_slider (ev.y)	2049	\|\| scrollBar.above_slider (ev.y)
2030	\|\| scrollbar_below_slider (ev.y))	2050	\|\| scrollBar.below_slider (ev.y))
2031	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2051	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2032		2052
2033	scrollBar.state = STATE_MOTION;	2053	scrollBar.state = STATE_MOTION;
2034	break;	2054	break;
2035		2055
2036	case Button1:	2056	case Button1:
…		…
2039	/* FALLTHROUGH */	2059	/* FALLTHROUGH */
2040		2060
2041	case Button3:	2061	case Button3:
2042	if (scrollBar.style != R_SB_XTERM)	2062	if (scrollBar.style != R_SB_XTERM)
2043	{	2063	{
2044	if (scrollbar_above_slider (ev.y))	2064	if (scrollBar.above_slider (ev.y))
2045	# ifdef RXVT_SCROLL_FULL	2065	# ifdef RXVT_SCROLL_FULL
2046	scr_page (UP, nrow - 1);	2066	scr_page (UP, nrow - 1);
2047	# else	2067	# else
2048	scr_page (UP, nrow / 4);	2068	scr_page (UP, nrow / 4);
2049	# endif	2069	# endif
2050	else if (scrollbar_below_slider (ev.y))	2070	else if (scrollBar.below_slider (ev.y))
2051	# ifdef RXVT_SCROLL_FULL	2071	# ifdef RXVT_SCROLL_FULL
2052	scr_page (DN, nrow - 1);	2072	scr_page (DN, nrow - 1);
2053	# else	2073	# else
2054	scr_page (DN, nrow / 4);	2074	scr_page (DN, nrow / 4);
2055	# endif	2075	# endif
…		…
2058	}	2078	}
2059	else	2079	else
2060	{	2080	{
2061	scr_page ((ev.button == Button1 ? DN : UP),	2081	scr_page ((ev.button == Button1 ? DN : UP),
2062	(nrow	2082	(nrow
2063	* scrollbar_position (ev.y)	2083	* scrollBar.position (ev.y)
2064	/ scrollBar.size ()));	2084	/ scrollBar.size ()));
2065	}	2085	}
2066		2086
2067	break;	2087	break;
2068	}	2088	}
…		…
2142	selection_make (ev.time);	2162	selection_make (ev.time);
2143	break;	2163	break;
2144		2164
2145	case Button2:	2165	case Button2:
2146	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2166	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2167	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148	break;	2168	break;
2149		2169
2150	#ifdef MOUSE_WHEEL	2170	#ifdef MOUSE_WHEEL
2151	case Button4:	2171	case Button4:
2152	case Button5:	2172	case Button5:
…		…
2194	wchar_t ch = NOCHAR;	2214	wchar_t ch = NOCHAR;
2195	char *seq_begin; // remember start of esc-sequence here	2215	char *seq_begin; // remember start of esc-sequence here
2196		2216
2197	for (;;)	2217	for (;;)
2198	{	2218	{
2199	if (expect_false (ch == NOCHAR))	2219	if (ecb_unlikely (ch == NOCHAR))
2200	{	2220	{
2201	seq_begin = cmdbuf_ptr;	2221	seq_begin = cmdbuf_ptr;
2202	ch = next_char ();	2222	ch = next_char ();
2203		2223
2204	if (ch == NOCHAR)	2224	if (ch == NOCHAR)
2205	break;	2225	break;
2206	}	2226	}
2207		2227
2208	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2228	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2209	{	2229	{
2210	if (expect_false (!seen_input))	2230	if (ecb_unlikely (!seen_input))
2211	{	2231	{
2212	seen_input = 1;	2232	seen_input = 1;
2213	// many badly-written programs (e.g. jed) contain a race condition:	2233	// many badly-written programs (e.g. jed) contain a race condition:
2214	// they first read the screensize and then install a SIGWINCH handler.	2234	// they first read the screensize and then install a SIGWINCH handler.
2215	// some window managers resize the window early, and these programs	2235	// some window managers resize the window early, and these programs
…		…
2228	wchar_t *str = buf;	2248	wchar_t *str = buf;
2229	wchar_t *eol = str + min (ncol, UBUFSIZ);	2249	wchar_t *eol = str + min (ncol, UBUFSIZ);
2230		2250
2231	for (;;)	2251	for (;;)
2232	{	2252	{
2233	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2253	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234	break;	2254	break;
2235		2255
2236	*str++ = ch;	2256	*str++ = ch;
2237		2257
2238	if (expect_false (ch == C0_LF \|\| str >= eol))	2258	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2239	{	2259	{
2240	if (ch == C0_LF)	2260	if (ch == C0_LF)
2241	nlines++;	2261	nlines++;
2242		2262
2243	refresh_count++;	2263	refresh_count++;
…		…
2321	rxvt_term::next_char () NOTHROW	2341	rxvt_term::next_char () NOTHROW
2322	{	2342	{
2323	while (cmdbuf_ptr < cmdbuf_endp)	2343	while (cmdbuf_ptr < cmdbuf_endp)
2324	{	2344	{
2325	// assume 7-bit to be ascii ALWAYS	2345	// assume 7-bit to be ascii ALWAYS
2326	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2346	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2327	return *cmdbuf_ptr++;	2347	return *cmdbuf_ptr++;
2328		2348
2329	wchar_t wc;	2349	wchar_t wc;
2330	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2350	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2331		2351
…		…
2359	: NOCHAR;	2379	: NOCHAR;
2360	}	2380	}
2361		2381
2362	static class out_of_input out_of_input;	2382	static class out_of_input out_of_input;
2363		2383
2364	/* rxvt_cmd_getc () - Return next input character */
2365	/*
2366	* Return the next input character after first passing any keyboard input
2367	* to the command.
2368	*/
2369	wchar_t	2384	wchar_t
2370	rxvt_term::cmd_getc () THROW ((class out_of_input))	2385	rxvt_term::cmd_getc () THROW ((class out_of_input))
2371	{	2386	{
2372	wchar_t c = next_char ();	2387	wchar_t c = next_char ();
2373		2388
…		…
2466	pclose_printer (fd);	2481	pclose_printer (fd);
2467	}	2482	}
2468	#endif /* PRINTPIPE */	2483	#endif /* PRINTPIPE */
2469	/}}} /	2484	/}}} /
2470		2485
2471	/* INDENT-OFF */
2472	enum {	2486	enum {
2473	C1_40 = 0x40,	2487	C1_40 = 0x40,
2474	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2488	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2475	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2489	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2476	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2490	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2477	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2491	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2478	};	2492	};
2479	/* INDENT-ON */
2480		2493
2481	/{{{ process non-printing single characters /	2494	/{{{ process non-printing single characters /
2482	void	2495	void
2483	rxvt_term::process_nonprinting (unicode_t ch)	2496	rxvt_term::process_nonprinting (unicode_t ch)
2484	{	2497	{
…		…
2577	break;	2590	break;
2578	case 'Z': /* identify the terminal type */	2591	case 'Z': /* identify the terminal type */
2579	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2592	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580	break;	2593	break;
2581	case '<': /* turn off VT52 mode */	2594	case '<': /* turn off VT52 mode */
2582	set_privmode (PrivMode_vt52, 0);	2595	priv_modes &= ~PrivMode_vt52;
2583	break;	2596	break;
2584	case 'F': /* use special graphics character set */	2597	case 'F': /* use special graphics character set */
2585	case 'G': /* use regular character set */	2598	case 'G': /* use regular character set */
2586	/* unimplemented */	2599	/* unimplemented */
2587	break;	2600	break;
…		…
2606	return;	2619	return;
2607	}	2620	}
2608		2621
2609	switch (ch)	2622	switch (ch)
2610	{	2623	{
2611	/* case 1: do_tek_mode (); break; */
2612	case '#':	2624	case '#':
2613	if (cmd_getc () == '8')	2625	if (cmd_getc () == '8')
2614	scr_E ();	2626	scr_E ();
2615	break;	2627	break;
2616	case '(':	2628	case '(':
…		…
2639	#if !ENABLE_MINIMAL	2651	#if !ENABLE_MINIMAL
2640	case '9':	2652	case '9':
2641	scr_forwardindex ();	2653	scr_forwardindex ();
2642	break;	2654	break;
2643	#endif	2655	#endif
		2656	// DECPAM/DECPNM
2644	case '=':	2657	case '=':
		2658	priv_modes \|= PrivMode_aplKP;
		2659	break;
2645	case '>':	2660	case '>':
2646	set_privmode (PrivMode_aplKP, ch == '=');	2661	priv_modes &= ~PrivMode_aplKP;
2647	break;	2662	break;
2648		2663
2649	case C1_40:	2664	case C1_40:
2650	cmd_getc ();	2665	cmd_getc ();
2651	break;	2666	break;
…		…
2655		2670
2656	/* 8.3.87: NEXT LINE */	2671	/* 8.3.87: NEXT LINE */
2657	case C1_NEL: /* ESC E */	2672	case C1_NEL: /* ESC E */
2658	{	2673	{
2659	wchar_t nlcr[] = { C0_LF, C0_CR };	2674	wchar_t nlcr[] = { C0_LF, C0_CR };
2660	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2675	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2661	}	2676	}
2662	break;	2677	break;
2663		2678
2664	/* kidnapped escape sequence: Should be 8.3.48 */	2679	/* kidnapped escape sequence: Should be 8.3.48 */
2665	case C1_ESA: /* ESC G */	2680	case C1_ESA: /* ESC G */
2666	process_graphics ();	2681	// used by original rxvt for rob nations own graphics mode
		2682	if (cmd_getc () == 'Q')
		2683	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2667	break;	2684	break;
2668		2685
2669	/* 8.3.63: CHARACTER TABULATION SET */	2686	/* 8.3.63: CHARACTER TABULATION SET */
2670	case C1_HTS: /* ESC H */	2687	case C1_HTS: /* ESC H */
2671	scr_set_tab (1);	2688	scr_set_tab (1);
…		…
2675	case C1_RI: /* ESC M */	2692	case C1_RI: /* ESC M */
2676	scr_index (DN);	2693	scr_index (DN);
2677	break;	2694	break;
2678		2695
2679	/* 8.3.142: SINGLE-SHIFT TWO */	2696	/* 8.3.142: SINGLE-SHIFT TWO */
2680	/case C1_SS2: scr_single_shift (2); break; /	2697	/* case C1_SS2: break; */
2681		2698
2682	/* 8.3.143: SINGLE-SHIFT THREE */	2699	/* 8.3.143: SINGLE-SHIFT THREE */
2683	/case C1_SS3: scr_single_shift (3); break; /	2700	/* case C1_SS3: break; */
2684		2701
2685	/* 8.3.27: DEVICE CONTROL STRING */	2702	/* 8.3.27: DEVICE CONTROL STRING */
2686	case C1_DCS: /* ESC P */	2703	case C1_DCS: /* ESC P */
2687	process_dcs_seq ();	2704	process_dcs_seq ();
2688	break;	2705	break;
…		…
2721	}	2738	}
2722	}	2739	}
2723	/}}} /	2740	/}}} /
2724		2741
2725	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2742	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2726	/* INDENT-OFF */
2727	enum {	2743	enum {
2728	CSI_ICH = 0x40,	2744	CSI_ICH = 0x40,
2729	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2745	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2730	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2746	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2731	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2747	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2734	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2750	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2751	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2752	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737	};	2753	};
2738		2754
2739	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2755	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \	2756	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \
2741	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))	2757	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))
2742	#define get_byte_array_bit(array, bit) \	2758	#define get_byte_array_bit(array, bit) \
2743	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2759	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744		2760
2745	const unsigned char csi_defaults[] =	2761	static const unsigned char csi_defaults[] =
2746	{	2762	{
2747	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2763	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2764	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2765	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2766	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2751	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2767	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2752	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2768	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2753	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2769	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2754	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2770	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2755	};	2771	};
2756	/* INDENT-ON */
2757		2772
2758	void	2773	void
2759	rxvt_term::process_csi_seq ()	2774	rxvt_term::process_csi_seq ()
2760	{	2775	{
2761	unicode_t ch, priv, i;	2776	unicode_t ch, priv, i;
…		…
2839	{	2854	{
2840	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */	2855	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841	scr_soft_reset ();	2856	scr_soft_reset ();
2842		2857
2843	static const int pm_h[] = { 7, 25 };	2858	static const int pm_h[] = { 7, 25 };
2844	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };	2859	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2845		2860
2846	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);	2861	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2847	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);	2862	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2848	}	2863	}
2849	break;	2864	break;
2850	}	2865	}
2851		2866
2852	return;	2867	return;
…		…
3071	}	3086	}
3072	}	3087	}
3073	/}}} /	3088	/}}} /
3074		3089
3075	#if !ENABLE_MINIMAL	3090	#if !ENABLE_MINIMAL
3076	/* ARGSUSED */
3077	void	3091	void
3078	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3092	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3079	{	3093	{
3080	int x, y;	3094	int x, y;
3081	XWindowAttributes wattr;	3095	XWindowAttributes wattr;
…		…
3090	{	3104	{
3091	/*	3105	/*
3092	* commands	3106	* commands
3093	*/	3107	*/
3094	case 1: /* deiconify window */	3108	case 1: /* deiconify window */
3095	XMapWindow (dpy, parent[0]);	3109	XMapWindow (dpy, parent);
3096	break;	3110	break;
3097	case 2: /* iconify window */	3111	case 2: /* iconify window */
3098	XIconifyWindow (dpy, parent[0], display->screen);	3112	XIconifyWindow (dpy, parent, display->screen);
3099	break;	3113	break;
3100	case 3: /* set position (pixels) */	3114	case 3: /* set position (pixels) */
3101	XMoveWindow (dpy, parent[0], args[1], args[2]);	3115	XMoveWindow (dpy, parent, args[1], args[2]);
3102	break;	3116	break;
3103	case 4: /* set size (pixels) */	3117	case 4: /* set size (pixels) */
3104	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3118	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3105	break;	3119	break;
3106	case 5: /* raise window */	3120	case 5: /* raise window */
3107	XRaiseWindow (dpy, parent[0]);	3121	XRaiseWindow (dpy, parent);
3108	break;	3122	break;
3109	case 6: /* lower window */	3123	case 6: /* lower window */
3110	XLowerWindow (dpy, parent[0]);	3124	XLowerWindow (dpy, parent);
3111	break;	3125	break;
3112	case 7: /* refresh window */	3126	case 7: /* refresh window */
3113	scr_touch (true);	3127	scr_touch (true);
3114	break;	3128	break;
3115	case 8: /* set size (chars) */	3129	case 8: /* set size (chars) */
…		…
3126		3140
3127	/*	3141	/*
3128	* reports - some output format copied from XTerm	3142	* reports - some output format copied from XTerm
3129	*/	3143	*/
3130	case 11: /* report window state */	3144	case 11: /* report window state */
3131	XGetWindowAttributes (dpy, parent[0], &wattr);	3145	XGetWindowAttributes (dpy, parent, &wattr);
3132	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3146	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3133	break;	3147	break;
3134	case 13: /* report window position */	3148	case 13: /* report window position */
3135	XGetWindowAttributes (dpy, parent[0], &wattr);	3149	XGetWindowAttributes (dpy, parent, &wattr);
3136	XTranslateCoordinates (dpy, parent[0], wattr.root,	3150	XTranslateCoordinates (dpy, parent, wattr.root,
3137	-wattr.border_width, -wattr.border_width,	3151	-wattr.border_width, -wattr.border_width,
3138	&x, &y, &wdummy);	3152	&x, &y, &wdummy);
3139	tt_printf ("\033[3;%d;%dt", x, y);	3153	tt_printf ("\033[3;%d;%dt", x, y);
3140	break;	3154	break;
3141	case 14: /* report window size (pixels) */	3155	case 14: /* report window size (pixels) */
3142	XGetWindowAttributes (dpy, parent[0], &wattr);	3156	XGetWindowAttributes (dpy, parent, &wattr);
3143	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3157	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3144	break;	3158	break;
3145	case 18: /* report text area size (chars) */	3159	case 18: /* report text area size (chars) */
3146	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3160	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3147	break;	3161	break;
…		…
3149	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3163	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3150	break;	3164	break;
3151	case 20: /* report icon label */	3165	case 20: /* report icon label */
3152	{	3166	{
3153	char *s;	3167	char *s;
3154	XGetIconName (dpy, parent[0], &s);	3168	XGetIconName (dpy, parent, &s);
3155	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3169	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3156	XFree (s);	3170	XFree (s);
3157	}	3171	}
3158	break;	3172	break;
3159	case 21: /* report window title */	3173	case 21: /* report window title */
3160	{	3174	{
3161	char *s;	3175	char *s;
3162	XFetchName (dpy, parent[0], &s);	3176	XFetchName (dpy, parent, &s);
3163	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3177	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164	XFree (s);	3178	XFree (s);
3165	}	3179	}
3166	break;	3180	break;
3167	}	3181	}
…		…
3223	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3237	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3224	*/	3238	*/
3225	void	3239	void
3226	rxvt_term::process_dcs_seq ()	3240	rxvt_term::process_dcs_seq ()
3227	{	3241	{
3228	char *s;
3229	unicode_t eh;
3230
3231	/*	3242	/*
3232	* Not handled yet	3243	* Not handled yet
3233	*/	3244	*/
		3245
		3246	unicode_t eh;
3234	s = get_to_st (eh);	3247	char *s = get_to_st (eh);
3235	if (s)	3248	if (s)
3236	free (s);	3249	free (s);
3237		3250
3238	return;	3251	return;
3239	}	3252	}
…		…
3243	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3256	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3244	*/	3257	*/
3245	void	3258	void
3246	rxvt_term::process_osc_seq ()	3259	rxvt_term::process_osc_seq ()
3247	{	3260	{
3248	unicode_t ch, eh;
3249	int arg;	3261	int arg;
3250		3262
3251	ch = cmd_getc ();	3263	unicode_t ch = cmd_getc ();
3252	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3264	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3253	arg = arg * 10 + (ch - '0');	3265	arg = arg * 10 + (ch - '0');
3254		3266
3255	if (ch == ';')	3267	if (ch == ';')
3256	{	3268	{
		3269	unicode_t eh;
3257	char *s = get_to_st (eh);	3270	char *s = get_to_st (eh);
3258		3271
3259	if (s)	3272	if (s)
3260	{	3273	{
3261	process_xterm_seq (arg, s, eh);	3274	process_xterm_seq (arg, s, eh);
…		…
3322	unsigned long bytes_after;	3335	unsigned long bytes_after;
3323	unsigned char *value = 0;	3336	unsigned char *value = 0;
3324	const char *str = "";	3337	const char *str = "";
3325		3338
3326	if (prop	3339	if (prop
3327	&& XGetWindowProperty (dpy, parent[0],	3340	&& XGetWindowProperty (dpy, parent,
3328	prop, 0, 1<<16, 0, AnyPropertyType,	3341	prop, 0, 1<<16, 0, AnyPropertyType,
3329	&actual_type, &actual_format,	3342	&actual_type, &actual_format,
3330	&nitems, &bytes_after, &value) == Success	3343	&nitems, &bytes_after, &value) == Success
3331	&& actual_type != None	3344	&& actual_type != None
3332	&& actual_format == 8)	3345	&& actual_format == 8)
…		…
3344	{	3357	{
3345	*eq = 0;	3358	*eq = 0;
3346	set_utf8_property (display->atom (str), eq + 1);	3359	set_utf8_property (display->atom (str), eq + 1);
3347	}	3360	}
3348	else	3361	else
3349	XDeleteProperty (dpy, parent[0],	3362	XDeleteProperty (dpy, parent,
3350	display->atom (str));	3363	display->atom (str));
3351	}	3364	}
3352	break;	3365	break;
3353		3366
3354	case XTerm_Color:	3367	case XTerm_Color:
…		…
3386	process_color_seq (op, Color_pointer_fg, str, resp);	3399	process_color_seq (op, Color_pointer_fg, str, resp);
3387	break;	3400	break;
3388	case XTerm_Color_pointer_bg:	3401	case XTerm_Color_pointer_bg:
3389	process_color_seq (op, Color_pointer_bg, str, resp);	3402	process_color_seq (op, Color_pointer_bg, str, resp);
3390	break;	3403	break;
		3404	#ifdef OPTION_HC
		3405	case XTerm_Color_HC:
		3406	process_color_seq (op, Color_HC, str, resp);
		3407	break;
		3408	case XTerm_Color_HTC:
		3409	process_color_seq (op, Color_HTC, str, resp);
		3410	break;
		3411	#endif
3391	#ifndef NO_BOLD_UNDERLINE_REVERSE	3412	#ifndef NO_BOLD_UNDERLINE_REVERSE
3392	case XTerm_Color_RV:
3393	process_color_seq (op, Color_RV, str, resp);
3394	break;
3395	case Rxvt_Color_BD:
3396	case URxvt_Color_BD:	3413	case URxvt_Color_BD:
3397	process_color_seq (op, Color_BD, str, resp);	3414	process_color_seq (op, Color_BD, str, resp);
3398	break;	3415	break;
3399	case Rxvt_Color_UL:
3400	case URxvt_Color_UL:	3416	case URxvt_Color_UL:
3401	process_color_seq (op, Color_UL, str, resp);	3417	process_color_seq (op, Color_UL, str, resp);
3402	break;	3418	break;
3403	case URxvt_Color_IT:	3419	case URxvt_Color_IT:
3404	process_color_seq (op, Color_IT, str, resp);	3420	process_color_seq (op, Color_IT, str, resp);
…		…
3412	process_color_seq (op, Color_tint, str, resp);	3428	process_color_seq (op, Color_tint, str, resp);
3413	{	3429	{
3414	bool changed = false;	3430	bool changed = false;
3415		3431
3416	if (ISSET_PIXCOLOR (Color_tint))	3432	if (ISSET_PIXCOLOR (Color_tint))
3417	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3433	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3418	else
3419	changed = bgPixmap.unset_tint ();
3420		3434
3421	if (changed)	3435	if (changed)
3422	update_background ();	3436	update_background ();
3423	}	3437	}
3424		3438
…		…
3429	case Rxvt_Pixmap:	3443	case Rxvt_Pixmap:
3430	if (!strcmp (str, "?"))	3444	if (!strcmp (str, "?"))
3431	{	3445	{
3432	char str[256];	3446	char str[256];
3433		3447
3434	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3448	sprintf (str, "[%dx%d+%d+%d]",
3435	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3449	min (h_scale, 32767), min (v_scale, 32767),
3436	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3450	min (h_align, 32767), min (v_align, 32767));
3437	process_xterm_seq (XTerm_title, str, CHAR_ST);	3451	process_xterm_seq (XTerm_title, str, CHAR_ST);
3438	}	3452	}
3439	else	3453	else
3440	{	3454	{
3441	int changed = 0;	3455	bool changed = false;
3442		3456
3443	if (*str != ';')	3457	if (*str != ';')
3444	{	3458	{
3445	/* reset to default scaling :*/
3446	bgPixmap.unset_geometry ();
3447	if (bgPixmap.set_file (str)) /* change pixmap */	3459	if (bg_set_file (str)) /* change pixmap */
3448	changed++;	3460	changed = true;
3449	str = strchr (str, ';');
3450	if (str == NULL)
3451	bgPixmap.set_defaultGeometry ();
3452	}	3461	}
3453		3462	else
3454	while (str)
3455	{	3463	{
3456	str++;	3464	str++;
3457	if (bgPixmap.set_geometry (str))	3465	if (bg_set_geometry (str, true))
3458	changed++;	3466	changed = true;
3459	str = strchr (str, ';');
3460	}	3467	}
3461		3468
3462	if (changed)	3469	if (changed)
		3470	{
		3471	if (bg_window_position_sensitive ())
		3472	{
		3473	int x, y;
		3474	get_window_origin (x, y);
		3475	bg_set_position (x, y);
		3476	}
3463	update_background ();	3477	update_background ();
		3478	}
3464	}	3479	}
3465	break;	3480	break;
3466	#endif	3481	#endif
3467		3482
3468	case XTerm_logfile:	3483	case XTerm_logfile:
…		…
3571	{	3586	{
3572	if (mode == 'r')	3587	if (mode == 'r')
3573	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3588	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3574	else	3589	else
3575	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3590	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3576	set_privmode (bit, state);	3591
		3592	if (state)
		3593	priv_modes \|= bit;
		3594	else
		3595	priv_modes &= ~bit;
3577	}	3596	}
3578		3597
3579	return state;	3598	return state;
3580	}	3599	}
3581		3600
3582	/* we're not using priv _yet_ */	3601	/* we're not using priv _yet_ */
3583	void	3602	void
3584	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3603	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3585	{	3604	{
3586	unsigned int i, j;	3605	unsigned int i, j;
3587	int state;	3606	int state;
3588		3607
3589	static const struct	3608	static const struct
3590	{	3609	{
3591	const int argval;	3610	const int argval;
3592	const unsigned long bit;	3611	const unsigned long bit;
3593	} argtopriv[] = {	3612	} argtopriv[] = {
3594	{ 1, PrivMode_aplCUR }, // DECCKM	3613	{ 1, PrivMode_aplCUR }, // DECCKM
3595	{ 2, PrivMode_vt52 },	3614	{ 2, PrivMode_vt52 }, // DECANM
3596	{ 3, PrivMode_132 }, // DECCOLM	3615	{ 3, PrivMode_132 }, // DECCOLM
3597	{ 4, PrivMode_smoothScroll }, // DECSCLM	3616	{ 4, PrivMode_smoothScroll }, // DECSCLM
3598	{ 5, PrivMode_rVideo }, // DECSCNM	3617	{ 5, PrivMode_rVideo }, // DECSCNM
3599	{ 6, PrivMode_relOrigin }, // DECOM	3618	{ 6, PrivMode_relOrigin }, // DECOM
3600	{ 7, PrivMode_Autowrap }, // DECAWM	3619	{ 7, PrivMode_Autowrap }, // DECAWM
3601	// 8, auto-repeat keys // DECARM	3620	// 8, auto-repeat keys // DECARM
3602	{ 9, PrivMode_MouseX10 },	3621	{ 9, PrivMode_MouseX10 },
3603	// 18 end FF to printer after print screen	3622	// 18 end FF to printer after print screen
3604	// 19 Print screen prints full screen/scorll region	3623	// 19 Print screen prints full screen/scroll region
3605	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3624	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3606	#ifdef scrollBar_esc	3625	#ifdef scrollBar_esc
3607	{ scrollBar_esc, PrivMode_scrollBar },	3626	{ scrollBar_esc, PrivMode_scrollBar },
3608	#endif	3627	#endif
3609	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3628	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3610	// 38, tektronix mode // DECTEK	3629	// 38, tektronix mode // DECTEK
3611	{ 40, PrivMode_132OK },	3630	{ 40, PrivMode_132OK },
3612	// 41 xterm more fixes NYI	3631	// 41 xterm more fixes NYI
3613	// 45 margin bell NYI	3632	// 45 margin bell NYI
3614	// 46 start logging	3633	// 46 start logging
3615	{ 47, PrivMode_Screen },	3634	{ 47, PrivMode_Screen },
3616	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3635	{ 66, PrivMode_aplKP }, // DECNKM
3617	#ifndef NO_BACKSPACE_KEY	3636	#ifndef NO_BACKSPACE_KEY
3618	{ 67, PrivMode_BackSpace }, // DECBKM	3637	{ 67, PrivMode_BackSpace }, // DECBKM
3619	#endif	3638	#endif
3620	{ 1000, PrivMode_MouseX11 },	3639	{ 1000, PrivMode_MouseX11 },
3621	{ 1002, PrivMode_MouseBtnEvent },	3640	{ 1002, PrivMode_MouseBtnEvent },
3622	{ 1003, PrivMode_MouseAnyEvent },	3641	{ 1003, PrivMode_MouseAnyEvent },
		3642	#if ENABLE_FRILLS
		3643	{ 1005, PrivMode_ExtModeMouse },
		3644	#endif
3623	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3645	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624	{ 1011, PrivMode_Keypress }, // rxvt extension	3646	{ 1011, PrivMode_Keypress }, // rxvt extension
		3647	#if ENABLE_FRILLS
		3648	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3649	#endif
3625	// 1035 enable modifiers for alt, numlock NYI	3650	// 1035 enable modifiers for alt, numlock NYI
3626	// 1036 send ESC for meta keys NYI	3651	// 1036 send ESC for meta keys NYI
3627	// 1037 send DEL for keypad delete NYI	3652	// 1037 send DEL for keypad delete NYI
3628	{ 1047, PrivMode_Screen },	3653	{ 1047, PrivMode_Screen },
3629	// 1048 save and restore cursor	3654	// 1048 save and restore cursor, implemented in code
3630	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3655	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3656	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3632	{ 2004, PrivMode_BracketPaste },	3657	{ 2004, PrivMode_BracketPaste },
3633	};	3658	};
3634		3659
…		…
3644	for (i = 0; i < nargs; i++)	3669	for (i = 0; i < nargs; i++)
3645	{	3670	{
3646	state = -1;	3671	state = -1;
3647		3672
3648	/* basic handling */	3673	/* basic handling */
3649	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3674	for (j = 0; j < ecb_array_length (argtopriv); j++)
3650	if (argtopriv[j].argval == arg[i])	3675	if (argtopriv[j].argval == arg[i])
3651	{	3676	{
3652	state = privcases (mode, argtopriv[j].bit);	3677	state = privcases (mode, argtopriv[j].bit);
3653	break;	3678	break;
3654	}	3679	}
…		…
3680	case 2: /* VT52 mode */	3705	case 2: /* VT52 mode */
3681	/* oddball mode. should be set regardless of set/reset	3706	/* oddball mode. should be set regardless of set/reset
3682	* parameter. Return from VT52 mode with an ESC < from	3707	* parameter. Return from VT52 mode with an ESC < from
3683	* within VT52 mode	3708	* within VT52 mode
3684	*/	3709	*/
3685	set_privmode (PrivMode_vt52, 1);	3710	priv_modes \|= PrivMode_vt52;
3686	break;	3711	break;
3687	case 3: /* 80/132 */	3712	case 3: /* 80/132 */
3688	if (priv_modes & PrivMode_132OK)	3713	if (priv_modes & PrivMode_132OK)
3689	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3714	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690	break;	3715	break;
…		…
3705	if (state) /* orthogonal */	3730	if (state) /* orthogonal */
3706	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3731	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3707	break;	3732	break;
3708	#ifdef scrollBar_esc	3733	#ifdef scrollBar_esc
3709	case scrollBar_esc:	3734	case scrollBar_esc:
3710	if (scrollBar.map (state))	3735	scrollBar.map (state);
3711	{
3712	resize_all_windows (0, 0, 0);	3736	resize_all_windows (0, 0, 0);
3713	scr_touch (true);	3737	scr_touch (true);
3714	}
3715	break;	3738	break;
3716	#endif	3739	#endif
3717	case 25: /* visible/invisible cursor */	3740	case 25: /* visible/invisible cursor */
3718	scr_cursor_visible (state);	3741	scr_cursor_visible (state);
3719	break;	3742	break;
…		…
3732	case 1003:	3755	case 1003:
3733	if (state)	3756	if (state)
3734	{	3757	{
3735	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3758	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3736	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3759	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3760	mouse_row = mouse_col = 0;
3737	vt_emask_mouse = PointerMotionMask;	3761	vt_emask_mouse = PointerMotionMask;
3738	}	3762	}
3739	else	3763	else
3740	vt_emask_mouse = NoEventMask;	3764	vt_emask_mouse = NoEventMask;
3741		3765
…		…
3926	}	3950	}
3927	}	3951	}
3928	}	3952	}
3929	/}}} /	3953	/}}} /
3930		3954
3931	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3932	void
3933	rxvt_term::process_graphics ()
3934	{
3935	unicode_t ch, cmd = cmd_getc ();
3936
3937	if (cmd == 'Q')
3938	{
3939	/* query graphics */
3940	tt_printf ("\033G0\012"); /* no graphics */
3941	return;
3942	}
3943	/* swallow other graphics sequences until terminating ':' */
3944	do
3945	ch = cmd_getc ();
3946	while (ch != ':');
3947	}
3948	/}}} /
3949
3950	/* ------------------------------------------------------------------------- */	3955	/* ------------------------------------------------------------------------- */
3951		3956
3952	/*	3957	/*
3953	* Send printf () formatted output to the command.	3958	* Send printf () formatted output to the command.
3954	* Only use for small amounts of data.	3959	* Only use for small amounts of data.
…		…
3967		3972
3968	/* ---------------------------------------------------------------------- */	3973	/* ---------------------------------------------------------------------- */
3969	/* Write data to the pty as typed by the user, pasted with the mouse,	3974	/* Write data to the pty as typed by the user, pasted with the mouse,
3970	* or generated by us in response to a query ESC sequence.	3975	* or generated by us in response to a query ESC sequence.
3971	*/	3976	*/
3972	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	3977	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3973		3978
3974	void	3979	void
3975	rxvt_term::tt_write (const char *data, unsigned int len)	3980	rxvt_term::tt_write (const char *data, unsigned int len)
3976	{	3981	{
3977	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	3982	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3982		3987
3983	if (v_buflen == 0)	3988	if (v_buflen == 0)
3984	{	3989	{
3985	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	3990	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3986		3991
		3992	max_it (written, 0);
		3993
3987	if ((unsigned int)written == len)	3994	if (written == len)
3988	return;	3995	return;
3989		3996
3990	data += written;	3997	data += written;
3991	len -= written;	3998	len -= written;
3992	}	3999	}
3993		4000
3994	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4001	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3995		4002
3996	memcpy (v_buffer + v_buflen, data, len);	4003	memcpy (v_buffer + v_buflen, data, len);
3997	v_buflen += len;	4004	v_buflen += len;
3998		4005
3999	pty_ev.set (ev::READ \| ev::WRITE);	4006	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.433 by root, Sat May 30 06:56:20 2009 UTC vs. Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.433 by root, Sat May 30 06:56:20 2009 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC