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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.419 by root, Fri Oct 10 13:23:56 2008 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
162		162
163	void	163	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font f = (fs)[fs->find_font (ch)];
168	wchar_t chr, alloc, ch2, *fname;	167	wchar_t chr, alloc, ch2, **fname;
169	int len;	168	int len;
170
171	fname = rxvt_utf8towcs (f->name);
172		169
173	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
174	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
175	{	172	{
176	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
197	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
198	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
199	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
201		198
		199	int width = 0;
		200	fname = rxvt_temp_buf<wchar_t *> (len);
		201	for (int i = 0; i < len; i++)
		202	{
		203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
		204	fname[i] = rxvt_utf8towcs (f->name);
202	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
203		207
204	max_it (width, 8+5); // for char + hex	208	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
206		210
207	if (y >= 0)	211	if (y >= 0)
208	{	212	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210	x = 0;	214	x = 0;
211	}	215	}
212		216
213	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
214		218
215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216		220
217	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
218	{	222	{
…		…
237	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
238	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
239	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
240	// }	244	// }
241	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
242	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
243
244	free (fname);	249	free (fname[i]);
		250	}
245		251
246	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
247	if (alloc)	253	if (alloc)
248	delete [] alloc;	254	delete [] alloc;
249	# endif	255	# endif
…		…
282	}	288	}
283		289
284	static int	290	static int
285	hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
286	{	292	{
287	// check wether this event corresponds to a hex digit	293	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	294	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	295	for (int index = 0; index < 8; index++)
290	{	296	{
291	KeySym k = XLookupKeysym (&ev, index);	297	KeySym k = XLookupKeysym (&ev, index);
292		298
…		…
416	*/	422	*/
417	shft = ev.state & ShiftMask;	423	shft = ev.state & ShiftMask;
418	ctrl = ev.state & ControlMask;	424	ctrl = ev.state & ControlMask;
419	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
420		426
421	if (numlock_state \|\| (ev.state & ModNumLockMask))
422	{
423	numlock_state = (ev.state & ModNumLockMask);
424	set_privmode (PrivMode_aplKP, !numlock_state);
425	}
426
427	kbuf[0] = 0;	427	kbuf[0] = 0;
428		428
429	#ifdef USE_XIM	429	#ifdef USE_XIM
430	if (Input_Context)	430	if (Input_Context)
431	{	431	{
…		…
505	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
506	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
507	#else	507	#else
508	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
509	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
510	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
511	{	513	{
512	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
513	return;	515	return;
514	}	516	}
…		…
579	}	581	}
580	}	582	}
581		583
582	#if ENABLE_FRILLS \|\| ISO_14755	584	#if ENABLE_FRILLS \|\| ISO_14755
583	// ISO 14755 support	585	// ISO 14755 support
584	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
585	{	587	{
586	int hv;	588	int hv;
587		589
588	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
589	&& (keysym == XK_space \|\| keysym == XK_KP_Space	591	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
619	scr_overlay_off ();	621	scr_overlay_off ();
620	# endif	622	# endif
621	iso14755buf = 0;	623	iso14755buf = 0;
622	}	624	}
623	}	625	}
		626	else if (option (Opt_iso14755) &&
624	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
625	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	628	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
626	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
627	{	630	{
628	iso14755buf \|= ISO_14755_STARTED;	631	iso14755buf \|= ISO_14755_STARTED;
629	# if ISO_14755	632	# if ISO_14755
630	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645	{	648	{
646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	649	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647	unsigned int newlen = 1;	650	unsigned int newlen = 1;
648		651
		652	if (ev.state & ModNumLockMask)
		653	kp = false;
		654
649	switch (translate_keypad (keysym, kp))	655	keysym = translate_keypad (keysym, kp);
		656
		657	switch (keysym)
650	{	658	{
651	#ifndef NO_BACKSPACE_KEY	659	#ifndef NO_BACKSPACE_KEY
652	case XK_BackSpace:	660	case XK_BackSpace:
653	if (priv_modes & PrivMode_HaveBackSpace)	661	if (priv_modes & PrivMode_HaveBackSpace)
654	{	662	{
…		…
881	commit_iso14755 ();	889	commit_iso14755 ();
882		890
883	return;	891	return;
884	}	892	}
885		893
886	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	894	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887	if (i[0] == keysym)	895	if (i[0] == keysym)
888	{	896	{
889	iso14755buf = ISO_14755_51 \| i[1];	897	iso14755buf = ISO_14755_51 \| i[1];
890	commit_iso14755 ();	898	commit_iso14755 ();
891		899
…		…
967	rxvt_term::flush ()	975	rxvt_term::flush ()
968	{	976	{
969	flush_ev.stop ();	977	flush_ev.stop ();
970		978
971	#ifdef HAVE_BG_PIXMAP	979	#ifdef HAVE_BG_PIXMAP
972	if (bgPixmap.check_clearChanged ())	980	if (bg_flags & BG_NEEDS_REFRESH)
973	{	981	{
974	// scr_clear (true); This needs to be researched further!	982	bg_flags &= ~BG_NEEDS_REFRESH;
975	scr_touch (false);	983	scr_touch (false);
976	}	984	}
977	#endif	985	#endif
978		986
979	if (want_refresh)	987	if (want_refresh)
…		…
1024	}	1032	}
1025		1033
1026	display->flush ();	1034	display->flush ();
1027	}	1035	}
1028		1036
1029	/* checks wether a refresh is requested and starts the refresh timer */	1037	/* checks whether a refresh is requested and starts the refresh timer */
1030	void	1038	void
1031	rxvt_term::refresh_check ()	1039	rxvt_term::refresh_check ()
1032	{	1040	{
1033	if (want_refresh && !flush_ev.is_active ())	1041	if (want_refresh && !flush_ev.is_active ())
1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1042	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1127	{	1135	{
1128	// this should really be sched_yield(), but the linux guys thought	1136	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1137	// 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	1138	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1139	// allowed by the sus... as is returning ENOSYS.
		1140	// since the linux guys additionally thought that breaking the only
		1141	// known workaround against their unusable sched_yield hack is cool,
		1142	// we just nanosleep a bit and hope for the best.
1132		1143
1133	struct timespec ts = { 0, 0 };	1144	struct timespec ts = { 0, 1000 };
1134	nanosleep (&ts, 0);	1145	nanosleep (&ts, 0);
1135		1146
1136	w.stop ();	1147	w.stop ();
1137	}	1148	}
1138		1149
…		…
1147	rxvt_term::pty_fill ()	1158	rxvt_term::pty_fill ()
1148	{	1159	{
1149	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1160	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1150		1161
1151	if (CBUFSIZ == n)	1162	if (CBUFSIZ == n)
1152	{	1163	n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1153	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1154	n = 0;
1155	}
1156		1164
1157	memmove (cmdbuf_base, cmdbuf_ptr, n);	1165	memmove (cmdbuf_base, cmdbuf_ptr, n);
1158	cmdbuf_ptr = cmdbuf_base;	1166	cmdbuf_ptr = cmdbuf_base;
1159	cmdbuf_endp = cmdbuf_ptr + n;	1167	cmdbuf_endp = cmdbuf_ptr + n;
1160		1168
…		…
1188	{	1196	{
1189	make_current ();	1197	make_current ();
1190		1198
1191	if (revents & ev::READ)	1199	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1200	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1201	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1202	cmd_parse ();
1195	break;
1196		1203
1197	if (revents & ev::WRITE)	1204	if (revents & ev::WRITE)
1198	pty_write ();	1205	pty_write ();
1199		1206
1200	refresh_check ();	1207	refresh_check ();
…		…
1241	{	1248	{
1242	int button_number, key_state = 0;	1249	int button_number, key_state = 0;
1243	int x, y;	1250	int x, y;
1244	int code = 32;	1251	int code = 32;
1245		1252
1246	x = Pixel2Col (ev.x);	1253	x = Pixel2Col (ev.x) + 1;
1247	y = Pixel2Row (ev.y);	1254	y = Pixel2Row (ev.y) + 1;
		1255
1248	if (ev.type == MotionNotify)	1256	if (ev.type == MotionNotify)
1249	{	1257	{
1250	if (x == mouse_row && y == mouse_col)	1258	if (x == mouse_row && y == mouse_col)
1251	return;	1259	return;
		1260
1252	mouse_row = x;	1261	mouse_row = x;
1253	mouse_col = y;	1262	mouse_col = y;
1254	code += 32;	1263	code += 32;
1255	}	1264	}
1256		1265
…		…
1259	else	1268	else
1260	{	1269	{
1261	button_number = MEvent.button - Button1;	1270	button_number = MEvent.button - Button1;
1262	/* add 0x3D for wheel events, like xterm does */	1271	/* add 0x3D for wheel events, like xterm does */
1263	if (button_number >= 3)	1272	if (button_number >= 3)
1264	button_number += (64 - 3);	1273	button_number += 64 - 3;
1265	}	1274	}
1266		1275
1267	if (priv_modes & PrivMode_MouseX10)	1276	if (priv_modes & PrivMode_MouseX10)
1268	{	1277	{
1269	/*	1278	/*
…		…
1301	fputc ('A', stderr);	1310	fputc ('A', stderr);
1302	if (key_state & 32)	1311	if (key_state & 32)
1303	fputc ('2', stderr);	1312	fputc ('2', stderr);
1304	fprintf (stderr, "]: <%d>, %d/%d\n",	1313	fprintf (stderr, "]: <%d>, %d/%d\n",
1305	button_number,	1314	button_number,
1306	x + 1,	1315	x,
1307	y + 1);	1316	y);
1308	#endif	1317	#endif
1309		1318
		1319	#if ENABLE_FRILLS
		1320	if (priv_modes & PrivMode_ExtMouseRight)
		1321	tt_printf ("\033[%d;%d;%dM",
		1322	code + button_number + key_state,
		1323	x,
		1324	y);
		1325	else if (priv_modes & PrivMode_ExtModeMouse)
		1326	tt_printf ("\033[M%c%lc%lc",
		1327	code + button_number + key_state,
		1328	wint_t (32 + x),
		1329	wint_t (32 + y));
		1330	else
		1331	#endif
1310	tt_printf ("\033[M%c%c%c",	1332	tt_printf ("\033[M%c%c%c",
1311	(code + button_number + key_state),	1333	code + button_number + key_state,
1312	(32 + x + 1),	1334	32 + x,
1313	(32 + y + 1));	1335	32 + y);
1314	}	1336	}
1315		1337
1316	/{{{ process an X event /	1338	/{{{ process an X event /
1317	void	1339	void
1318	rxvt_term::x_cb (XEvent &ev)	1340	rxvt_term::x_cb (XEvent &ev)
…		…
1420	&& ev.xfocus.mode != NotifyGrab)	1442	&& ev.xfocus.mode != NotifyGrab)
1421	focus_out ();	1443	focus_out ();
1422	break;	1444	break;
1423		1445
1424	case ConfigureNotify:	1446	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])	1447	if (ev.xconfigure.window == parent[0])
1429	{	1448	{
1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1449	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431	;	1450	;
		1451
		1452	#ifdef HAVE_BG_PIXMAP
		1453	bool moved = false;
		1454	if (bg_window_position_sensitive ())
		1455	{
		1456	int x, y;
		1457	if (ev.xconfigure.send_event)
		1458	{
		1459	x = ev.xconfigure.x;
		1460	y = ev.xconfigure.y;
		1461	}
		1462	else
		1463	get_window_origin (x, y);
		1464
		1465	if (bg_set_position (x, y)
		1466	\|\| !(bg_flags & BG_IS_VALID))
		1467	moved = true;
		1468	}
		1469	#endif
1432		1470
1433	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1471	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1434	{	1472	{
1435	seen_resize = 1;	1473	seen_resize = 1;
1436	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437	}	1475	}
1438	else	1476	else
1439	{	1477	{
1440	#ifdef HAVE_BG_PIXMAP	1478	#ifdef HAVE_BG_PIXMAP
1441	if (bgPixmap.window_position_sensitive ())	1479	if (moved)
1442	{	1480	{
1443	if (mapped)	1481	if (mapped)
1444	update_background ();	1482	update_background ();
1445	else	1483	else
1446	bgPixmap.invalidate ();	1484	bg_invalidate ();
1447	}	1485	}
1448	#endif	1486	#endif
1449	}	1487	}
1450		1488
1451	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1489	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452	}	1490	}
1453	break;	1491	break;
1454		1492
1455	case PropertyNotify:	1493	case PropertyNotify:
1456	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1494	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;	1495	break;
1462		1496
1463	case SelectionClear:	1497	case SelectionClear:
1464	selection_clear ();	1498	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;	1499	break;
1471		1500
1472	case SelectionRequest:	1501	case SelectionRequest:
1473	selection_send (ev.xselectionrequest);	1502	selection_send (ev.xselectionrequest);
1474	break;	1503	break;
1475		1504
1476	case MapNotify:	1505	case MapNotify:
1477	#ifdef HAVE_BG_PIXMAP	1506	#ifdef HAVE_BG_PIXMAP
1478	/* This is needed spcifically to fix the case of no window manager or a	1507	/* 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	1508	* non-reparenting window manager. In those cases we never get first
1480	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1509	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1481	* care of multiplicity of ConfigureNotify events arriwing while WM does	1510	* care of multiplicity of ConfigureNotify events arriving while WM does
1482	* reparenting.	1511	* reparenting.
1483	* We should not render background immidiately, as there could be several	1512	* 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	1513	* 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	1514	* by scheduling background redraw as soon as we can, but giving a short
1486	* bit of time for ConfigureNotifies to arrive.	1515	* bit of time for ConfigureNotifies to arrive.
1487	* We should render background PRIOR to drawing any text, but AFTER all	1516	* We should render background PRIOR to drawing any text, but AFTER all
1488	* of ConfigureNotifys for the best results.	1517	* of ConfigureNotifys for the best results.
1489	*/	1518	*/
1490	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1519	if (!(bg_flags & BG_IS_VALID))
1491	update_background_ev.start (0.025);	1520	update_background_ev.start (0.025);
1492	#endif	1521	#endif
1493	mapped = 1;	1522	mapped = 1;
1494	#ifdef TEXT_BLINK	1523	#ifdef TEXT_BLINK
1495	text_blink_ev.start ();	1524	text_blink_ev.start ();
…		…
1510	if (ev.xany.window == vt)	1539	if (ev.xany.window == vt)
1511	{	1540	{
1512	do	1541	do
1513	{	1542	{
1514	scr_expose (ev.xexpose.x, ev.xexpose.y,	1543	scr_expose (ev.xexpose.x, ev.xexpose.y,
1515	ev.xexpose.width, ev.xexpose.height, False);	1544	ev.xexpose.width, ev.xexpose.height, false);
1516	}	1545	}
1517	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1546	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518		1547
1519	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1548	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520		1549
1521	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1550	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522	{	1551	{
1523	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1524	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, false);
1525	}	1554	}
1526		1555
1527	want_refresh = 1;	1556	want_refresh = 1;
1528	}	1557	}
1529	else	1558	else
…		…
1682	#endif	1711	#endif
1683		1712
1684	refresh_check ();	1713	refresh_check ();
1685	}	1714	}
1686		1715
		1716	#if ENABLE_FRILLS
		1717	void
		1718	rxvt_term::set_urgency (bool enable)
		1719	{
		1720	if (enable == urgency_hint)
		1721	return;
		1722
		1723	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1724	{
		1725	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1726	XSetWMHints (dpy, parent[0], h);
		1727	urgency_hint = enable;
		1728	}
		1729	}
		1730	#endif
		1731
1687	void	1732	void
1688	rxvt_term::focus_in ()	1733	rxvt_term::focus_in ()
1689	{	1734	{
1690	if (!focus)	1735	if (!focus)
1691	{	1736	{
1692	focus = 1;	1737	focus = 1;
1693	want_refresh = 1;	1738	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1739
1697	#if USE_XIM	1740	#if USE_XIM
1698	if (Input_Context != NULL)	1741	if (Input_Context != NULL)
1699	{	1742	{
1700	IMSetPosition ();	1743	IMSetPosition ();
…		…
1712	scr_recolour ();	1755	scr_recolour ();
1713	}	1756	}
1714	#endif	1757	#endif
1715	#if ENABLE_FRILLS	1758	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1759	if (option (Opt_urgentOnBell))
1717	{	1760	set_urgency (0);
1718	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719	{
1720	h->flags &= ~XUrgencyHint;
1721	XSetWMHints (dpy, parent[0], h);
1722	}
1723	}
1724	#endif	1761	#endif
		1762
		1763	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1764	}
1726	}	1765	}
1727		1766
1728	void	1767	void
1729	rxvt_term::focus_out ()	1768	rxvt_term::focus_out ()
…		…
1731	if (focus)	1770	if (focus)
1732	{	1771	{
1733	focus = 0;	1772	focus = 0;
1734	want_refresh = 1;	1773	want_refresh = 1;
1735		1774
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1775	#if ENABLE_FRILLS
1737		1776	if (option (Opt_urgentOnBell))
		1777	set_urgency (0);
		1778	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1779	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1780	if (iso14755buf)
1740	{	1781	{
1741	iso14755buf = 0;	1782	iso14755buf = 0;
1742	# if ISO_14755	1783	# if ISO_14755
…		…
1759	{	1800	{
1760	pix_colors = pix_colors_unfocused;	1801	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1802	scr_recolour ();
1762	}	1803	}
1763	#endif	1804	#endif
		1805
		1806	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1807	}
1765	}	1808	}
1766		1809
1767	void	1810	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1811	rxvt_term::update_fade_color (unsigned int idx)
…		…
1796	* use the property to determine the pixmap. We use it later on.	1839	* use the property to determine the pixmap. We use it later on.
1797	*/	1840	*/
1798	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1841	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1842	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800	{	1843	{
1801	bgPixmap.set_root_pixmap ();	1844	bg_set_root_pixmap ();
1802	update_background ();	1845	update_background ();
1803	}	1846	}
1804		1847
1805	break;	1848	break;
1806	}	1849	}
…		…
1845	/* save the xbutton state (for ButtonRelease) */	1888	/* save the xbutton state (for ButtonRelease) */
1846	MEvent.state = ev.state;	1889	MEvent.state = ev.state;
1847	#ifdef MOUSE_REPORT_DOUBLECLICK	1890	#ifdef MOUSE_REPORT_DOUBLECLICK
1848	if (ev.button == MEvent.button && clickintime)	1891	if (ev.button == MEvent.button && clickintime)
1849	{	1892	{
1850	/* same button, within alloted time */	1893	/* same button, within allowed time */
1851	MEvent.clicks++;	1894	MEvent.clicks++;
1852		1895
1853	if (MEvent.clicks > 1)	1896	if (MEvent.clicks > 1)
1854	{	1897	{
1855	/* only report double clicks */	1898	/* only report double clicks */
…		…
2126	selection_make (ev.time);	2169	selection_make (ev.time);
2127	break;	2170	break;
2128		2171
2129	case Button2:	2172	case Button2:
2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2173	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2174	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132	break;	2175	break;
2133		2176
2134	#ifdef MOUSE_WHEEL	2177	#ifdef MOUSE_WHEEL
2135	case Button4:	2178	case Button4:
2136	case Button5:	2179	case Button5:
…		…
2170	}	2213	}
2171	}	2214	}
2172		2215
2173	/}}} /	2216	/}}} /
2174		2217
2175	bool	2218	void
2176	rxvt_term::cmd_parse ()	2219	rxvt_term::cmd_parse ()
2177	{	2220	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2221	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2222	char *seq_begin; // remember start of esc-sequence here
2181		2223
2182	for (;;)	2224	for (;;)
2183	{	2225	{
…		…
2277	* What the heck we'll cheat and only refresh less than every page-full.	2319	* What the heck we'll cheat and only refresh less than every page-full.
2278	* if skipScroll is enabled.	2320	* if skipScroll is enabled.
2279	*/	2321	*/
2280	if (refreshnow)	2322	if (refreshnow)
2281	{	2323	{
2282	flag = true;
2283	scr_refresh ();	2324	scr_refresh ();
2284	want_refresh = 1;	2325	want_refresh = 1;
2285	}	2326	}
2286
2287	}	2327	}
2288	else	2328	else
2289	{	2329	{
2290	try	2330	try
2291	{	2331	{
…		…
2299	}	2339	}
2300		2340
2301	ch = NOCHAR;	2341	ch = NOCHAR;
2302	}	2342	}
2303	}	2343	}
2304
2305	return flag;
2306	}	2344	}
2307		2345
2308	// read the next character	2346	// read the next character
2309	wchar_t	2347	wchar_t
2310	rxvt_term::next_char () NOTHROW	2348	rxvt_term::next_char () NOTHROW
…		…
2325	break;	2363	break;
2326	}	2364	}
2327		2365
2328	if (len == (size_t)-1)	2366	if (len == (size_t)-1)
2329	{	2367	{
2330	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2368	mbstate.reset (); // reset now undefined conversion state
2331	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2369	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332	}	2370	}
2333		2371
2334	// assume wchar == unicode	2372	// assume wchar == unicode
2335	cmdbuf_ptr += len;	2373	cmdbuf_ptr += len;
…		…
2644		2682
2645	/* 8.3.87: NEXT LINE */	2683	/* 8.3.87: NEXT LINE */
2646	case C1_NEL: /* ESC E */	2684	case C1_NEL: /* ESC E */
2647	{	2685	{
2648	wchar_t nlcr[] = { C0_LF, C0_CR };	2686	wchar_t nlcr[] = { C0_LF, C0_CR };
2649	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2687	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2650	}	2688	}
2651	break;	2689	break;
2652		2690
2653	/* kidnapped escape sequence: Should be 8.3.48 */	2691	/* kidnapped escape sequence: Should be 8.3.48 */
2654	case C1_ESA: /* ESC G */	2692	case C1_ESA: /* ESC G */
2655	process_graphics ();	2693	// used by original rxvt for rob nations own graphics mode
		2694	if (cmd_getc () == 'Q')
		2695	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2656	break;	2696	break;
2657		2697
2658	/* 8.3.63: CHARACTER TABULATION SET */	2698	/* 8.3.63: CHARACTER TABULATION SET */
2659	case C1_HTS: /* ESC H */	2699	case C1_HTS: /* ESC H */
2660	scr_set_tab (1);	2700	scr_set_tab (1);
…		…
2679	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2719	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2680	case C1_SCI: /* ESC Z */	2720	case C1_SCI: /* ESC Z */
2681	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2721	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2682	break; /* steal obsolete ESC [ c */	2722	break; /* steal obsolete ESC [ c */
2683		2723
2684	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2724	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2685	case C1_CSI: /* ESC [ */	2725	case C1_CSI: /* ESC [ */
2686	process_csi_seq ();	2726	process_csi_seq ();
2687	break;	2727	break;
2688		2728
2689	/* 8.3.90: OPERATING SYSTEM COMMAND */	2729	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2690	case C1_OSC: /* ESC ] */	2730	case C1_OSC: /* ESC ] */
2691	process_osc_seq ();	2731	process_osc_seq ();
2692	break;	2732	break;
2693		2733
2694	/* 8.3.106: RESET TO INITIAL STATE */	2734	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2695	case 'c':	2735	case 'c':
2696	mbstate.reset ();	2736	mbstate.reset ();
2697	scr_poweron ();	2737	scr_poweron ();
2698	scrollBar.show (1);	2738	scrollBar.show (1);
2699	break;	2739	break;
…		…
2723	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2763	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2724	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2764	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2725	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2765	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2726	};	2766	};
2727		2767
2728	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2768	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2729	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \	2769	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \
2730	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))	2770	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))
2731	#define get_byte_array_bit(array, bit) \	2771	#define get_byte_array_bit(array, bit) \
2732	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2772	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2733		2773
2734	const unsigned char csi_defaults[] =	2774	static const unsigned char csi_defaults[] =
2735	{	2775	{
2736	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2776	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2737	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2777	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2738	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2778	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2739	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2779	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
…		…
2754		2794
2755	nargs = 0;	2795	nargs = 0;
2756		2796
2757	priv = 0;	2797	priv = 0;
2758	ch = cmd_getc ();	2798	ch = cmd_getc ();
2759	if (ch >= '<' && ch <= '?')	2799	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2760	{	2800	{
2761	/* '<' '=' '>' '?' */	2801	/* '<' '=' '>' '?' '!' */
2762	priv = ch;	2802	priv = ch;
2763	ch = cmd_getc ();	2803	ch = cmd_getc ();
2764	}	2804	}
2765		2805
2766	/* read any numerical arguments */	2806	/* read any numerical arguments */
…		…
2820		2860
2821	case '?':	2861	case '?':
2822	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2862	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2823	process_terminal_mode (ch, priv, nargs, arg);	2863	process_terminal_mode (ch, priv, nargs, arg);
2824	break;	2864	break;
		2865
		2866	case '!':
		2867	if (ch == CSI_70)
		2868	{
		2869	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2870	scr_soft_reset ();
		2871
		2872	static const int pm_h[] = { 7, 25 };
		2873	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
		2874
		2875	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
		2876	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2825	}	2877	}
		2878	break;
		2879	}
		2880
