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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC vs.
Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC

…		…
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 (bgPixmap.flags & bgPixmap_t::hasChanged)
973	{	981	{
974	// scr_clear (true); This needs to be researched further!	982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;
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
…		…
1188	{	1199	{
1189	make_current ();	1200	make_current ();
1190		1201
1191	if (revents & ev::READ)	1202	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1203	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1204	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1205	cmd_parse ();
1195	break;
1196		1206
1197	if (revents & ev::WRITE)	1207	if (revents & ev::WRITE)
1198	pty_write ();	1208	pty_write ();
1199		1209
1200	refresh_check ();	1210	refresh_check ();
…		…
1241	{	1251	{
1242	int button_number, key_state = 0;	1252	int button_number, key_state = 0;
1243	int x, y;	1253	int x, y;
1244	int code = 32;	1254	int code = 32;
1245		1255
1246	x = Pixel2Col (ev.x);	1256	x = Pixel2Col (ev.x) + 1;
1247	y = Pixel2Row (ev.y);	1257	y = Pixel2Row (ev.y) + 1;
		1258
1248	if (ev.type == MotionNotify)	1259	if (ev.type == MotionNotify)
1249	{	1260	{
1250	if (x == mouse_row && y == mouse_col)	1261	if (x == mouse_row && y == mouse_col)
1251	return;	1262	return;
		1263
1252	mouse_row = x;	1264	mouse_row = x;
1253	mouse_col = y;	1265	mouse_col = y;
1254	code += 32;	1266	code += 32;
1255	}	1267	}
1256		1268
…		…
1259	else	1271	else
1260	{	1272	{
1261	button_number = MEvent.button - Button1;	1273	button_number = MEvent.button - Button1;
1262	/* add 0x3D for wheel events, like xterm does */	1274	/* add 0x3D for wheel events, like xterm does */
1263	if (button_number >= 3)	1275	if (button_number >= 3)
1264	button_number += (64 - 3);	1276	button_number += 64 - 3;
1265	}	1277	}
1266		1278
1267	if (priv_modes & PrivMode_MouseX10)	1279	if (priv_modes & PrivMode_MouseX10)
1268	{	1280	{
1269	/*	1281	/*
…		…
1301	fputc ('A', stderr);	1313	fputc ('A', stderr);
1302	if (key_state & 32)	1314	if (key_state & 32)
1303	fputc ('2', stderr);	1315	fputc ('2', stderr);
1304	fprintf (stderr, "]: <%d>, %d/%d\n",	1316	fprintf (stderr, "]: <%d>, %d/%d\n",
1305	button_number,	1317	button_number,
1306	x + 1,	1318	x,
1307	y + 1);	1319	y);
1308	#endif	1320	#endif
1309		1321
		1322	#if ENABLE_FRILLS
		1323	if (priv_modes & PrivMode_ExtMouseRight)
		1324	tt_printf ("\033[%d;%d;%dM",
		1325	code + button_number + key_state,
		1326	x,
		1327	y);
		1328	else if (priv_modes & PrivMode_ExtModeMouse)
		1329	tt_printf ("\033[M%c%lc%lc",
		1330	code + button_number + key_state,
		1331	wint_t (32 + x),
		1332	wint_t (32 + y));
		1333	else
		1334	#endif
1310	tt_printf ("\033[M%c%c%c",	1335	tt_printf ("\033[M%c%c%c",
1311	(code + button_number + key_state),	1336	code + button_number + key_state,
1312	(32 + x + 1),	1337	32 + x,
1313	(32 + y + 1));	1338	32 + y);
1314	}	1339	}
1315		1340
1316	/{{{ process an X event /	1341	/{{{ process an X event /
1317	void	1342	void
1318	rxvt_term::x_cb (XEvent &ev)	1343	rxvt_term::x_cb (XEvent &ev)
…		…
1420	&& ev.xfocus.mode != NotifyGrab)	1445	&& ev.xfocus.mode != NotifyGrab)
1421	focus_out ();	1446	focus_out ();
1422	break;	1447	break;
1423		1448
1424	case ConfigureNotify:	1449	case ConfigureNotify:
1425	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427	szHint.width, szHint.height);*/
1428	if (ev.xconfigure.window == parent[0])	1450	if (ev.xconfigure.window == parent[0])
1429	{	1451	{
1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431	;	1453	;
		1454
		1455	#ifdef HAVE_BG_PIXMAP
		1456	bool moved = false;
		1457	if (bgPixmap.window_position_sensitive ())
		1458	{
		1459	int x, y;
		1460	if (ev.xconfigure.send_event)
		1461	{
		1462	x = ev.xconfigure.x;
		1463	y = ev.xconfigure.y;
		1464	}
		1465	else
		1466	get_window_origin (x, y);
		1467
		1468	if (bgPixmap.set_position (x, y)
		1469	\|\| (bgPixmap.flags & bgPixmap_t::isInvalid))
		1470	moved = true;
		1471	}
		1472	#endif
1432		1473
1433	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1474	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1434	{	1475	{
1435	seen_resize = 1;	1476	seen_resize = 1;
1436	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1477	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437	}	1478	}
1438	else	1479	else
1439	{	1480	{
1440	#ifdef HAVE_BG_PIXMAP	1481	#ifdef HAVE_BG_PIXMAP
1441	if (bgPixmap.window_position_sensitive ())	1482	if (moved)
1442	{	1483	{
1443	if (mapped)	1484	if (mapped)
1444	update_background ();	1485	update_background ();
1445	else	1486	else
1446	bgPixmap.invalidate ();	1487	bgPixmap.invalidate ();
…		…
1459	selection_property (ev.xproperty.window, ev.xproperty.atom);	1500	selection_property (ev.xproperty.window, ev.xproperty.atom);
1460		1501
1461	break;	1502	break;
1462		1503
1463	case SelectionClear:	1504	case SelectionClear:
1464	selection_clear ();	1505	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465	break;	1506	break;
1466		1507
1467	case SelectionNotify:	1508	case SelectionNotify:
1468	if (selection_wait == Sel_normal)	1509	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1510	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1473	selection_send (ev.xselectionrequest);	1514	selection_send (ev.xselectionrequest);
1474	break;	1515	break;
1475		1516
1476	case MapNotify:	1517	case MapNotify:
1477	#ifdef HAVE_BG_PIXMAP	1518	#ifdef HAVE_BG_PIXMAP
1478	/* This is needed spcifically to fix the case of no window manager or a	1519	/* 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	1520	* non-reparenting window manager. In those cases we never get first
1480	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1521	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1481	* care of multiplicity of ConfigureNotify events arriwing while WM does	1522	* care of multiplicity of ConfigureNotify events arriving while WM does
1482	* reparenting.	1523	* reparenting.
1483	* We should not render background immidiately, as there could be several	1524	* 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	1525	* 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	1526	* by scheduling background redraw as soon as we can, but giving a short
1486	* bit of time for ConfigureNotifies to arrive.	1527	* bit of time for ConfigureNotifies to arrive.
1487	* We should render background PRIOR to drawing any text, but AFTER all	1528	* We should render background PRIOR to drawing any text, but AFTER all
1488	* of ConfigureNotifys for the best results.	1529	* of ConfigureNotifys for the best results.
…		…
1682	#endif	1723	#endif
1683		1724
1684	refresh_check ();	1725	refresh_check ();
1685	}	1726	}
1686		1727
		1728	#if ENABLE_FRILLS
		1729	void
		1730	rxvt_term::set_urgency (bool enable)
		1731	{
		1732	if (enable == urgency_hint)
		1733	return;
		1734
		1735	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1736	{
		1737	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1738	XSetWMHints (dpy, parent[0], h);
		1739	urgency_hint = enable;
		1740	}
		1741	}
		1742	#endif
		1743
1687	void	1744	void
1688	rxvt_term::focus_in ()	1745	rxvt_term::focus_in ()
1689	{	1746	{
1690	if (!focus)	1747	if (!focus)
1691	{	1748	{
1692	focus = 1;	1749	focus = 1;
1693	want_refresh = 1;	1750	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1751
1697	#if USE_XIM	1752	#if USE_XIM
1698	if (Input_Context != NULL)	1753	if (Input_Context != NULL)
1699	{	1754	{
1700	IMSetPosition ();	1755	IMSetPosition ();
…		…
1712	scr_recolour ();	1767	scr_recolour ();
1713	}	1768	}
1714	#endif	1769	#endif
1715	#if ENABLE_FRILLS	1770	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1771	if (option (Opt_urgentOnBell))
1717	{	1772	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	1773	#endif
		1774
		1775	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1776	}
1726	}	1777	}
1727		1778
1728	void	1779	void
1729	rxvt_term::focus_out ()	1780	rxvt_term::focus_out ()
…		…
1731	if (focus)	1782	if (focus)
1732	{	1783	{
1733	focus = 0;	1784	focus = 0;
1734	want_refresh = 1;	1785	want_refresh = 1;
1735		1786
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1787	#if ENABLE_FRILLS
1737		1788	if (option (Opt_urgentOnBell))
		1789	set_urgency (0);
		1790	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1791	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1792	if (iso14755buf)
1740	{	1793	{
1741	iso14755buf = 0;	1794	iso14755buf = 0;
1742	# if ISO_14755	1795	# if ISO_14755
…		…
1759	{	1812	{
1760	pix_colors = pix_colors_unfocused;	1813	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1814	scr_recolour ();
1762	}	1815	}
1763	#endif	1816	#endif
		1817
		1818	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1819	}
1765	}	1820	}
1766		1821
1767	void	1822	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1823	rxvt_term::update_fade_color (unsigned int idx)
…		…
1845	/* save the xbutton state (for ButtonRelease) */	1900	/* save the xbutton state (for ButtonRelease) */
1846	MEvent.state = ev.state;	1901	MEvent.state = ev.state;
1847	#ifdef MOUSE_REPORT_DOUBLECLICK	1902	#ifdef MOUSE_REPORT_DOUBLECLICK
1848	if (ev.button == MEvent.button && clickintime)	1903	if (ev.button == MEvent.button && clickintime)
1849	{	1904	{
1850	/* same button, within alloted time */	1905	/* same button, within allowed time */
1851	MEvent.clicks++;	1906	MEvent.clicks++;
1852		1907
1853	if (MEvent.clicks > 1)	1908	if (MEvent.clicks > 1)
1854	{	1909	{
1855	/* only report double clicks */	1910	/* only report double clicks */
…		…
2126	selection_make (ev.time);	2181	selection_make (ev.time);
2127	break;	2182	break;
2128		2183
2129	case Button2:	2184	case Button2:
2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2185	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);	2186	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132	break;	2187	break;
2133		2188
2134	#ifdef MOUSE_WHEEL	2189	#ifdef MOUSE_WHEEL
2135	case Button4:	2190	case Button4:
2136	case Button5:	2191	case Button5:
…		…
2170	}	2225	}
2171	}	2226	}
2172		2227
2173	/}}} /	2228	/}}} /
2174		2229
2175	bool	2230	void
2176	rxvt_term::cmd_parse ()	2231	rxvt_term::cmd_parse ()
2177	{	2232	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2233	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2234	char *seq_begin; // remember start of esc-sequence here
2181		2235
2182	for (;;)	2236	for (;;)
2183	{	2237	{
2184	if (ch == NOCHAR)	2238	if (expect_false (ch == NOCHAR))
2185	{	2239	{
2186	seq_begin = cmdbuf_ptr;	2240	seq_begin = cmdbuf_ptr;
2187	ch = next_char ();	2241	ch = next_char ();
2188		2242
2189	if (ch == NOCHAR)	2243	if (ch == NOCHAR)
2190	break;	2244	break;
2191	}	2245	}
2192		2246
2193	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2247	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2194	{	2248	{
2195	if (!seen_input)	2249	if (expect_false (!seen_input))
2196	{	2250	{
2197	seen_input = 1;	2251	seen_input = 1;
2198	// many badly-written programs (e.g. jed) contain a race condition:	2252	// many badly-written programs (e.g. jed) contain a race condition:
2199	// they first read the screensize and then install a SIGWINCH handler.	2253	// they first read the screensize and then install a SIGWINCH handler.
2200	// some window managers resize the window early, and these programs	2254	// some window managers resize the window early, and these programs
…		…
2213	wchar_t *str = buf;	2267	wchar_t *str = buf;
2214	wchar_t *eol = str + min (ncol, UBUFSIZ);	2268	wchar_t *eol = str + min (ncol, UBUFSIZ);
2215		2269
2216	for (;;)	2270	for (;;)
2217	{	2271	{
2218	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2272	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219	break;	2273	break;
2220		2274
2221	*str++ = ch;	2275	*str++ = ch;
2222		2276
2223	if (ch == C0_LF \|\| str >= eol)	2277	if (expect_false (ch == C0_LF \|\| str >= eol))
2224	{	2278	{
2225	if (ch == C0_LF)	2279	if (ch == C0_LF)
2226	nlines++;	2280	nlines++;
2227		2281
2228	refresh_count++;	2282	refresh_count++;
…		…
2277	* What the heck we'll cheat and only refresh less than every page-full.	2331	* What the heck we'll cheat and only refresh less than every page-full.
2278	* if skipScroll is enabled.	2332	* if skipScroll is enabled.
2279	*/	2333	*/
2280	if (refreshnow)	2334	if (refreshnow)
2281	{	2335	{
2282	flag = true;
2283	scr_refresh ();	2336	scr_refresh ();
2284	want_refresh = 1;	2337	want_refresh = 1;
2285	}	2338	}
2286
2287	}	2339	}
2288	else	2340	else
2289	{	2341	{
2290	try	2342	try
2291	{	2343	{
…		…
2299	}	2351	}
2300		2352
2301	ch = NOCHAR;	2353	ch = NOCHAR;
2302	}	2354	}
2303	}	2355	}
2304
2305	return flag;
2306	}	2356	}
2307		2357
2308	// read the next character	2358	// read the next character
2309	wchar_t	2359	wchar_t
2310	rxvt_term::next_char () NOTHROW	2360	rxvt_term::next_char () NOTHROW
2311	{	2361	{
2312	while (cmdbuf_ptr < cmdbuf_endp)	2362	while (cmdbuf_ptr < cmdbuf_endp)
2313	{	2363	{
2314	// assume 7-bit to be ascii ALWAYS	2364	// assume 7-bit to be ascii ALWAYS
2315	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2365	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2316	return *cmdbuf_ptr++;	2366	return *cmdbuf_ptr++;
2317		2367
2318	wchar_t wc;	2368	wchar_t wc;
2319	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2369	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320		2370
…		…
2325	break;	2375	break;
2326	}	2376	}
2327		2377
2328	if (len == (size_t)-1)	2378	if (len == (size_t)-1)
2329	{	2379	{
2330	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2380	mbstate.reset (); // reset now undefined conversion state
2331	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2381	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332	}	2382	}
2333		2383
2334	// assume wchar == unicode	2384	// assume wchar == unicode
2335	cmdbuf_ptr += len;	2385	cmdbuf_ptr += len;
…		…
2381	/----------------------------------------------------------------------/	2431	/----------------------------------------------------------------------/
2382	#ifdef PRINTPIPE	2432	#ifdef PRINTPIPE
2383	FILE *	2433	FILE *
2384	rxvt_term::popen_printer ()	2434	rxvt_term::popen_printer ()
2385	{	2435	{
2386	FILE *stream = popen (rs[Rs_print_pipe], "w");	2436	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2387		2437
2388	if (stream == NULL)	2438	if (stream == NULL)
2389	rxvt_warn ("can't open printer pipe, not printing.\n");	2439	rxvt_warn ("can't open printer pipe, not printing.\n");
2390		2440
2391	return stream;	2441	return stream;
…		…
2402	* simulate attached vt100 printer	2452	* simulate attached vt100 printer
2403	*/	2453	*/
2404	void	2454	void
2405	rxvt_term::process_print_pipe ()	2455	rxvt_term::process_print_pipe ()
2406	{	2456	{
2407	int done;	2457	FILE *fd = popen_printer ();
2408	FILE *fd;
2409		2458
2410	if ((fd = popen_printer ()) == NULL)	2459	if (!fd)
2411	return;	2460	return;
2412		2461
2413	/*	2462	/*
2414	* Send all input to the printer until either ESC[4i or ESC[?4i	2463	* Send all input to the printer until either ESC[4i or ESC[?4i
2415	* is received.	2464	* is received.
2416	*/	2465	*/
2417	for (done = 0; !done;)	2466	for (int done = 0; !done; )
2418	{	2467	{
2419	unsigned char buf[8];	2468	unsigned char buf[8];
2420	unicode_t ch;	2469	unicode_t ch;
2421	unsigned int i, len;	2470	unsigned int i, len;
2422		2471
…		…
2645		2694
2646	/* 8.3.87: NEXT LINE */	2695	/* 8.3.87: NEXT LINE */
2647	case C1_NEL: /* ESC E */	2696	case C1_NEL: /* ESC E */
2648	{	2697	{
2649	wchar_t nlcr[] = { C0_LF, C0_CR };	2698	wchar_t nlcr[] = { C0_LF, C0_CR };
2650	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2699	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2651	}	2700	}
2652	break;	2701	break;
2653		2702
2654	/* kidnapped escape sequence: Should be 8.3.48 */	2703	/* kidnapped escape sequence: Should be 8.3.48 */
2655	case C1_ESA: /* ESC G */	2704	case C1_ESA: /* ESC G */
…		…
2680	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2729	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2681	case C1_SCI: /* ESC Z */	2730	case C1_SCI: /* ESC Z */
2682	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2731	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2683	break; /* steal obsolete ESC [ c */	2732	break; /* steal obsolete ESC [ c */
2684		2733
2685	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2734	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2686	case C1_CSI: /* ESC [ */	2735	case C1_CSI: /* ESC [ */
2687	process_csi_seq ();	2736	process_csi_seq ();
2688	break;	2737	break;
2689		2738
2690	/* 8.3.90: OPERATING SYSTEM COMMAND */	2739	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2691	case C1_OSC: /* ESC ] */	2740	case C1_OSC: /* ESC ] */
2692	process_osc_seq ();	2741	process_osc_seq ();
2693	break;	2742	break;
2694		2743
2695	/* 8.3.106: RESET TO INITIAL STATE */	2744	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2696	case 'c':	2745	case 'c':
2697	mbstate.reset ();	2746	mbstate.reset ();
2698	scr_poweron ();	2747	scr_poweron ();
2699	scrollBar.show (1);	2748	scrollBar.show (1);
2700	break;	2749	break;
…		…
2724	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2773	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2725	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2774	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2726	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2775	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2727	};	2776	};
2728		2777
2729	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2778	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2730	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \	2779	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \
2731	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))	2780	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))
2732	#define get_byte_array_bit(array, bit) \	2781	#define get_byte_array_bit(array, bit) \
2733	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2782	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2734		2783
2735	const unsigned char csi_defaults[] =	2784	static const unsigned char csi_defaults[] =
2736	{	2785	{
2737	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2786	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2738	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2787	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2739	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2788	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2740	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2789	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
…		…
2755		2804
2756	nargs = 0;	2805	nargs = 0;
2757		2806
2758	priv = 0;	2807	priv = 0;
2759	ch = cmd_getc ();	2808	ch = cmd_getc ();
2760	if (ch >= '<' && ch <= '?')	2809	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2761	{	2810	{
2762	/* '<' '=' '>' '?' */	2811	/* '<' '=' '>' '?' '!' */
2763	priv = ch;	2812	priv = ch;
2764	ch = cmd_getc ();	2813	ch = cmd_getc ();
2765	}	2814	}
2766		2815
2767	/* read any numerical arguments */	2816	/* read any numerical arguments */
…		…
2821		2870
2822	case '?':	2871	case '?':
2823	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2872	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2824	process_terminal_mode (ch, priv, nargs, arg);	2873	process_terminal_mode (ch, priv, nargs, arg);
2825	break;	2874	break;
		2875
		2876	case '!':
		2877	if (ch == CSI_70)
		2878	{
		2879	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2880	scr_soft_reset ();
		2881
		2882	static const int pm_h[] = { 7, 25 };
		2883	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
		2884
		2885	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
		2886	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2826	}	2887	}
		2888	break;
		2889	}
		2890
2827	return;	2891	return;
2828	}	2892	}
2829		2893
2830	switch (ch)	2894	switch (ch)
2831	{	2895	{
…		…
3198	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3262	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3199	*/	3263	*/
3200	void	3264	void
3201	rxvt_term::process_dcs_seq ()	3265	rxvt_term::process_dcs_seq ()
3202	{	3266	{
3203	char *s;
3204	unicode_t eh;
3205
3206	/*	3267	/*
3207	* Not handled yet	3268	* Not handled yet
3208	*/	3269	*/
		3270
		3271	unicode_t eh;
3209	s = get_to_st (eh);	3272	char *s = get_to_st (eh);
3210	if (s)	3273	if (s)
3211	free (s);	3274	free (s);
3212		3275
3213	return;	3276	return;
3214	}	3277	}
…		…
3218	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3281	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3219	*/	3282	*/
3220	void	3283	void
3221	rxvt_term::process_osc_seq ()	3284	rxvt_term::process_osc_seq ()
3222	{	3285	{
3223	unicode_t ch, eh;
3224	int arg;	3286	int arg;
3225		3287
3226	ch = cmd_getc ();	3288	unicode_t ch = cmd_getc ();
3227	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3289	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3228	arg = arg * 10 + (ch - '0');	3290	arg = arg * 10 + (ch - '0');
3229		3291
3230	if (ch == ';')	3292	if (ch == ';')
3231	{	3293	{
		3294	unicode_t eh;
3232	char *s = get_to_st (eh);	3295	char *s = get_to_st (eh);
3233		3296
3234	if (s)	3297	if (s)
3235	{	3298	{
3236	process_xterm_seq (arg, s, eh);	3299	process_xterm_seq (arg, s, eh);
…		…
3260		3323
3261	/*	3324	/*
3262	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3325	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3263	*/	3326	*/
3264	void	3327	void
3265	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3328	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3266	{	3329	{
3267	int color;	3330	int color;
3268	char buf, name;	3331	char buf, name;
3269	bool query = str[0] == '?' && !str[1];	3332	bool query = str[0] == '?' && !str[1];
3270	int saveop = op;	3333	int saveop = op;
…		…
3311		3374
3312	XFree (value);	3375	XFree (value);
3313	}	3376	}
3314	else	3377	else
3315	{	3378	{
3316	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3379	char *eq = strchr (str, '=');
3317		3380
3318	if (eq)	3381	if (eq)
3319	{	3382	{
3320	*eq = 0;	3383	*eq = 0;
3321	set_utf8_property (display->atom (str), eq + 1);	3384	set_utf8_property (display->atom (str), eq + 1);
…		…
3361	process_color_seq (op, Color_pointer_fg, str, resp);	3424	process_color_seq (op, Color_pointer_fg, str, resp);
3362	break;	3425	break;
3363	case XTerm_Color_pointer_bg:	3426	case XTerm_Color_pointer_bg:
3364	process_color_seq (op, Color_pointer_bg, str, resp);	3427	process_color_seq (op, Color_pointer_bg, str, resp);
3365	break;	3428	break;
		3429	#ifdef OPTION_HC
		3430	case XTerm_Color_HC:
		3431	process_color_seq (op, Color_HC, str, resp);
		3432	break;
		3433	case XTerm_Color_HTC:
		3434	process_color_seq (op, Color_HTC, str, resp);
		3435	break;
		3436	#endif
3366	#ifndef NO_BOLD_UNDERLINE_REVERSE	3437	#ifndef NO_BOLD_UNDERLINE_REVERSE
3367	case XTerm_Color_RV:
3368	process_color_seq (op, Color_RV, str, resp);
3369	break;
3370	case Rxvt_Color_BD:
3371	case URxvt_Color_BD:	3438	case URxvt_Color_BD:
3372	process_color_seq (op, Color_BD, str, resp);	3439	process_color_seq (op, Color_BD, str, resp);
3373	break;	3440	break;
3374	case Rxvt_Color_UL:
3375	case URxvt_Color_UL:	3441	case URxvt_Color_UL:
3376	process_color_seq (op, Color_UL, str, resp);	3442	process_color_seq (op, Color_UL, str, resp);
3377	break;	3443	break;
3378	case URxvt_Color_IT:	3444	case URxvt_Color_IT:
3379	process_color_seq (op, Color_IT, str, resp);	3445	process_color_seq (op, Color_IT, str, resp);
3380	break;	3446	break;
3381	#endif	3447	#endif
		3448	case URxvt_Color_border:
		3449	process_color_seq (op, Color_border, str, resp);
		3450	break;
3382	#if ENABLE_TRANSPARENCY	3451	#if ENABLE_TRANSPARENCY
3383	case URxvt_Color_tint:	3452	case URxvt_Color_tint:
3384	process_color_seq (op, Color_tint, str, resp);	3453	process_color_seq (op, Color_tint, str, resp);
3385	{	3454	{
3386	bool changed = false;	3455	bool changed = false;
3387		3456
3388	if (ISSET_PIXCOLOR (Color_tint))	3457	if (ISSET_PIXCOLOR (Color_tint))
3389	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3458	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3390	else
3391	changed = bgPixmap.unset_tint ();
3392		3459
3393	if (changed)	3460	if (changed)
3394	update_background ();	3461	update_background ();
3395	}	3462	}
3396		3463
…		…
3401	case Rxvt_Pixmap:	3468	case Rxvt_Pixmap:
3402	if (!strcmp (str, "?"))	3469	if (!strcmp (str, "?"))
3403	{	3470	{
3404	char str[256];	3471	char str[256];
3405		3472
3406	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3473	sprintf (str, "[%dx%d+%d+%d]",
3407	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3474	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3408	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3475	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3409	process_xterm_seq (XTerm_title, str, CHAR_ST);	3476	process_xterm_seq (XTerm_title, str, CHAR_ST);
3410	}	3477	}
3411	else	3478	else
3412	{	3479	{
3413	int changed = 0;	3480	int changed = 0;
3414		3481
3415	if (*str != ';')	3482	if (*str != ';')
3416	{	3483	{
3417	/* reset to default scaling :*/
3418	bgPixmap.unset_geometry ();
3419	if (bgPixmap.set_file (str)) /* change pixmap */	3484	if (bgPixmap.set_file (str)) /* change pixmap */
		3485	{
3420	changed++;	3486	changed++;
3421	str = strchr (str, ';');	3487	str = strchr (str, ';');
3422	if (str == NULL)	3488	if (str == NULL)
3423	bgPixmap.set_defaultGeometry ();	3489	bgPixmap.set_defaultGeometry ();
		3490	else
		3491	bgPixmap.set_geometry (str+1);
		3492	}
3424	}	3493	}
3425		3494	else
3426	while (str)
3427	{	3495	{
3428	str++;	3496	str++;
3429	if (bgPixmap.set_geometry (str))	3497	if (bgPixmap.set_geometry (str, true))
3430	changed++;	3498	changed++;
3431	str = strchr (str, ';');
3432	}	3499	}
3433		3500
3434	if (changed)	3501	if (changed)
		3502	{
		3503	if (bgPixmap.window_position_sensitive ())
		3504	{
		3505	int x, y;
		3506	get_window_origin (x, y);
		3507	bgPixmap.set_position (x, y);
		3508	}
3435	update_background ();	3509	update_background ();
		3510	}
3436	}	3511	}
3437	break;	3512	break;
3438	#endif	3513	#endif
3439		3514
3440	case XTerm_logfile:	3515	case XTerm_logfile:
…		…
3510	break;	3585	break;
3511	#endif	3586	#endif
3512		3587
3513	#if ENABLE_PERL	3588	#if ENABLE_PERL
3514	case URxvt_perl:	3589	case URxvt_perl:
3515	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3590	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3516	; // no responses yet
3517	break;	3591	break;
3518	#endif	3592	#endif
3519	}	3593	}
3520	}	3594	}
3521	/----------------------------------------------------------------------/	3595	/----------------------------------------------------------------------/
…		…
3544	{	3618	{
3545	if (mode == 'r')	3619	if (mode == 'r')
3546	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3620	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3547	else	3621	else
3548	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3622	state = (mode == 't') ? ! (priv_modes & bit) : mode;
		3623
3549	set_privmode (bit, state);	3624	set_privmode (bit, state);
3550	}	3625	}
3551		3626
3552	return state;	3627	return state;
3553	}	3628	}
…		…
3562	static const struct	3637	static const struct
3563	{	3638	{
3564	const int argval;	3639	const int argval;
3565	const unsigned long bit;	3640	const unsigned long bit;
3566	} argtopriv[] = {	3641	} argtopriv[] = {
3567	{ 1, PrivMode_aplCUR },	3642	{ 1, PrivMode_aplCUR }, // DECCKM
3568	{ 2, PrivMode_vt52 },	3643	{ 2, PrivMode_vt52 },
3569	{ 3, PrivMode_132 },	3644	{ 3, PrivMode_132 }, // DECCOLM
3570	{ 4, PrivMode_smoothScroll },	3645	{ 4, PrivMode_smoothScroll }, // DECSCLM
3571	{ 5, PrivMode_rVideo },	3646	{ 5, PrivMode_rVideo }, // DECSCNM
3572	{ 6, PrivMode_relOrigin },	3647	{ 6, PrivMode_relOrigin }, // DECOM
3573	{ 7, PrivMode_Autowrap },	3648	{ 7, PrivMode_Autowrap }, // DECAWM
3574	// 8, bi-directional support mode	3649	// 8, auto-repeat keys // DECARM
3575	{ 9, PrivMode_MouseX10 },	3650	{ 9, PrivMode_MouseX10 },
3576	// 18, 19 printing-related	3651	// 18 end FF to printer after print screen
		3652	// 19 Print screen prints full screen/scroll region
3577	{ 25, PrivMode_VisibleCursor },	3653	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3578	#ifdef scrollBar_esc	3654	#ifdef scrollBar_esc
3579	{ scrollBar_esc, PrivMode_scrollBar },	3655	{ scrollBar_esc, PrivMode_scrollBar },
3580	#endif	3656	#endif
3581	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3657	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3658	// 38, tektronix mode // DECTEK
3582	{ 40, PrivMode_132OK },	3659	{ 40, PrivMode_132OK },
3583	// 41 xterm more fixes NYI	3660	// 41 xterm more fixes NYI
3584	// 45 margin bell NYI	3661	// 45 margin bell NYI
3585	// 46 start logging	3662	// 46 start logging
3586	{ 47, PrivMode_Screen },	3663	{ 47, PrivMode_Screen },
3587	{ 66, PrivMode_aplKP },	3664	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3588	#ifndef NO_BACKSPACE_KEY	3665	#ifndef NO_BACKSPACE_KEY
3589	{ 67, PrivMode_BackSpace },	3666	{ 67, PrivMode_BackSpace }, // DECBKM
3590	#endif	3667	#endif
3591	{ 1000, PrivMode_MouseX11 },	3668	{ 1000, PrivMode_MouseX11 },
3592	{ 1002, PrivMode_MouseBtnEvent },	3669	{ 1002, PrivMode_MouseBtnEvent },
3593	{ 1003, PrivMode_MouseAnyEvent },	3670	{ 1003, PrivMode_MouseAnyEvent },
		3671	#if ENABLE_FRILLS
		3672	{ 1005, PrivMode_ExtModeMouse },
		3673	#endif
3594	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3674	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3595	{ 1011, PrivMode_Keypress }, // rxvt extension	3675	{ 1011, PrivMode_Keypress }, // rxvt extension
		3676	#if ENABLE_FRILLS
		3677	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3678	#endif
3596	// 1035 enable modifiers for alt, numlock NYI	3679	// 1035 enable modifiers for alt, numlock NYI
3597	// 1036 send ESC for meta keys NYI	3680	// 1036 send ESC for meta keys NYI
3598	// 1037 send DEL for keypad delete NYI	3681	// 1037 send DEL for keypad delete NYI
3599	{ 1047, PrivMode_Screen },	3682	{ 1047, PrivMode_Screen },
3600	// 1048 save and restore cursor	3683	// 1048 save and restore cursor, implemented in code
3601	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3684	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3602	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3685	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3603	{ 2004, PrivMode_BracketPaste },	3686	{ 2004, PrivMode_BracketPaste },
3604	};	3687	};
3605		3688
…		…
3615	for (i = 0; i < nargs; i++)	3698	for (i = 0; i < nargs; i++)
3616	{	3699	{
3617	state = -1;	3700	state = -1;
3618		3701
3619	/* basic handling */	3702	/* basic handling */
3620	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3703	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3621	if (argtopriv[j].argval == arg[i])	3704	if (argtopriv[j].argval == arg[i])
3622	{	3705	{
3623	state = privcases (mode, argtopriv[j].bit);	3706	state = privcases (mode, argtopriv[j].bit);
3624	break;	3707	break;
3625	}	3708	}
…		…
3633		3716
3634	scr_touch (true);	3717	scr_touch (true);
3635	break;	3718	break;
3636	#endif	3719	#endif
3637	case 1048: /* alternative cursor save */	3720	case 1048: /* alternative cursor save */
3638	case 1049:
3639	if (option (Opt_secondaryScreen))	3721	if (option (Opt_secondaryScreen))
3640	if (mode == 0)	3722	if (mode == 0)
3641	scr_cursor (RESTORE);	3723	scr_cursor (RESTORE);
3642	else if (mode == 1)	3724	else if (mode == 1)
3643	scr_cursor (SAVE);	3725	scr_cursor (SAVE);
…		…
3656	*/	3738	*/
3657	set_privmode (PrivMode_vt52, 1);	3739	set_privmode (PrivMode_vt52, 1);
3658	break;	3740	break;
3659	case 3: /* 80/132 */	3741	case 3: /* 80/132 */
3660	if (priv_modes & PrivMode_132OK)	3742	if (priv_modes & PrivMode_132OK)
3661	{
3662	scr_poweron ();
3663	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3743	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3664	}
3665	break;	3744	break;
3666	case 4: /* smooth scrolling */	3745	case 4: /* smooth scrolling */
3667	set_option (Opt_jumpScroll, !state);	3746	set_option (Opt_jumpScroll, !state);
3668	break;	3747	break;
3669	case 5: /* reverse video */	3748	case 5: /* reverse video */
…		…
3707	case 1003:	3786	case 1003:
3708	if (state)	3787	if (state)
3709	{	3788	{
3710	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3789	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3711	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3790	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3791	mouse_row = mouse_col = 0;
3712	vt_emask_mouse = PointerMotionMask;	3792	vt_emask_mouse = PointerMotionMask;
3713	}	3793	}
3714	else	3794	else
3715	vt_emask_mouse = NoEventMask;	3795	vt_emask_mouse = NoEventMask;
		3796
3716	vt_select_input ();	3797	vt_select_input ();
3717	break;	3798	break;
3718	case 1010: /* scroll to bottom on TTY output inhibit */	3799	case 1010: /* scroll to bottom on TTY output inhibit */
3719	set_option (Opt_scrollTtyOutput, !state);	3800	set_option (Opt_scrollTtyOutput, !state);
3720	break;	3801	break;
3721	case 1011: /* scroll to bottom on key press */	3802	case 1011: /* scroll to bottom on key press */
3722	set_option (Opt_scrollTtyKeypress, state);	3803	set_option (Opt_scrollTtyKeypress, state);
3723	break;	3804	break;
3724	case 1047: /* secondary screen w/ clearing last */	3805	case 1047: /* secondary screen w/ clearing last */
3725	if (option (Opt_secondaryScreen))	3806	if (option (Opt_secondaryScreen))
3726	if (current_screen != PRIMARY)	3807	if (!state)
3727	scr_erase_screen (2);	3808	scr_erase_screen (2);
		3809
3728	scr_change_screen (state);	3810	scr_change_screen (state);
3729	break;	3811	break;
3730	case 1049: /* secondary screen w/ clearing first */	3812	case 1049: /* secondary screen w/ clearing first */
		3813	if (option (Opt_secondaryScreen))
		3814	if (state)
		3815	scr_cursor (SAVE);
		3816
3731	scr_change_screen (state);	3817	scr_change_screen (state);
		3818
3732	if (option (Opt_secondaryScreen))	3819	if (option (Opt_secondaryScreen))
3733	if (current_screen != PRIMARY)	3820	if (state)
3734	scr_erase_screen (2);	3821	scr_erase_screen (2);
		3822	else
		3823	scr_cursor (RESTORE);
3735	break;	3824	break;
3736	default:	3825	default:
3737	break;	3826	break;
3738	}	3827	}
3739	}	3828	}
…		…
3933		4022
3934	/* ---------------------------------------------------------------------- */	4023	/* ---------------------------------------------------------------------- */
3935	/* Write data to the pty as typed by the user, pasted with the mouse,	4024	/* Write data to the pty as typed by the user, pasted with the mouse,
3936	* or generated by us in response to a query ESC sequence.	4025	* or generated by us in response to a query ESC sequence.
3937	*/	4026	*/
3938	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4027	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3939		4028
3940	void	4029	void
3941	rxvt_term::tt_write (const char *data, unsigned int len)	4030	rxvt_term::tt_write (const char *data, unsigned int len)
3942	{	4031	{
3943	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4032	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3955		4044
3956	data += written;	4045	data += written;
3957	len -= written;	4046	len -= written;
3958	}	4047	}
3959		4048
3960	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4049	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3961		4050
3962	memcpy (v_buffer + v_buflen, data, len);	4051	memcpy (v_buffer + v_buflen, data, len);
3963	v_buflen += len;	4052	v_buflen += len;
3964		4053
3965	pty_ev.set (ev::READ \| ev::WRITE);	4054	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.415 by root, Sat Apr 26 03:37:18 2008 UTC vs. Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC vs.
Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC