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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
162		162
163	void	163	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font f = (fs)[fs->find_font (ch)];
168	wchar_t chr, alloc, ch2, *fname;	167	wchar_t chr, alloc, ch2, **fname;
169	int len;	168	int len;
170
171	fname = rxvt_utf8towcs (f->name);
172		169
173	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
174	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
175	{	172	{
176	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
197	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
198	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
199	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
201		198
		199	int width = 0;
		200	fname = rxvt_temp_buf<wchar_t *> (len);
		201	for (int i = 0; i < len; i++)
		202	{
		203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
		204	fname[i] = rxvt_utf8towcs (f->name);
202	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
203		207
204	max_it (width, 8+5); // for char + hex	208	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
206		210
207	if (y >= 0)	211	if (y >= 0)
208	{	212	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210	x = 0;	214	x = 0;
211	}	215	}
212		216
213	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
214		218
215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216		220
217	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
218	{	222	{
…		…
237	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
238	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
239	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
240	// }	244	// }
241	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
242	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
243
244	free (fname);	249	free (fname[i]);
		250	}
245		251
246	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
247	if (alloc)	253	if (alloc)
248	delete [] alloc;	254	delete [] alloc;
249	# endif	255	# endif
…		…
282	}	288	}
283		289
284	static int	290	static int
285	hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
286	{	292	{
287	// check wether this event corresponds to a hex digit	293	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	294	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	295	for (int index = 0; index < 8; index++)
290	{	296	{
291	KeySym k = XLookupKeysym (&ev, index);	297	KeySym k = XLookupKeysym (&ev, index);
292		298
…		…
416	*/	422	*/
417	shft = ev.state & ShiftMask;	423	shft = ev.state & ShiftMask;
418	ctrl = ev.state & ControlMask;	424	ctrl = ev.state & ControlMask;
419	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
420		426
421	if (numlock_state \|\| (ev.state & ModNumLockMask))
422	{
423	numlock_state = (ev.state & ModNumLockMask);
424	set_privmode (PrivMode_aplKP, !numlock_state);
425	}
426
427	kbuf[0] = 0;	427	kbuf[0] = 0;
428		428
429	#ifdef USE_XIM	429	#ifdef USE_XIM
430	if (Input_Context)	430	if (Input_Context)
431	{	431	{
…		…
505	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
506	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
507	#else	507	#else
508	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
509	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
510	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
511	{	513	{
512	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
513	return;	515	return;
514	}	516	}
…		…
567	selection_request (ev.time);	569	selection_request (ev.time);
568	return;	570	return;
569	#if TODO	571	#if TODO
570	/* rxvt extras */	572	/* rxvt extras */
571	case XK_KP_Add: /* Shift+KP_Add = bigger font */	573	case XK_KP_Add: /* Shift+KP_Add = bigger font */
572	change_font (FONT_UP);
573	return;	574	return;
574	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	575	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575	change_font (FONT_DN);
576	return;	576	return;
577	#endif	577	#endif
578	}	578	}
579	}	579	}
580	}	580	}
581		581
582	#if ENABLE_FRILLS \|\| ISO_14755	582	#if ENABLE_FRILLS \|\| ISO_14755
583	// ISO 14755 support	583	// ISO 14755 support
584	if (shft && ctrl)	584	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
585	{	585	{
586	int hv;	586	int hv;
587		587
588	if (iso14755buf & ISO_14755_51	588	if (iso14755buf & ISO_14755_51
589	&& (keysym == XK_space \|\| keysym == XK_KP_Space	589	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
619	scr_overlay_off ();	619	scr_overlay_off ();
620	# endif	620	# endif
621	iso14755buf = 0;	621	iso14755buf = 0;
622	}	622	}
623	}	623	}
		624	else if (option (Opt_iso14755) &&
624	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	625	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
625	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	626	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
626	if (!(iso14755buf & ISO_14755_STARTED))	627	if (!(iso14755buf & ISO_14755_STARTED))
627	{	628	{
628	iso14755buf \|= ISO_14755_STARTED;	629	iso14755buf \|= ISO_14755_STARTED;
629	# if ISO_14755	630	# if ISO_14755
630	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	631	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	645	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645	{	646	{
646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	647	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647	unsigned int newlen = 1;	648	unsigned int newlen = 1;
648		649
		650	if (ev.state & ModNumLockMask)
		651	kp = false;
		652
649	switch (translate_keypad (keysym, kp))	653	keysym = translate_keypad (keysym, kp);
		654
		655	switch (keysym)
650	{	656	{
651	#ifndef NO_BACKSPACE_KEY	657	#ifndef NO_BACKSPACE_KEY
652	case XK_BackSpace:	658	case XK_BackSpace:
653	if (priv_modes & PrivMode_HaveBackSpace)	659	if (priv_modes & PrivMode_HaveBackSpace)
654	{	660	{
…		…
881	commit_iso14755 ();	887	commit_iso14755 ();
882		888
883	return;	889	return;
884	}	890	}
885		891
886	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	892	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887	if (i[0] == keysym)	893	if (i[0] == keysym)
888	{	894	{
889	iso14755buf = ISO_14755_51 \| i[1];	895	iso14755buf = ISO_14755_51 \| i[1];
890	commit_iso14755 ();	896	commit_iso14755 ();
891		897
…		…
928	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)	934	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
929	mouse_slip_wheel_speed = 0;	935	mouse_slip_wheel_speed = 0;
930	#endif	936	#endif
931	}	937	}
932		938
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	939	void
967	rxvt_term::flush ()	940	rxvt_term::flush ()
968	{	941	{
969	flush_ev.stop ();	942	flush_ev.stop ();
970		943
971	#ifdef HAVE_BG_PIXMAP	944	#ifdef HAVE_BG_PIXMAP
972	if (bgPixmap.check_clearChanged ())	945	if (bg_flags & BG_NEEDS_REFRESH)
973	{	946	{
974	// scr_clear (true); This needs to be researched further!	947	bg_flags &= ~BG_NEEDS_REFRESH;
975	scr_touch (false);	948	scr_touch (false);
976	}	949	}
977	#endif	950	#endif
978		951
979	if (want_refresh)	952	if (want_refresh)
…		…
1024	}	997	}
1025		998
1026	display->flush ();	999	display->flush ();
1027	}	1000	}
1028		1001
1029	/* checks wether a refresh is requested and starts the refresh timer */	1002	/* checks whether a refresh is requested and starts the refresh timer */
1030	void	1003	void
1031	rxvt_term::refresh_check ()	1004	rxvt_term::refresh_check ()
1032	{	1005	{
1033	if (want_refresh && !flush_ev.is_active ())	1006	if (want_refresh && !flush_ev.is_active ())
1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1007	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1127	{	1100	{
1128	// this should really be sched_yield(), but the linux guys thought	1101	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1102	// 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	1103	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1104	// allowed by the sus... as is returning ENOSYS.
		1105	// since the linux guys additionally thought that breaking the only
		1106	// known workaround against their unusable sched_yield hack is cool,
		1107	// we just nanosleep a bit and hope for the best.
1132		1108
1133	struct timespec ts = { 0, 0 };	1109	struct timespec ts = { 0, 1000 };
1134	nanosleep (&ts, 0);	1110	nanosleep (&ts, 0);
1135		1111
1136	w.stop ();	1112	w.stop ();
1137	}	1113	}
1138		1114
…		…
1141	{	1117	{
1142	}	1118	}
1143	} event_handler;	1119	} event_handler;
1144	#endif	1120	#endif
1145		1121
		1122	/* make sure all the cmd data is at beginning of cmdbuf */
		1123	void
		1124	rxvt_term::cmdbuf_reify ()
		1125	{
		1126	if (cmdbuf_ptr == cmdbuf_base)
		1127	return;
		1128
		1129	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1130
		1131	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1132	cmdbuf_ptr = cmdbuf_base;
		1133	cmdbuf_endp = cmdbuf_ptr + used;
		1134
		1135	}
		1136
		1137	#if defined (KEYSYM_RESOURCE)
		1138	void
		1139	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1140	{
		1141	cmdbuf_reify ();
		1142
		1143	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1144
		1145	if (count > avail)
		1146	return;
		1147
		1148	memcpy (cmdbuf_endp, str, count);
		1149	cmdbuf_endp += count;
		1150
		1151	cmd_parse ();
		1152	}
		1153	#endif
		1154
1146	bool	1155	bool
1147	rxvt_term::pty_fill ()	1156	rxvt_term::pty_fill ()
1148	{	1157	{
1149	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1158	cmdbuf_reify ();
1150		1159
1151	if (CBUFSIZ == n)	1160	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152	{	1161
1153	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1162	if (!avail)
1154	n = 0;
1155	}	1163	{
1156		1164	// normally this indicates a "too long" command sequence - just drop the data we have
1157	memmove (cmdbuf_base, cmdbuf_ptr, n);
1158	cmdbuf_ptr = cmdbuf_base;	1165	cmdbuf_ptr = cmdbuf_base;
1159	cmdbuf_endp = cmdbuf_ptr + n;	1166	cmdbuf_endp = cmdbuf_ptr;
		1167	avail = CBUFSIZ;
		1168	}
1160		1169
1161	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1170	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162		1171
1163	if (r > 0)	1172	if (r > 0)
1164	{	1173	{
1165	cmdbuf_endp += r;	1174	cmdbuf_endp += r;
1166	return true;	1175	return true;
…		…
1188	{	1197	{
1189	make_current ();	1198	make_current ();
1190		1199
1191	if (revents & ev::READ)	1200	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1201	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1202	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1203	cmd_parse ();
1195	break;
1196		1204
1197	if (revents & ev::WRITE)	1205	if (revents & ev::WRITE)
1198	pty_write ();	1206	pty_write ();
1199		1207
1200	refresh_check ();	1208	refresh_check ();
…		…
1241	{	1249	{
1242	int button_number, key_state = 0;	1250	int button_number, key_state = 0;
1243	int x, y;	1251	int x, y;
1244	int code = 32;	1252	int code = 32;
1245		1253
1246	x = Pixel2Col (ev.x);	1254	x = Pixel2Col (ev.x) + 1;
1247	y = Pixel2Row (ev.y);	1255	y = Pixel2Row (ev.y) + 1;
		1256
1248	if (ev.type == MotionNotify)	1257	if (ev.type == MotionNotify)
1249	{	1258	{
1250	if (x == mouse_row && y == mouse_col)	1259	if (x == mouse_row && y == mouse_col)
1251	return;	1260	return;
		1261
1252	mouse_row = x;	1262	mouse_row = x;
1253	mouse_col = y;	1263	mouse_col = y;
1254	code += 32;	1264	code += 32;
1255	}	1265	}
1256		1266
…		…
1259	else	1269	else
1260	{	1270	{
1261	button_number = MEvent.button - Button1;	1271	button_number = MEvent.button - Button1;
1262	/* add 0x3D for wheel events, like xterm does */	1272	/* add 0x3D for wheel events, like xterm does */
1263	if (button_number >= 3)	1273	if (button_number >= 3)
1264	button_number += (64 - 3);	1274	button_number += 64 - 3;
1265	}	1275	}
1266		1276
1267	if (priv_modes & PrivMode_MouseX10)	1277	if (priv_modes & PrivMode_MouseX10)
1268	{	1278	{
1269	/*	1279	/*
…		…
1301	fputc ('A', stderr);	1311	fputc ('A', stderr);
1302	if (key_state & 32)	1312	if (key_state & 32)
1303	fputc ('2', stderr);	1313	fputc ('2', stderr);
1304	fprintf (stderr, "]: <%d>, %d/%d\n",	1314	fprintf (stderr, "]: <%d>, %d/%d\n",
1305	button_number,	1315	button_number,
1306	x + 1,	1316	x,
1307	y + 1);	1317	y);
1308	#endif	1318	#endif
1309		1319
		1320	#if ENABLE_FRILLS
		1321	if (priv_modes & PrivMode_ExtMouseRight)
		1322	tt_printf ("\033[%d;%d;%dM",
		1323	code + button_number + key_state,
		1324	x,
		1325	y);
		1326	else if (priv_modes & PrivMode_ExtModeMouse)
		1327	tt_printf ("\033[M%c%lc%lc",
		1328	code + button_number + key_state,
		1329	wint_t (32 + x),
		1330	wint_t (32 + y));
		1331	else
		1332	#endif
1310	tt_printf ("\033[M%c%c%c",	1333	tt_printf ("\033[M%c%c%c",
1311	(code + button_number + key_state),	1334	code + button_number + key_state,
1312	(32 + x + 1),	1335	32 + x,
1313	(32 + y + 1));	1336	32 + y);
1314	}	1337	}
1315		1338
1316	/{{{ process an X event /	1339	/{{{ process an X event /
1317	void	1340	void
1318	rxvt_term::x_cb (XEvent &ev)	1341	rxvt_term::x_cb (XEvent &ev)
…		…
1420	&& ev.xfocus.mode != NotifyGrab)	1443	&& ev.xfocus.mode != NotifyGrab)
1421	focus_out ();	1444	focus_out ();
1422	break;	1445	break;
1423		1446
1424	case ConfigureNotify:	1447	case ConfigureNotify:
1425	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427	szHint.width, szHint.height);*/
1428	if (ev.xconfigure.window == parent[0])	1448	if (ev.xconfigure.window == parent)
1429	{	1449	{
1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1450	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431	;	1451	;
		1452
		1453	#ifdef HAVE_BG_PIXMAP
		1454	bool moved = false;
		1455	if (bg_window_position_sensitive ())
		1456	{
		1457	int x, y;
		1458	if (ev.xconfigure.send_event)
		1459	{
		1460	x = ev.xconfigure.x;
		1461	y = ev.xconfigure.y;
		1462	}
		1463	else
		1464	get_window_origin (x, y);
		1465
		1466	if (bg_set_position (x, y)
		1467	\|\| !(bg_flags & BG_IS_VALID))
		1468	moved = true;
		1469	}
		1470	#endif
1432		1471
1433	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1472	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1434	{	1473	{
1435	seen_resize = 1;	1474	seen_resize = 1;
1436	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1475	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437	}	1476	}
1438	else	1477	else
1439	{	1478	{
1440	#ifdef HAVE_BG_PIXMAP	1479	#ifdef HAVE_BG_PIXMAP
1441	if (bgPixmap.window_position_sensitive ())	1480	if (moved)
1442	{	1481	{
1443	if (mapped)	1482	if (mapped)
1444	update_background ();	1483	update_background ();
1445	else	1484	else
1446	bgPixmap.invalidate ();	1485	bg_invalidate ();
1447	}	1486	}
1448	#endif	1487	#endif
1449	}	1488	}
1450		1489
1451	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1490	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452	}	1491	}
1453	break;	1492	break;
1454		1493
1455	case PropertyNotify:	1494	case PropertyNotify:
1456	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1495	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458	&& ev.xproperty.state == PropertyNewValue)
1459	selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461	break;	1496	break;
1462		1497
1463	case SelectionClear:	1498	case SelectionClear:
1464	selection_clear ();	1499	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465	break;
1466
1467	case SelectionNotify:
1468	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470	break;	1500	break;
1471		1501
1472	case SelectionRequest:	1502	case SelectionRequest:
1473	selection_send (ev.xselectionrequest);	1503	selection_send (ev.xselectionrequest);
1474	break;	1504	break;
1475		1505
1476	case MapNotify:	1506	case MapNotify:
1477	#ifdef HAVE_BG_PIXMAP	1507	#ifdef HAVE_BG_PIXMAP
1478	/* This is needed spcifically to fix the case of no window manager or a	1508	/* This is needed specifically to fix the case of no window manager or a
1479	* non-reparenting window manager. In those cases we never get first	1509	* non-reparenting window manager. In those cases we never get first
1480	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1510	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1481	* care of multiplicity of ConfigureNotify events arriwing while WM does	1511	* care of multiplicity of ConfigureNotify events arriving while WM does
1482	* reparenting.	1512	* reparenting.
1483	* We should not render background immidiately, as there could be several	1513	* We should not render background immediately, as there could be several
1484	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1514	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485	* by scheduling background redraw as soon as we can, but giving a short	1515	* by scheduling background redraw as soon as we can, but giving a short
1486	* bit of time for ConfigureNotifies to arrive.	1516	* bit of time for ConfigureNotifies to arrive.
1487	* We should render background PRIOR to drawing any text, but AFTER all	1517	* We should render background PRIOR to drawing any text, but AFTER all
1488	* of ConfigureNotifys for the best results.	1518	* of ConfigureNotifys for the best results.
1489	*/	1519	*/
1490	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1520	if (!(bg_flags & BG_IS_VALID))
1491	update_background_ev.start (0.025);	1521	update_background_ev.start (0.025);
1492	#endif	1522	#endif
1493	mapped = 1;	1523	mapped = 1;
1494	#ifdef TEXT_BLINK	1524	#ifdef TEXT_BLINK
1495	text_blink_ev.start ();	1525	text_blink_ev.start ();
…		…
1510	if (ev.xany.window == vt)	1540	if (ev.xany.window == vt)
1511	{	1541	{
1512	do	1542	do
1513	{	1543	{
1514	scr_expose (ev.xexpose.x, ev.xexpose.y,	1544	scr_expose (ev.xexpose.x, ev.xexpose.y,
1515	ev.xexpose.width, ev.xexpose.height, False);	1545	ev.xexpose.width, ev.xexpose.height, false);
1516	}	1546	}
1517	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1547	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518		1548
1519	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1549	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520		1550
1521	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522	{	1552	{
1523	scr_expose (ev.xexpose.x, ev.xexpose.y,	1553	scr_expose (ev.xexpose.x, ev.xexpose.y,
1524	ev.xexpose.width, ev.xexpose.height, False);	1554	ev.xexpose.width, ev.xexpose.height, false);
1525	}	1555	}
1526		1556
1527	want_refresh = 1;	1557	want_refresh = 1;
1528	}	1558	}
1529	else	1559	else
…		…
1682	#endif	1712	#endif
1683		1713
1684	refresh_check ();	1714	refresh_check ();
1685	}	1715	}
1686		1716
		1717	#if ENABLE_FRILLS
1687	void	1718	void
1688	rxvt_term::set_urgency (bool enable)	1719	rxvt_term::set_urgency (bool enable)
1689	{	1720	{
1690	if (enable == urgency_hint)	1721	if (enable == urgency_hint)
1691	return;	1722	return;
1692		1723
1693	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1724	if (XWMHints *h = XGetWMHints (dpy, parent))
1694	{	1725	{
1695	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1726	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1696	XSetWMHints (dpy, parent[0], h);	1727	XSetWMHints (dpy, parent, h);
1697	urgency_hint = enable;	1728	urgency_hint = enable;
1698	}	1729	}
1699	}	1730	}
		1731	#endif
1700		1732
1701	void	1733	void
1702	rxvt_term::focus_in ()	1734	rxvt_term::focus_in ()
1703	{	1735	{
1704	if (!focus)	1736	if (!focus)
…		…
1808	* use the property to determine the pixmap. We use it later on.	1840	* use the property to determine the pixmap. We use it later on.
1809	*/	1841	*/
1810	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1842	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1811	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1843	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1812	{	1844	{
1813	bgPixmap.set_root_pixmap ();	1845	bg_set_root_pixmap ();
1814	update_background ();	1846	update_background ();
1815	}	1847	}
1816		1848
1817	break;	1849	break;
1818	}	1850	}
…		…
1857	/* save the xbutton state (for ButtonRelease) */	1889	/* save the xbutton state (for ButtonRelease) */
1858	MEvent.state = ev.state;	1890	MEvent.state = ev.state;
1859	#ifdef MOUSE_REPORT_DOUBLECLICK	1891	#ifdef MOUSE_REPORT_DOUBLECLICK
1860	if (ev.button == MEvent.button && clickintime)	1892	if (ev.button == MEvent.button && clickintime)
1861	{	1893	{
1862	/* same button, within alloted time */	1894	/* same button, within allowed time */
1863	MEvent.clicks++;	1895	MEvent.clicks++;
1864		1896
1865	if (MEvent.clicks > 1)	1897	if (MEvent.clicks > 1)
1866	{	1898	{
1867	/* only report double clicks */	1899	/* only report double clicks */
…		…
2138	selection_make (ev.time);	2170	selection_make (ev.time);
2139	break;	2171	break;
2140		2172
2141	case Button2:	2173	case Button2:
2142	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2174	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2175	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144	break;	2176	break;
2145		2177
2146	#ifdef MOUSE_WHEEL	2178	#ifdef MOUSE_WHEEL
2147	case Button4:	2179	case Button4:
2148	case Button5:	2180	case Button5:
…		…
2182	}	2214	}
2183	}	2215	}
2184		2216
2185	/}}} /	2217	/}}} /
2186		2218
2187	bool	2219	void
2188	rxvt_term::cmd_parse ()	2220	rxvt_term::cmd_parse ()
2189	{	2221	{
2190	bool flag = false;
2191	wchar_t ch = NOCHAR;	2222	wchar_t ch = NOCHAR;
2192	char *seq_begin; // remember start of esc-sequence here	2223	char *seq_begin; // remember start of esc-sequence here
2193		2224
2194	for (;;)	2225	for (;;)
2195	{	2226	{
…		…
2289	* What the heck we'll cheat and only refresh less than every page-full.	2320	* What the heck we'll cheat and only refresh less than every page-full.
2290	* if skipScroll is enabled.	2321	* if skipScroll is enabled.
2291	*/	2322	*/
2292	if (refreshnow)	2323	if (refreshnow)
2293	{	2324	{
2294	flag = true;
2295	scr_refresh ();	2325	scr_refresh ();
2296	want_refresh = 1;	2326	want_refresh = 1;
2297	}	2327	}
2298
2299	}	2328	}
2300	else	2329	else
2301	{	2330	{
2302	try	2331	try
2303	{	2332	{
…		…
2311	}	2340	}
2312		2341
2313	ch = NOCHAR;	2342	ch = NOCHAR;
2314	}	2343	}
2315	}	2344	}
2316
2317	return flag;
2318	}	2345	}
2319		2346
2320	// read the next character	2347	// read the next character
2321	wchar_t	2348	wchar_t
2322	rxvt_term::next_char () NOTHROW	2349	rxvt_term::next_char () NOTHROW
…		…
2337	break;	2364	break;
2338	}	2365	}
2339		2366
2340	if (len == (size_t)-1)	2367	if (len == (size_t)-1)
2341	{	2368	{
2342	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2369	mbstate.reset (); // reset now undefined conversion state
2343	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2370	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344	}	2371	}
2345		2372
2346	// assume wchar == unicode	2373	// assume wchar == unicode
2347	cmdbuf_ptr += len;	2374	cmdbuf_ptr += len;
…		…
2360	: NOCHAR;	2387	: NOCHAR;
2361	}	2388	}
2362		2389
2363	static class out_of_input out_of_input;	2390	static class out_of_input out_of_input;
2364		2391
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	2392	wchar_t
2371	rxvt_term::cmd_getc () THROW ((class out_of_input))	2393	rxvt_term::cmd_getc () THROW ((class out_of_input))
2372	{	2394	{
2373	wchar_t c = next_char ();	2395	wchar_t c = next_char ();
2374		2396
…		…
2656		2678
2657	/* 8.3.87: NEXT LINE */	2679	/* 8.3.87: NEXT LINE */
2658	case C1_NEL: /* ESC E */	2680	case C1_NEL: /* ESC E */
2659	{	2681	{
2660	wchar_t nlcr[] = { C0_LF, C0_CR };	2682	wchar_t nlcr[] = { C0_LF, C0_CR };
2661	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2683	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2662	}	2684	}
2663	break;	2685	break;
2664		2686
2665	/* kidnapped escape sequence: Should be 8.3.48 */	2687	/* kidnapped escape sequence: Should be 8.3.48 */
2666	case C1_ESA: /* ESC G */	2688	case C1_ESA: /* ESC G */
2667	process_graphics ();	2689	// used by original rxvt for rob nations own graphics mode
		2690	if (cmd_getc () == 'Q')
		2691	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668	break;	2692	break;
2669		2693
2670	/* 8.3.63: CHARACTER TABULATION SET */	2694	/* 8.3.63: CHARACTER TABULATION SET */
2671	case C1_HTS: /* ESC H */	2695	case C1_HTS: /* ESC H */
2672	scr_set_tab (1);	2696	scr_set_tab (1);
…		…
2691	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2715	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692	case C1_SCI: /* ESC Z */	2716	case C1_SCI: /* ESC Z */
2693	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2717	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694	break; /* steal obsolete ESC [ c */	2718	break; /* steal obsolete ESC [ c */
2695		2719
2696	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2720	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697	case C1_CSI: /* ESC [ */	2721	case C1_CSI: /* ESC [ */
2698	process_csi_seq ();	2722	process_csi_seq ();
2699	break;	2723	break;
2700		2724
2701	/* 8.3.90: OPERATING SYSTEM COMMAND */	2725	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702	case C1_OSC: /* ESC ] */	2726	case C1_OSC: /* ESC ] */
2703	process_osc_seq ();	2727	process_osc_seq ();
2704	break;	2728	break;
2705		2729
2706	/* 8.3.106: RESET TO INITIAL STATE */	2730	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707	case 'c':	2731	case 'c':
2708	mbstate.reset ();	2732	mbstate.reset ();
2709	scr_poweron ();	2733	scr_poweron ();
2710	scrollBar.show (1);	2734	scrollBar.show (1);
2711	break;	2735	break;
…		…
2735	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2759	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 ,	2760	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	2761	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738	};	2762	};
2739		2763
2740	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2764	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \	2765	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \
2742	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))	2766	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))
2743	#define get_byte_array_bit(array, bit) \	2767	#define get_byte_array_bit(array, bit) \
2744	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2768	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745		2769
2746	const unsigned char csi_defaults[] =	2770	static const unsigned char csi_defaults[] =
2747	{	2771	{
2748	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2772	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, */	2773	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, */	2774	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, [, \, ], ^, _, */	2775	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
…		…
2766		2790
2767	nargs = 0;	2791	nargs = 0;
2768		2792
2769	priv = 0;	2793	priv = 0;
2770	ch = cmd_getc ();	2794	ch = cmd_getc ();
2771	if (ch >= '<' && ch <= '?')	2795	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2772	{	2796	{
2773	/* '<' '=' '>' '?' */	2797	/* '<' '=' '>' '?' '!' */
2774	priv = ch;	2798	priv = ch;
2775	ch = cmd_getc ();	2799	ch = cmd_getc ();
2776	}	2800	}
2777		2801
2778	/* read any numerical arguments */	2802	/* read any numerical arguments */
…		…
2832		2856
2833	case '?':	2857	case '?':
2834	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2858	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2835	process_terminal_mode (ch, priv, nargs, arg);	2859	process_terminal_mode (ch, priv, nargs, arg);
2836	break;	2860	break;
		2861
		2862	case '!':
		2863	if (ch == CSI_70)
		2864	{
		2865	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2866	scr_soft_reset ();
		2867
		2868	static const int pm_h[] = { 7, 25 };
		2869	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
		2870
		2871	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
		2872	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2837	}	2873	}
		2874	break;
		2875	}
		2876