2826	return;	2881	return;
2827	}	2882	}
2828		2883
2829	switch (ch)	2884	switch (ch)
2830	{	2885	{
…		…
3197	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3252	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3198	*/	3253	*/
3199	void	3254	void
3200	rxvt_term::process_dcs_seq ()	3255	rxvt_term::process_dcs_seq ()
3201	{	3256	{
3202	char *s;
3203	unicode_t eh;
3204
3205	/*	3257	/*
3206	* Not handled yet	3258	* Not handled yet
3207	*/	3259	*/
		3260
		3261	unicode_t eh;
3208	s = get_to_st (eh);	3262	char *s = get_to_st (eh);
3209	if (s)	3263	if (s)
3210	free (s);	3264	free (s);
3211		3265
3212	return;	3266	return;
3213	}	3267	}
…		…
3217	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3271	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3218	*/	3272	*/
3219	void	3273	void
3220	rxvt_term::process_osc_seq ()	3274	rxvt_term::process_osc_seq ()
3221	{	3275	{
3222	unicode_t ch, eh;
3223	int arg;	3276	int arg;
3224		3277
3225	ch = cmd_getc ();	3278	unicode_t ch = cmd_getc ();
3226	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3279	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3227	arg = arg * 10 + (ch - '0');	3280	arg = arg * 10 + (ch - '0');
3228		3281
3229	if (ch == ';')	3282	if (ch == ';')
3230	{	3283	{
		3284	unicode_t eh;
3231	char *s = get_to_st (eh);	3285	char *s = get_to_st (eh);
3232		3286
3233	if (s)	3287	if (s)
3234	{	3288	{
3235	process_xterm_seq (arg, s, eh);	3289	process_xterm_seq (arg, s, eh);
…		…
3259		3313
3260	/*	3314	/*
3261	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3315	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3262	*/	3316	*/
3263	void	3317	void
3264	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3318	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3265	{	3319	{
3266	int color;	3320	int color;
3267	char buf, name;	3321	char buf, name;
3268	bool query = str[0] == '?' && !str[1];	3322	bool query = str[0] == '?' && !str[1];
3269	int saveop = op;	3323	int saveop = op;
…		…
3310		3364
3311	XFree (value);	3365	XFree (value);
3312	}	3366	}
3313	else	3367	else
3314	{	3368	{
3315	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3369	char *eq = strchr (str, '=');
3316		3370
3317	if (eq)	3371	if (eq)
3318	{	3372	{
3319	*eq = 0;	3373	*eq = 0;
3320	set_utf8_property (display->atom (str), eq + 1);	3374	set_utf8_property (display->atom (str), eq + 1);
…		…
3360	process_color_seq (op, Color_pointer_fg, str, resp);	3414	process_color_seq (op, Color_pointer_fg, str, resp);
3361	break;	3415	break;
3362	case XTerm_Color_pointer_bg:	3416	case XTerm_Color_pointer_bg:
3363	process_color_seq (op, Color_pointer_bg, str, resp);	3417	process_color_seq (op, Color_pointer_bg, str, resp);
3364	break;	3418	break;
		3419	#ifdef OPTION_HC
		3420	case XTerm_Color_HC:
		3421	process_color_seq (op, Color_HC, str, resp);
		3422	break;
		3423	case XTerm_Color_HTC:
		3424	process_color_seq (op, Color_HTC, str, resp);
		3425	break;
		3426	#endif
3365	#ifndef NO_BOLD_UNDERLINE_REVERSE	3427	#ifndef NO_BOLD_UNDERLINE_REVERSE
3366	case XTerm_Color_RV:
3367	process_color_seq (op, Color_RV, str, resp);
3368	break;
3369	case Rxvt_Color_BD:
3370	case URxvt_Color_BD:	3428	case URxvt_Color_BD:
3371	process_color_seq (op, Color_BD, str, resp);	3429	process_color_seq (op, Color_BD, str, resp);
3372	break;	3430	break;
3373	case Rxvt_Color_UL:
3374	case URxvt_Color_UL:	3431	case URxvt_Color_UL:
3375	process_color_seq (op, Color_UL, str, resp);	3432	process_color_seq (op, Color_UL, str, resp);
3376	break;	3433	break;
3377	case URxvt_Color_IT:	3434	case URxvt_Color_IT:
3378	process_color_seq (op, Color_IT, str, resp);	3435	process_color_seq (op, Color_IT, str, resp);
3379	break;	3436	break;
3380	#endif	3437	#endif
		3438	case URxvt_Color_border:
		3439	process_color_seq (op, Color_border, str, resp);
		3440	break;
3381	#if ENABLE_TRANSPARENCY	3441	#if ENABLE_TRANSPARENCY
3382	case URxvt_Color_tint:	3442	case URxvt_Color_tint:
3383	process_color_seq (op, Color_tint, str, resp);	3443	process_color_seq (op, Color_tint, str, resp);
3384	{	3444	{
3385	bool changed = false;	3445	bool changed = false;
3386		3446
3387	if (ISSET_PIXCOLOR (Color_tint))	3447	if (ISSET_PIXCOLOR (Color_tint))
3388	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3448	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3389	else
3390	changed = bgPixmap.unset_tint ();
3391		3449
3392	if (changed)	3450	if (changed)
3393	update_background ();	3451	update_background ();
3394	}	3452	}
3395		3453
…		…
3400	case Rxvt_Pixmap:	3458	case Rxvt_Pixmap:
3401	if (!strcmp (str, "?"))	3459	if (!strcmp (str, "?"))
3402	{	3460	{
3403	char str[256];	3461	char str[256];
3404		3462
3405	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3463	sprintf (str, "[%dx%d+%d+%d]",
3406	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3464	min (h_scale, 32767), min (v_scale, 32767),
3407	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3465	min (h_align, 32767), min (v_align, 32767));
3408	process_xterm_seq (XTerm_title, str, CHAR_ST);	3466	process_xterm_seq (XTerm_title, str, CHAR_ST);
3409	}	3467	}
3410	else	3468	else
3411	{	3469	{
3412	int changed = 0;	3470	int changed = 0;
3413		3471
3414	if (*str != ';')	3472	if (*str != ';')
3415	{	3473	{
3416	/* reset to default scaling :*/
3417	bgPixmap.unset_geometry ();
3418	if (bgPixmap.set_file (str)) /* change pixmap */	3474	if (bg_set_file (str)) /* change pixmap */
		3475	{
3419	changed++;	3476	changed++;
3420	str = strchr (str, ';');	3477	str = strchr (str, ';');
3421	if (str == NULL)	3478	if (str == NULL)
3422	bgPixmap.set_defaultGeometry ();	3479	bg_set_default_geometry ();
		3480	else
		3481	bg_set_geometry (str+1);
		3482	}
3423	}	3483	}
3424		3484	else
3425	while (str)
3426	{	3485	{
3427	str++;	3486	str++;
3428	if (bgPixmap.set_geometry (str))	3487	if (bg_set_geometry (str, true))
3429	changed++;	3488	changed++;
3430	str = strchr (str, ';');
3431	}	3489	}
3432		3490
3433	if (changed)	3491	if (changed)
		3492	{
		3493	if (bg_window_position_sensitive ())
		3494	{
		3495	int x, y;
		3496	get_window_origin (x, y);
		3497	bg_set_position (x, y);
		3498	}
3434	update_background ();	3499	update_background ();
		3500	}
3435	}	3501	}
3436	break;	3502	break;
3437	#endif	3503	#endif
3438		3504
3439	case XTerm_logfile:	3505	case XTerm_logfile:
…		…
3542	{	3608	{
3543	if (mode == 'r')	3609	if (mode == 'r')
3544	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3610	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545	else	3611	else
3546	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3612	state = (mode == 't') ? ! (priv_modes & bit) : mode;
		3613
3547	set_privmode (bit, state);	3614	set_privmode (bit, state);
3548	}	3615	}
3549		3616
3550	return state;	3617	return state;
3551	}	3618	}
…		…
3560	static const struct	3627	static const struct
3561	{	3628	{
3562	const int argval;	3629	const int argval;
3563	const unsigned long bit;	3630	const unsigned long bit;
3564	} argtopriv[] = {	3631	} argtopriv[] = {
3565	{ 1, PrivMode_aplCUR },	3632	{ 1, PrivMode_aplCUR }, // DECCKM
3566	{ 2, PrivMode_vt52 },	3633	{ 2, PrivMode_vt52 },
3567	{ 3, PrivMode_132 },	3634	{ 3, PrivMode_132 }, // DECCOLM
3568	{ 4, PrivMode_smoothScroll },	3635	{ 4, PrivMode_smoothScroll }, // DECSCLM
3569	{ 5, PrivMode_rVideo },	3636	{ 5, PrivMode_rVideo }, // DECSCNM
3570	{ 6, PrivMode_relOrigin },	3637	{ 6, PrivMode_relOrigin }, // DECOM
3571	{ 7, PrivMode_Autowrap },	3638	{ 7, PrivMode_Autowrap }, // DECAWM
3572	// 8, bi-directional support mode	3639	// 8, auto-repeat keys // DECARM
3573	{ 9, PrivMode_MouseX10 },	3640	{ 9, PrivMode_MouseX10 },
3574	// 18, 19 printing-related	3641	// 18 end FF to printer after print screen
		3642	// 19 Print screen prints full screen/scroll region
3575	{ 25, PrivMode_VisibleCursor },	3643	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3576	#ifdef scrollBar_esc	3644	#ifdef scrollBar_esc
3577	{ scrollBar_esc, PrivMode_scrollBar },	3645	{ scrollBar_esc, PrivMode_scrollBar },
3578	#endif	3646	#endif
3579	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3647	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3648	// 38, tektronix mode // DECTEK
3580	{ 40, PrivMode_132OK },	3649	{ 40, PrivMode_132OK },
3581	// 41 xterm more fixes NYI	3650	// 41 xterm more fixes NYI
3582	// 45 margin bell NYI	3651	// 45 margin bell NYI
3583	// 46 start logging	3652	// 46 start logging
3584	{ 47, PrivMode_Screen },	3653	{ 47, PrivMode_Screen },
3585	{ 66, PrivMode_aplKP },	3654	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3586	#ifndef NO_BACKSPACE_KEY	3655	#ifndef NO_BACKSPACE_KEY
3587	{ 67, PrivMode_BackSpace },	3656	{ 67, PrivMode_BackSpace }, // DECBKM
3588	#endif	3657	#endif
3589	{ 1000, PrivMode_MouseX11 },	3658	{ 1000, PrivMode_MouseX11 },
3590	{ 1002, PrivMode_MouseBtnEvent },	3659	{ 1002, PrivMode_MouseBtnEvent },
3591	{ 1003, PrivMode_MouseAnyEvent },	3660	{ 1003, PrivMode_MouseAnyEvent },
		3661	#if ENABLE_FRILLS
		3662	{ 1005, PrivMode_ExtModeMouse },
		3663	#endif
3592	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3664	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593	{ 1011, PrivMode_Keypress }, // rxvt extension	3665	{ 1011, PrivMode_Keypress }, // rxvt extension
		3666	#if ENABLE_FRILLS
		3667	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3668	#endif
3594	// 1035 enable modifiers for alt, numlock NYI	3669	// 1035 enable modifiers for alt, numlock NYI
3595	// 1036 send ESC for meta keys NYI	3670	// 1036 send ESC for meta keys NYI
3596	// 1037 send DEL for keypad delete NYI	3671	// 1037 send DEL for keypad delete NYI
3597	{ 1047, PrivMode_Screen },	3672	{ 1047, PrivMode_Screen },
3598	// 1048 save and restore cursor	3673	// 1048 save and restore cursor, implemented in code
3599	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3674	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3675	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3601	{ 2004, PrivMode_BracketPaste },	3676	{ 2004, PrivMode_BracketPaste },
3602	};	3677	};
3603		3678
…		…
3613	for (i = 0; i < nargs; i++)	3688	for (i = 0; i < nargs; i++)
3614	{	3689	{
3615	state = -1;	3690	state = -1;
3616		3691
3617	/* basic handling */	3692	/* basic handling */
3618	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3693	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3619	if (argtopriv[j].argval == arg[i])	3694	if (argtopriv[j].argval == arg[i])
3620	{	3695	{
3621	state = privcases (mode, argtopriv[j].bit);	3696	state = privcases (mode, argtopriv[j].bit);
3622	break;	3697	break;
3623	}	3698	}
…		…
3631		3706
3632	scr_touch (true);	3707	scr_touch (true);
3633	break;	3708	break;
3634	#endif	3709	#endif
3635	case 1048: /* alternative cursor save */	3710	case 1048: /* alternative cursor save */
3636	case 1049:
3637	if (option (Opt_secondaryScreen))	3711	if (option (Opt_secondaryScreen))
3638	if (mode == 0)	3712	if (mode == 0)
3639	scr_cursor (RESTORE);	3713	scr_cursor (RESTORE);
3640	else if (mode == 1)	3714	else if (mode == 1)
3641	scr_cursor (SAVE);	3715	scr_cursor (SAVE);
…		…
3654	*/	3728	*/
3655	set_privmode (PrivMode_vt52, 1);	3729	set_privmode (PrivMode_vt52, 1);
3656	break;	3730	break;
3657	case 3: /* 80/132 */	3731	case 3: /* 80/132 */
3658	if (priv_modes & PrivMode_132OK)	3732	if (priv_modes & PrivMode_132OK)
3659	{
3660	scr_poweron ();
3661	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3733	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662	}
3663	break;	3734	break;
3664	case 4: /* smooth scrolling */	3735	case 4: /* smooth scrolling */
3665	set_option (Opt_jumpScroll, !state);	3736	set_option (Opt_jumpScroll, !state);
3666	break;	3737	break;
3667	case 5: /* reverse video */	3738	case 5: /* reverse video */
…		…
3705	case 1003:	3776	case 1003:
3706	if (state)	3777	if (state)
3707	{	3778	{
3708	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3779	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3709	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3780	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3781	mouse_row = mouse_col = 0;
3710	vt_emask_mouse = PointerMotionMask;	3782	vt_emask_mouse = PointerMotionMask;
3711	}	3783	}
3712	else	3784	else
3713	vt_emask_mouse = NoEventMask;	3785	vt_emask_mouse = NoEventMask;
		3786
3714	vt_select_input ();	3787	vt_select_input ();
3715	break;	3788	break;
3716	case 1010: /* scroll to bottom on TTY output inhibit */	3789	case 1010: /* scroll to bottom on TTY output inhibit */
3717	set_option (Opt_scrollTtyOutput, !state);	3790	set_option (Opt_scrollTtyOutput, !state);
3718	break;	3791	break;
3719	case 1011: /* scroll to bottom on key press */	3792	case 1011: /* scroll to bottom on key press */
3720	set_option (Opt_scrollTtyKeypress, state);	3793	set_option (Opt_scrollTtyKeypress, state);
3721	break;	3794	break;
3722	case 1047: /* secondary screen w/ clearing last */	3795	case 1047: /* secondary screen w/ clearing last */
3723	if (option (Opt_secondaryScreen))	3796	if (option (Opt_secondaryScreen))
3724	if (current_screen != PRIMARY)	3797	if (!state)
3725	scr_erase_screen (2);	3798	scr_erase_screen (2);
		3799
3726	scr_change_screen (state);	3800	scr_change_screen (state);
3727	break;	3801	break;
3728	case 1049: /* secondary screen w/ clearing first */	3802	case 1049: /* secondary screen w/ clearing first */
		3803	if (option (Opt_secondaryScreen))
		3804	if (state)
		3805	scr_cursor (SAVE);
		3806
3729	scr_change_screen (state);	3807	scr_change_screen (state);
		3808
3730	if (option (Opt_secondaryScreen))	3809	if (option (Opt_secondaryScreen))
3731	if (current_screen != PRIMARY)	3810	if (state)
3732	scr_erase_screen (2);	3811	scr_erase_screen (2);
		3812	else
		3813	scr_cursor (RESTORE);
3733	break;	3814	break;
3734	default:	3815	default:
3735	break;	3816	break;
3736	}	3817	}
3737	}	3818	}
…		…
3890	}	3971	}
3891	}	3972	}
3892	}	3973	}
3893	/}}} /	3974	/}}} /
3894		3975
3895	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3896	void
3897	rxvt_term::process_graphics ()
3898	{
3899	unicode_t ch, cmd = cmd_getc ();
3900
3901	if (cmd == 'Q')
3902	{
3903	/* query graphics */
3904	tt_printf ("\033G0\012"); /* no graphics */
3905	return;
3906	}
3907	/* swallow other graphics sequences until terminating ':' */
3908	do
3909	ch = cmd_getc ();
3910	while (ch != ':');
3911	}
3912	/}}} /
3913
3914	/* ------------------------------------------------------------------------- */	3976	/* ------------------------------------------------------------------------- */
3915		3977
3916	/*	3978	/*
3917	* Send printf () formatted output to the command.	3979	* Send printf () formatted output to the command.
3918	* Only use for small amounts of data.	3980	* Only use for small amounts of data.
…		…
3931		3993
3932	/* ---------------------------------------------------------------------- */	3994	/* ---------------------------------------------------------------------- */
3933	/* Write data to the pty as typed by the user, pasted with the mouse,	3995	/* Write data to the pty as typed by the user, pasted with the mouse,
3934	* or generated by us in response to a query ESC sequence.	3996	* or generated by us in response to a query ESC sequence.
3935	*/	3997	*/
3936	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	3998	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3937		3999
3938	void	4000	void
3939	rxvt_term::tt_write (const char *data, unsigned int len)	4001	rxvt_term::tt_write (const char *data, unsigned int len)
3940	{	4002	{
3941	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4003	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3953		4015
3954	data += written;	4016	data += written;
3955	len -= written;	4017	len -= written;
3956	}	4018	}
3957		4019
3958	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4020	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3959		4021
3960	memcpy (v_buffer + v_buflen, data, len);	4022	memcpy (v_buffer + v_buflen, data, len);
3961	v_buflen += len;	4023	v_buflen += len;
3962		4024
3963	pty_ev.set (ev::READ \| ev::WRITE);	4025	pty_ev.set (ev::READ \| ev::WRITE);

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.419 by root, Fri Oct 10 13:23:56 2008 UTC vs. Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.419 by root, Fri Oct 10 13:23:56 2008 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC