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

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

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.437 by sf-exg, Fri Jan 29 17:27:36 2010 UTC vs.
Revision 1.499 by root, Wed Nov 16 20:15:45 2011 UTC