2838	return;	2877	return;
2839	}	2878	}
2840		2879
2841	switch (ch)	2880	switch (ch)
2842	{	2881	{
…		…
3076	{	3115	{
3077	/*	3116	/*
3078	* commands	3117	* commands
3079	*/	3118	*/
3080	case 1: /* deiconify window */	3119	case 1: /* deiconify window */
3081	XMapWindow (dpy, parent[0]);	3120	XMapWindow (dpy, parent);
3082	break;	3121	break;
3083	case 2: /* iconify window */	3122	case 2: /* iconify window */
3084	XIconifyWindow (dpy, parent[0], display->screen);	3123	XIconifyWindow (dpy, parent, display->screen);
3085	break;	3124	break;
3086	case 3: /* set position (pixels) */	3125	case 3: /* set position (pixels) */
3087	XMoveWindow (dpy, parent[0], args[1], args[2]);	3126	XMoveWindow (dpy, parent, args[1], args[2]);
3088	break;	3127	break;
3089	case 4: /* set size (pixels) */	3128	case 4: /* set size (pixels) */
3090	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3129	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3091	break;	3130	break;
3092	case 5: /* raise window */	3131	case 5: /* raise window */
3093	XRaiseWindow (dpy, parent[0]);	3132	XRaiseWindow (dpy, parent);
3094	break;	3133	break;
3095	case 6: /* lower window */	3134	case 6: /* lower window */
3096	XLowerWindow (dpy, parent[0]);	3135	XLowerWindow (dpy, parent);
3097	break;	3136	break;
3098	case 7: /* refresh window */	3137	case 7: /* refresh window */
3099	scr_touch (true);	3138	scr_touch (true);
3100	break;	3139	break;
3101	case 8: /* set size (chars) */	3140	case 8: /* set size (chars) */
…		…
3112		3151
3113	/*	3152	/*
3114	* reports - some output format copied from XTerm	3153	* reports - some output format copied from XTerm
3115	*/	3154	*/
3116	case 11: /* report window state */	3155	case 11: /* report window state */
3117	XGetWindowAttributes (dpy, parent[0], &wattr);	3156	XGetWindowAttributes (dpy, parent, &wattr);
3118	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3157	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3119	break;	3158	break;
3120	case 13: /* report window position */	3159	case 13: /* report window position */
3121	XGetWindowAttributes (dpy, parent[0], &wattr);	3160	XGetWindowAttributes (dpy, parent, &wattr);
3122	XTranslateCoordinates (dpy, parent[0], wattr.root,	3161	XTranslateCoordinates (dpy, parent, wattr.root,
3123	-wattr.border_width, -wattr.border_width,	3162	-wattr.border_width, -wattr.border_width,
3124	&x, &y, &wdummy);	3163	&x, &y, &wdummy);
3125	tt_printf ("\033[3;%d;%dt", x, y);	3164	tt_printf ("\033[3;%d;%dt", x, y);
3126	break;	3165	break;
3127	case 14: /* report window size (pixels) */	3166	case 14: /* report window size (pixels) */
3128	XGetWindowAttributes (dpy, parent[0], &wattr);	3167	XGetWindowAttributes (dpy, parent, &wattr);
3129	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3168	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3130	break;	3169	break;
3131	case 18: /* report text area size (chars) */	3170	case 18: /* report text area size (chars) */
3132	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3171	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3133	break;	3172	break;
…		…
3135	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3174	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3136	break;	3175	break;
3137	case 20: /* report icon label */	3176	case 20: /* report icon label */
3138	{	3177	{
3139	char *s;	3178	char *s;
3140	XGetIconName (dpy, parent[0], &s);	3179	XGetIconName (dpy, parent, &s);
3141	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3180	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3142	XFree (s);	3181	XFree (s);
3143	}	3182	}
3144	break;	3183	break;
3145	case 21: /* report window title */	3184	case 21: /* report window title */
3146	{	3185	{
3147	char *s;	3186	char *s;
3148	XFetchName (dpy, parent[0], &s);	3187	XFetchName (dpy, parent, &s);
3149	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3188	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3150	XFree (s);	3189	XFree (s);
3151	}	3190	}
3152	break;	3191	break;
3153	}	3192	}
…		…
3209	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3248	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3210	*/	3249	*/
3211	void	3250	void
3212	rxvt_term::process_dcs_seq ()	3251	rxvt_term::process_dcs_seq ()
3213	{	3252	{
3214	char *s;
3215	unicode_t eh;
3216
3217	/*	3253	/*
3218	* Not handled yet	3254	* Not handled yet
3219	*/	3255	*/
		3256
		3257	unicode_t eh;
3220	s = get_to_st (eh);	3258	char *s = get_to_st (eh);
3221	if (s)	3259	if (s)
3222	free (s);	3260	free (s);
3223		3261
3224	return;	3262	return;
3225	}	3263	}
…		…
3229	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3267	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3230	*/	3268	*/
3231	void	3269	void
3232	rxvt_term::process_osc_seq ()	3270	rxvt_term::process_osc_seq ()
3233	{	3271	{
3234	unicode_t ch, eh;
3235	int arg;	3272	int arg;
3236		3273
3237	ch = cmd_getc ();	3274	unicode_t ch = cmd_getc ();
3238	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3275	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3239	arg = arg * 10 + (ch - '0');	3276	arg = arg * 10 + (ch - '0');
3240		3277
3241	if (ch == ';')	3278	if (ch == ';')
3242	{	3279	{
		3280	unicode_t eh;
3243	char *s = get_to_st (eh);	3281	char *s = get_to_st (eh);
3244		3282
3245	if (s)	3283	if (s)
3246	{	3284	{
3247	process_xterm_seq (arg, s, eh);	3285	process_xterm_seq (arg, s, eh);
…		…
3271		3309
3272	/*	3310	/*
3273	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3311	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3274	*/	3312	*/
3275	void	3313	void
3276	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3314	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277	{	3315	{
3278	int color;	3316	int color;
3279	char buf, name;	3317	char buf, name;
3280	bool query = str[0] == '?' && !str[1];	3318	bool query = str[0] == '?' && !str[1];
3281	int saveop = op;	3319	int saveop = op;
…		…
3308	unsigned long bytes_after;	3346	unsigned long bytes_after;
3309	unsigned char *value = 0;	3347	unsigned char *value = 0;
3310	const char *str = "";	3348	const char *str = "";
3311		3349
3312	if (prop	3350	if (prop
3313	&& XGetWindowProperty (dpy, parent[0],	3351	&& XGetWindowProperty (dpy, parent,
3314	prop, 0, 1<<16, 0, AnyPropertyType,	3352	prop, 0, 1<<16, 0, AnyPropertyType,
3315	&actual_type, &actual_format,	3353	&actual_type, &actual_format,
3316	&nitems, &bytes_after, &value) == Success	3354	&nitems, &bytes_after, &value) == Success
3317	&& actual_type != None	3355	&& actual_type != None
3318	&& actual_format == 8)	3356	&& actual_format == 8)
…		…
3322		3360
3323	XFree (value);	3361	XFree (value);
3324	}	3362	}
3325	else	3363	else
3326	{	3364	{
3327	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3365	char *eq = strchr (str, '=');
3328		3366
3329	if (eq)	3367	if (eq)
3330	{	3368	{
3331	*eq = 0;	3369	*eq = 0;
3332	set_utf8_property (display->atom (str), eq + 1);	3370	set_utf8_property (display->atom (str), eq + 1);
3333	}	3371	}
3334	else	3372	else
3335	XDeleteProperty (dpy, parent[0],	3373	XDeleteProperty (dpy, parent,
3336	display->atom (str));	3374	display->atom (str));
3337	}	3375	}
3338	break;	3376	break;
3339		3377
3340	case XTerm_Color:	3378	case XTerm_Color:
…		…
3372	process_color_seq (op, Color_pointer_fg, str, resp);	3410	process_color_seq (op, Color_pointer_fg, str, resp);
3373	break;	3411	break;
3374	case XTerm_Color_pointer_bg:	3412	case XTerm_Color_pointer_bg:
3375	process_color_seq (op, Color_pointer_bg, str, resp);	3413	process_color_seq (op, Color_pointer_bg, str, resp);
3376	break;	3414	break;
		3415	#ifdef OPTION_HC
		3416	case XTerm_Color_HC:
		3417	process_color_seq (op, Color_HC, str, resp);
		3418	break;
		3419	case XTerm_Color_HTC:
		3420	process_color_seq (op, Color_HTC, str, resp);
		3421	break;
		3422	#endif
3377	#ifndef NO_BOLD_UNDERLINE_REVERSE	3423	#ifndef NO_BOLD_UNDERLINE_REVERSE
3378	case XTerm_Color_RV:
3379	process_color_seq (op, Color_RV, str, resp);
3380	break;
3381	case Rxvt_Color_BD:
3382	case URxvt_Color_BD:	3424	case URxvt_Color_BD:
3383	process_color_seq (op, Color_BD, str, resp);	3425	process_color_seq (op, Color_BD, str, resp);
3384	break;	3426	break;
3385	case Rxvt_Color_UL:
3386	case URxvt_Color_UL:	3427	case URxvt_Color_UL:
3387	process_color_seq (op, Color_UL, str, resp);	3428	process_color_seq (op, Color_UL, str, resp);
3388	break;	3429	break;
3389	case URxvt_Color_IT:	3430	case URxvt_Color_IT:
3390	process_color_seq (op, Color_IT, str, resp);	3431	process_color_seq (op, Color_IT, str, resp);
3391	break;	3432	break;
3392	#endif	3433	#endif
		3434	case URxvt_Color_border:
		3435	process_color_seq (op, Color_border, str, resp);
		3436	break;
3393	#if ENABLE_TRANSPARENCY	3437	#if ENABLE_TRANSPARENCY
3394	case URxvt_Color_tint:	3438	case URxvt_Color_tint:
3395	process_color_seq (op, Color_tint, str, resp);	3439	process_color_seq (op, Color_tint, str, resp);
3396	{	3440	{
3397	bool changed = false;	3441	bool changed = false;
3398		3442
3399	if (ISSET_PIXCOLOR (Color_tint))	3443	if (ISSET_PIXCOLOR (Color_tint))
3400	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3444	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3401	else
3402	changed = bgPixmap.unset_tint ();
3403		3445
3404	if (changed)	3446	if (changed)
3405	update_background ();	3447	update_background ();
3406	}	3448	}
3407		3449
…		…
3412	case Rxvt_Pixmap:	3454	case Rxvt_Pixmap:
3413	if (!strcmp (str, "?"))	3455	if (!strcmp (str, "?"))
3414	{	3456	{
3415	char str[256];	3457	char str[256];
3416		3458
3417	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3459	sprintf (str, "[%dx%d+%d+%d]",
3418	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3460	min (h_scale, 32767), min (v_scale, 32767),
3419	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3461	min (h_align, 32767), min (v_align, 32767));
3420	process_xterm_seq (XTerm_title, str, CHAR_ST);	3462	process_xterm_seq (XTerm_title, str, CHAR_ST);
3421	}	3463	}
3422	else	3464	else
3423	{	3465	{
3424	int changed = 0;	3466	int changed = 0;
3425		3467
3426	if (*str != ';')	3468	if (*str != ';')
3427	{	3469	{
3428	/* reset to default scaling :*/
3429	bgPixmap.unset_geometry ();
3430	if (bgPixmap.set_file (str)) /* change pixmap */	3470	if (bg_set_file (str)) /* change pixmap */
		3471	{
3431	changed++;	3472	changed++;
3432	str = strchr (str, ';');	3473	str = strchr (str, ';');
3433	if (str == NULL)	3474	if (str == NULL)
3434	bgPixmap.set_defaultGeometry ();	3475	bg_set_default_geometry ();
		3476	else
		3477	bg_set_geometry (str+1);
		3478	}
3435	}	3479	}
3436		3480	else
3437	while (str)
3438	{	3481	{
3439	str++;	3482	str++;
3440	if (bgPixmap.set_geometry (str))	3483	if (bg_set_geometry (str, true))
3441	changed++;	3484	changed++;
3442	str = strchr (str, ';');
3443	}	3485	}
3444		3486
3445	if (changed)	3487	if (changed)
		3488	{
		3489	if (bg_window_position_sensitive ())
		3490	{
		3491	int x, y;
		3492	get_window_origin (x, y);
		3493	bg_set_position (x, y);
		3494	}
3446	update_background ();	3495	update_background ();
		3496	}
3447	}	3497	}
3448	break;	3498	break;
3449	#endif	3499	#endif
3450		3500
3451	case XTerm_logfile:	3501	case XTerm_logfile:
…		…
3554	{	3604	{
3555	if (mode == 'r')	3605	if (mode == 'r')
3556	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3606	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557	else	3607	else
3558	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3608	state = (mode == 't') ? ! (priv_modes & bit) : mode;
		3609
3559	set_privmode (bit, state);	3610	set_privmode (bit, state);
3560	}	3611	}
3561		3612
3562	return state;	3613	return state;
3563	}	3614	}
…		…
3572	static const struct	3623	static const struct
3573	{	3624	{
3574	const int argval;	3625	const int argval;
3575	const unsigned long bit;	3626	const unsigned long bit;
3576	} argtopriv[] = {	3627	} argtopriv[] = {
3577	{ 1, PrivMode_aplCUR },	3628	{ 1, PrivMode_aplCUR }, // DECCKM
3578	{ 2, PrivMode_vt52 },	3629	{ 2, PrivMode_vt52 },
3579	{ 3, PrivMode_132 },	3630	{ 3, PrivMode_132 }, // DECCOLM
3580	{ 4, PrivMode_smoothScroll },	3631	{ 4, PrivMode_smoothScroll }, // DECSCLM
3581	{ 5, PrivMode_rVideo },	3632	{ 5, PrivMode_rVideo }, // DECSCNM
3582	{ 6, PrivMode_relOrigin },	3633	{ 6, PrivMode_relOrigin }, // DECOM
3583	{ 7, PrivMode_Autowrap },	3634	{ 7, PrivMode_Autowrap }, // DECAWM
3584	// 8, bi-directional support mode	3635	// 8, auto-repeat keys // DECARM
3585	{ 9, PrivMode_MouseX10 },	3636	{ 9, PrivMode_MouseX10 },
3586	// 18, 19 printing-related	3637	// 18 end FF to printer after print screen
		3638	// 19 Print screen prints full screen/scroll region
3587	{ 25, PrivMode_VisibleCursor },	3639	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588	#ifdef scrollBar_esc	3640	#ifdef scrollBar_esc
3589	{ scrollBar_esc, PrivMode_scrollBar },	3641	{ scrollBar_esc, PrivMode_scrollBar },
3590	#endif	3642	#endif
3591	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3643	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3644	// 38, tektronix mode // DECTEK
3592	{ 40, PrivMode_132OK },	3645	{ 40, PrivMode_132OK },
3593	// 41 xterm more fixes NYI	3646	// 41 xterm more fixes NYI
3594	// 45 margin bell NYI	3647	// 45 margin bell NYI
3595	// 46 start logging	3648	// 46 start logging
3596	{ 47, PrivMode_Screen },	3649	{ 47, PrivMode_Screen },
3597	{ 66, PrivMode_aplKP },	3650	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598	#ifndef NO_BACKSPACE_KEY	3651	#ifndef NO_BACKSPACE_KEY
3599	{ 67, PrivMode_BackSpace },	3652	{ 67, PrivMode_BackSpace }, // DECBKM
3600	#endif	3653	#endif
3601	{ 1000, PrivMode_MouseX11 },	3654	{ 1000, PrivMode_MouseX11 },
3602	{ 1002, PrivMode_MouseBtnEvent },	3655	{ 1002, PrivMode_MouseBtnEvent },
3603	{ 1003, PrivMode_MouseAnyEvent },	3656	{ 1003, PrivMode_MouseAnyEvent },
		3657	#if ENABLE_FRILLS
		3658	{ 1005, PrivMode_ExtModeMouse },
		3659	#endif
3604	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3660	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605	{ 1011, PrivMode_Keypress }, // rxvt extension	3661	{ 1011, PrivMode_Keypress }, // rxvt extension
		3662	#if ENABLE_FRILLS
		3663	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3664	#endif
3606	// 1035 enable modifiers for alt, numlock NYI	3665	// 1035 enable modifiers for alt, numlock NYI
3607	// 1036 send ESC for meta keys NYI	3666	// 1036 send ESC for meta keys NYI
3608	// 1037 send DEL for keypad delete NYI	3667	// 1037 send DEL for keypad delete NYI
3609	{ 1047, PrivMode_Screen },	3668	{ 1047, PrivMode_Screen },
3610	// 1048 save and restore cursor	3669	// 1048 save and restore cursor, implemented in code
3611	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3670	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3671	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3613	{ 2004, PrivMode_BracketPaste },	3672	{ 2004, PrivMode_BracketPaste },
3614	};	3673	};
3615		3674
…		…
3625	for (i = 0; i < nargs; i++)	3684	for (i = 0; i < nargs; i++)
3626	{	3685	{
3627	state = -1;	3686	state = -1;
3628		3687
3629	/* basic handling */	3688	/* basic handling */
3630	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3689	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3631	if (argtopriv[j].argval == arg[i])	3690	if (argtopriv[j].argval == arg[i])
3632	{	3691	{
3633	state = privcases (mode, argtopriv[j].bit);	3692	state = privcases (mode, argtopriv[j].bit);
3634	break;	3693	break;
3635	}	3694	}
…		…
3643		3702
3644	scr_touch (true);	3703	scr_touch (true);
3645	break;	3704	break;
3646	#endif	3705	#endif
3647	case 1048: /* alternative cursor save */	3706	case 1048: /* alternative cursor save */
3648	case 1049:
3649	if (option (Opt_secondaryScreen))	3707	if (option (Opt_secondaryScreen))
3650	if (mode == 0)	3708	if (mode == 0)
3651	scr_cursor (RESTORE);	3709	scr_cursor (RESTORE);
3652	else if (mode == 1)	3710	else if (mode == 1)
3653	scr_cursor (SAVE);	3711	scr_cursor (SAVE);
…		…
3666	*/	3724	*/
3667	set_privmode (PrivMode_vt52, 1);	3725	set_privmode (PrivMode_vt52, 1);
3668	break;	3726	break;
3669	case 3: /* 80/132 */	3727	case 3: /* 80/132 */
3670	if (priv_modes & PrivMode_132OK)	3728	if (priv_modes & PrivMode_132OK)
3671	{
3672	scr_poweron ();
3673	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3729	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674	}
3675	break;	3730	break;
3676	case 4: /* smooth scrolling */	3731	case 4: /* smooth scrolling */
3677	set_option (Opt_jumpScroll, !state);	3732	set_option (Opt_jumpScroll, !state);
3678	break;	3733	break;
3679	case 5: /* reverse video */	3734	case 5: /* reverse video */
…		…
3717	case 1003:	3772	case 1003:
3718	if (state)	3773	if (state)
3719	{	3774	{
3720	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3775	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3721	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3776	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3777	mouse_row = mouse_col = 0;
3722	vt_emask_mouse = PointerMotionMask;	3778	vt_emask_mouse = PointerMotionMask;
3723	}	3779	}
3724	else	3780	else
3725	vt_emask_mouse = NoEventMask;	3781	vt_emask_mouse = NoEventMask;
		3782
3726	vt_select_input ();	3783	vt_select_input ();
3727	break;	3784	break;
3728	case 1010: /* scroll to bottom on TTY output inhibit */	3785	case 1010: /* scroll to bottom on TTY output inhibit */
3729	set_option (Opt_scrollTtyOutput, !state);	3786	set_option (Opt_scrollTtyOutput, !state);
3730	break;	3787	break;
3731	case 1011: /* scroll to bottom on key press */	3788	case 1011: /* scroll to bottom on key press */
3732	set_option (Opt_scrollTtyKeypress, state);	3789	set_option (Opt_scrollTtyKeypress, state);
3733	break;	3790	break;
3734	case 1047: /* secondary screen w/ clearing last */	3791	case 1047: /* secondary screen w/ clearing last */
3735	if (option (Opt_secondaryScreen))	3792	if (option (Opt_secondaryScreen))
3736	if (current_screen != PRIMARY)	3793	if (!state)
3737	scr_erase_screen (2);	3794	scr_erase_screen (2);
		3795
3738	scr_change_screen (state);	3796	scr_change_screen (state);
3739	break;	3797	break;
3740	case 1049: /* secondary screen w/ clearing first */	3798	case 1049: /* secondary screen w/ clearing first */
		3799	if (option (Opt_secondaryScreen))
		3800	if (state)
		3801	scr_cursor (SAVE);
		3802
3741	scr_change_screen (state);	3803	scr_change_screen (state);
		3804
3742	if (option (Opt_secondaryScreen))	3805	if (option (Opt_secondaryScreen))
3743	if (current_screen != PRIMARY)	3806	if (state)
3744	scr_erase_screen (2);	3807	scr_erase_screen (2);
		3808	else
		3809	scr_cursor (RESTORE);
3745	break;	3810	break;
3746	default:	3811	default:
3747	break;	3812	break;
3748	}	3813	}
3749	}	3814	}
…		…
3902	}	3967	}
3903	}	3968	}
3904	}	3969	}
3905	/}}} /	3970	/}}} /
3906		3971
3907	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3908	void
3909	rxvt_term::process_graphics ()
3910	{
3911	unicode_t ch, cmd = cmd_getc ();
3912
3913	if (cmd == 'Q')
3914	{
3915	/* query graphics */
3916	tt_printf ("\033G0\012"); /* no graphics */
3917	return;
3918	}
3919	/* swallow other graphics sequences until terminating ':' */
3920	do
3921	ch = cmd_getc ();
3922	while (ch != ':');
3923	}
3924	/}}} /
3925
3926	/* ------------------------------------------------------------------------- */	3972	/* ------------------------------------------------------------------------- */
3927		3973
3928	/*	3974	/*
3929	* Send printf () formatted output to the command.	3975	* Send printf () formatted output to the command.
3930	* Only use for small amounts of data.	3976	* Only use for small amounts of data.
…		…
3943		3989
3944	/* ---------------------------------------------------------------------- */	3990	/* ---------------------------------------------------------------------- */
3945	/* Write data to the pty as typed by the user, pasted with the mouse,	3991	/* Write data to the pty as typed by the user, pasted with the mouse,
3946	* or generated by us in response to a query ESC sequence.	3992	* or generated by us in response to a query ESC sequence.
3947	*/	3993	*/
3948	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	3994	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3949		3995
3950	void	3996	void
3951	rxvt_term::tt_write (const char *data, unsigned int len)	3997	rxvt_term::tt_write (const char *data, unsigned int len)
3952	{	3998	{
3953	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	3999	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3958		4004
3959	if (v_buflen == 0)	4005	if (v_buflen == 0)
3960	{	4006	{
3961	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	4007	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3962		4008
		4009	max_it (written, 0);
		4010
3963	if ((unsigned int)written == len)	4011	if (written == len)
3964	return;	4012	return;
3965		4013
3966	data += written;	4014	data += written;
3967	len -= written;	4015	len -= written;
3968	}	4016	}
3969		4017
3970	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4018	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3971		4019
3972	memcpy (v_buffer + v_buflen, data, len);	4020	memcpy (v_buffer + v_buflen, data, len);
3973	v_buflen += len;	4021	v_buflen += len;
3974		4022
3975	pty_ev.set (ev::READ \| ev::WRITE);	4023	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.420 by root, Wed Oct 15 14:48:22 2008 UTC vs. Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC