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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.413 by ayin, Sun Feb 17 12:11:56 2008 UTC vs.
Revision 1.462 by root, Wed Nov 24 04:07:39 2010 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	{
…		…
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	{
		982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;
974	// scr_clear (true); This needs to be researched further!	983	// scr_clear (true); This needs to be researched further!
975	scr_touch (false);	984	scr_touch (false);
976	}	985	}
977	#endif	986	#endif
978		987
…		…
1015	}	1024	}
1016	while (row < end_row);	1025	while (row < end_row);
1017	}	1026	}
1018		1027
1019	scr_refresh ();	1028	scr_refresh ();
1020	scrollbar_show (1);	1029	scrollBar.show (1);
1021	#ifdef USE_XIM	1030	#ifdef USE_XIM
1022	IMSendSpot ();	1031	IMSendSpot ();
1023	#endif	1032	#endif
1024	}	1033	}
1025		1034
1026	display->flush ();	1035	display->flush ();
1027	}	1036	}
1028		1037
1029	/* checks wether a refresh is requested and starts the refresh timer */	1038	/* checks whether a refresh is requested and starts the refresh timer */
1030	void	1039	void
1031	rxvt_term::refresh_check ()	1040	rxvt_term::refresh_check ()
1032	{	1041	{
1033	if (want_refresh && !flush_ev.is_active ())	1042	if (want_refresh && !flush_ev.is_active ())
1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1043	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1127	{	1136	{
1128	// this should really be sched_yield(), but the linux guys thought	1137	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1138	// 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	1139	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1140	// allowed by the sus... as is returning ENOSYS.
		1141	// since the linux guys additionally thought that breaking the only
		1142	// known workaround against their unusable sched_yield hack is cool,
		1143	// we just nanosleep a bit and hope for the best.
1132		1144
1133	struct timespec ts = { 0, 0 };	1145	struct timespec ts = { 0, 1000 };
1134	nanosleep (&ts, 0);	1146	nanosleep (&ts, 0);
1135		1147
1136	w.stop ();	1148	w.stop ();
1137	}	1149	}
1138		1150
…		…
1188	{	1200	{
1189	make_current ();	1201	make_current ();
1190		1202
1191	if (revents & ev::READ)	1203	if (revents & ev::READ)
1192	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1193	while (pty_fill ())	1205	for (int i = CBUFCNT; i-- && pty_fill (); )
1194	if (cmd_parse ())	1206	cmd_parse ();
1195	break;
1196		1207
1197	if (revents & ev::WRITE)	1208	if (revents & ev::WRITE)
1198	pty_write ();	1209	pty_write ();
1199		1210
1200	refresh_check ();	1211	refresh_check ();
…		…
1241	{	1252	{
1242	int button_number, key_state = 0;	1253	int button_number, key_state = 0;
1243	int x, y;	1254	int x, y;
1244	int code = 32;	1255	int code = 32;
1245		1256
1246	x = Pixel2Col (ev.x);	1257	x = Pixel2Col (ev.x) + 1;
1247	y = Pixel2Row (ev.y);	1258	y = Pixel2Row (ev.y) + 1;
		1259
1248	if (ev.type == MotionNotify)	1260	if (ev.type == MotionNotify)
1249	{	1261	{
1250	if (x == mouse_row && y == mouse_col)	1262	if (x == mouse_row && y == mouse_col)
1251	return;	1263	return;
		1264
1252	mouse_row = x;	1265	mouse_row = x;
1253	mouse_col = y;	1266	mouse_col = y;
1254	code += 32;	1267	code += 32;
1255	}	1268	}
1256		1269
…		…
1259	else	1272	else
1260	{	1273	{
1261	button_number = MEvent.button - Button1;	1274	button_number = MEvent.button - Button1;
1262	/* add 0x3D for wheel events, like xterm does */	1275	/* add 0x3D for wheel events, like xterm does */
1263	if (button_number >= 3)	1276	if (button_number >= 3)
1264	button_number += (64 - 3);	1277	button_number += 64 - 3;
1265	}	1278	}
1266		1279
1267	if (priv_modes & PrivMode_MouseX10)	1280	if (priv_modes & PrivMode_MouseX10)
1268	{	1281	{
1269	/*	1282	/*
…		…
1301	fputc ('A', stderr);	1314	fputc ('A', stderr);
1302	if (key_state & 32)	1315	if (key_state & 32)
1303	fputc ('2', stderr);	1316	fputc ('2', stderr);
1304	fprintf (stderr, "]: <%d>, %d/%d\n",	1317	fprintf (stderr, "]: <%d>, %d/%d\n",
1305	button_number,	1318	button_number,
1306	x + 1,	1319	x,
1307	y + 1);	1320	y);
1308	#endif	1321	#endif
1309		1322
		1323	#if ENABLE_FRILLS
		1324	if (priv_modes & PrivMode_ExtMouseRight)
		1325	tt_printf ("\033[%d;%d;%dM",
		1326	code + button_number + key_state,
		1327	x,
		1328	y);
		1329	else if (priv_modes & PrivMode_ExtModeMouse)
		1330	tt_printf ("\033[M%c%lc%lc",
		1331	code + button_number + key_state,
		1332	wint_t (32 + x),
		1333	wint_t (32 + y));
		1334	else
		1335	#endif
1310	tt_printf ("\033[M%c%c%c",	1336	tt_printf ("\033[M%c%c%c",
1311	(code + button_number + key_state),	1337	code + button_number + key_state,
1312	(32 + x + 1),	1338	32 + x,
1313	(32 + y + 1));	1339	32 + y);
1314	}	1340	}
1315		1341
1316	/{{{ process an X event /	1342	/{{{ process an X event /
1317	void	1343	void
1318	rxvt_term::x_cb (XEvent &ev)	1344	rxvt_term::x_cb (XEvent &ev)
…		…
1420	&& ev.xfocus.mode != NotifyGrab)	1446	&& ev.xfocus.mode != NotifyGrab)
1421	focus_out ();	1447	focus_out ();
1422	break;	1448	break;
1423		1449
1424	case ConfigureNotify:	1450	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])	1451	if (ev.xconfigure.window == parent[0])
1429	{	1452	{
1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1453	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431	;	1454	;
		1455
		1456	#ifdef HAVE_BG_PIXMAP
		1457	bool moved = false;
		1458	if (bgPixmap.window_position_sensitive ())
		1459	{
		1460	int x, y;
		1461	if (ev.xconfigure.send_event)
		1462	{
		1463	x = ev.xconfigure.x;
		1464	y = ev.xconfigure.y;
		1465	}
		1466	else
		1467	get_window_origin (x, y);
		1468
		1469	if (bgPixmap.set_position (x, y)
		1470	\|\| (bgPixmap.flags & bgPixmap_t::isInvalid))
		1471	moved = true;
		1472	}
		1473	#endif
1432		1474
1433	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1475	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1434	{	1476	{
1435	seen_resize = 1;	1477	seen_resize = 1;
1436	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1478	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437	}	1479	}
1438	else	1480	else
1439	{	1481	{
1440	#ifdef HAVE_BG_PIXMAP	1482	#ifdef HAVE_BG_PIXMAP
1441	if (bgPixmap.window_position_sensitive ())	1483	if (moved)
1442	{	1484	{
1443	if (mapped)	1485	if (mapped)
1444	update_background ();	1486	update_background ();
1445	else	1487	else
1446	bgPixmap.invalidate ();	1488	bgPixmap.invalidate ();
…		…
1459	selection_property (ev.xproperty.window, ev.xproperty.atom);	1501	selection_property (ev.xproperty.window, ev.xproperty.atom);
1460		1502
1461	break;	1503	break;
1462		1504
1463	case SelectionClear:	1505	case SelectionClear:
1464	selection_clear ();	1506	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465	break;	1507	break;
1466		1508
1467	case SelectionNotify:	1509	case SelectionNotify:
1468	if (selection_wait == Sel_normal)	1510	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1511	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1473	selection_send (ev.xselectionrequest);	1515	selection_send (ev.xselectionrequest);
1474	break;	1516	break;
1475		1517
1476	case MapNotify:	1518	case MapNotify:
1477	#ifdef HAVE_BG_PIXMAP	1519	#ifdef HAVE_BG_PIXMAP
1478	/* This is needed spcifically to fix the case of no window manager or a	1520	/* 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	1521	* non-reparenting window manager. In those cases we never get first
1480	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1522	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1481	* care of multiplicity of ConfigureNotify events arriwing while WM does	1523	* care of multiplicity of ConfigureNotify events arriving while WM does
1482	* reparenting.	1524	* reparenting.
1483	* We should not render background immidiately, as there could be several	1525	* 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	1526	* 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	1527	* by scheduling background redraw as soon as we can, but giving a short
1486	* bit of time for ConfigureNotifies to arrive.	1528	* bit of time for ConfigureNotifies to arrive.
1487	* We should render background PRIOR to drawing any text, but AFTER all	1529	* We should render background PRIOR to drawing any text, but AFTER all
1488	* of ConfigureNotifys for the best results.	1530	* of ConfigureNotifys for the best results.
…		…
1536	;	1578	;
1537		1579
1538	if (scrollBar.state && ev.xany.window == scrollBar.win)	1580	if (scrollBar.state && ev.xany.window == scrollBar.win)
1539	{	1581	{
1540	scrollBar.state = STATE_IDLE;	1582	scrollBar.state = STATE_IDLE;
1541	scrollbar_show (0);	1583	scrollBar.show (0);
1542	}	1584	}
1543	}	1585	}
1544	break;	1586	break;
1545		1587
1546	case MotionNotify:	1588	case MotionNotify:
…		…
1647	&ev.xbutton.x, &ev.xbutton.y,	1689	&ev.xbutton.x, &ev.xbutton.y,
1648	&unused_mask);	1690	&unused_mask);
1649	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1691	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650	scrollBar.size ());	1692	scrollBar.size ());
1651	want_refresh = 1;	1693	want_refresh = 1;
1652	scrollbar_show (1);	1694	scrollBar.show (1);
1653	}	1695	}
1654	break;	1696	break;
1655	}	1697	}
1656		1698
1657	#if defined(CURSOR_BLINK)	1699	#if defined(CURSOR_BLINK)
…		…
1682	#endif	1724	#endif
1683		1725
1684	refresh_check ();	1726	refresh_check ();
1685	}	1727	}
1686		1728
		1729	#if ENABLE_FRILLS
		1730	void
		1731	rxvt_term::set_urgency (bool enable)
		1732	{
		1733	if (enable == urgency_hint)
		1734	return;
		1735
		1736	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1737	{
		1738	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1739	XSetWMHints (dpy, parent[0], h);
		1740	urgency_hint = enable;
		1741	}
		1742	}
		1743	#endif
		1744
1687	void	1745	void
1688	rxvt_term::focus_in ()	1746	rxvt_term::focus_in ()
1689	{	1747	{
1690	if (!focus)	1748	if (!focus)
1691	{	1749	{
1692	focus = 1;	1750	focus = 1;
1693	want_refresh = 1;	1751	want_refresh = 1;
1694
1695	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696		1752
1697	#if USE_XIM	1753	#if USE_XIM
1698	if (Input_Context != NULL)	1754	if (Input_Context != NULL)
1699	{	1755	{
1700	IMSetPosition ();	1756	IMSetPosition ();
…		…
1712	scr_recolour ();	1768	scr_recolour ();
1713	}	1769	}
1714	#endif	1770	#endif
1715	#if ENABLE_FRILLS	1771	#if ENABLE_FRILLS
1716	if (option (Opt_urgentOnBell))	1772	if (option (Opt_urgentOnBell))
1717	{	1773	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	1774	#endif
		1775
		1776	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725	}	1777	}
1726	}	1778	}
1727		1779
1728	void	1780	void
1729	rxvt_term::focus_out ()	1781	rxvt_term::focus_out ()
…		…
1731	if (focus)	1783	if (focus)
1732	{	1784	{
1733	focus = 0;	1785	focus = 0;
1734	want_refresh = 1;	1786	want_refresh = 1;
1735		1787
1736	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1788	#if ENABLE_FRILLS
1737		1789	if (option (Opt_urgentOnBell))
		1790	set_urgency (0);
		1791	#endif
1738	#if ENABLE_FRILLS \|\| ISO_14755	1792	#if ENABLE_FRILLS \|\| ISO_14755
1739	if (iso14755buf)	1793	if (iso14755buf)
1740	{	1794	{
1741	iso14755buf = 0;	1795	iso14755buf = 0;
1742	# if ISO_14755	1796	# if ISO_14755
…		…
1759	{	1813	{
1760	pix_colors = pix_colors_unfocused;	1814	pix_colors = pix_colors_unfocused;
1761	scr_recolour ();	1815	scr_recolour ();
1762	}	1816	}
1763	#endif	1817	#endif
		1818
		1819	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764	}	1820	}
1765	}	1821	}
1766		1822
1767	void	1823	void
1768	rxvt_term::update_fade_color (unsigned int idx)	1824	rxvt_term::update_fade_color (unsigned int idx)
…		…
1845	/* save the xbutton state (for ButtonRelease) */	1901	/* save the xbutton state (for ButtonRelease) */
1846	MEvent.state = ev.state;	1902	MEvent.state = ev.state;
1847	#ifdef MOUSE_REPORT_DOUBLECLICK	1903	#ifdef MOUSE_REPORT_DOUBLECLICK
1848	if (ev.button == MEvent.button && clickintime)	1904	if (ev.button == MEvent.button && clickintime)
1849	{	1905	{
1850	/* same button, within alloted time */	1906	/* same button, within allowed time */
1851	MEvent.clicks++;	1907	MEvent.clicks++;
1852		1908
1853	if (MEvent.clicks > 1)	1909	if (MEvent.clicks > 1)
1854	{	1910	{
1855	/* only report double clicks */	1911	/* only report double clicks */
…		…
2066	reportmode = !! (priv_modes & PrivMode_mouse_report);	2122	reportmode = !! (priv_modes & PrivMode_mouse_report);
2067		2123
2068	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2124	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2069	{	2125	{
2070	scrollBar.state = STATE_IDLE;	2126	scrollBar.state = STATE_IDLE;
2071	scrollbar_show (0);	2127	scrollBar.show (0);
2072	}	2128	}
2073		2129
2074	#ifdef SELECTION_SCROLLING	2130	#ifdef SELECTION_SCROLLING
2075	sel_scroll_ev.stop();	2131	sel_scroll_ev.stop();
2076	#endif	2132	#endif
…		…
2126	selection_make (ev.time);	2182	selection_make (ev.time);
2127	break;	2183	break;
2128		2184
2129	case Button2:	2185	case Button2:
2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2186	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);	2187	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132	break;	2188	break;
2133		2189
2134	#ifdef MOUSE_WHEEL	2190	#ifdef MOUSE_WHEEL
2135	case Button4:	2191	case Button4:
2136	case Button5:	2192	case Button5:
…		…
2159	}	2215	}
2160	else	2216	else
2161	# endif	2217	# endif
2162	{	2218	{
2163	scr_page (v, i);	2219	scr_page (v, i);
2164	scrollbar_show (1);	2220	scrollBar.show (1);
2165	}	2221	}
2166	}	2222	}
2167	break;	2223	break;
2168	#endif	2224	#endif
2169	}	2225	}
2170	}	2226	}
2171	}	2227	}
2172		2228
2173	/}}} /	2229	/}}} /
2174		2230
2175	bool	2231	void
2176	rxvt_term::cmd_parse ()	2232	rxvt_term::cmd_parse ()
2177	{	2233	{
2178	bool flag = false;
2179	wchar_t ch = NOCHAR;	2234	wchar_t ch = NOCHAR;
2180	char *seq_begin; // remember start of esc-sequence here	2235	char *seq_begin; // remember start of esc-sequence here
2181		2236
2182	for (;;)	2237	for (;;)
2183	{	2238	{
2184	if (ch == NOCHAR)	2239	if (expect_false (ch == NOCHAR))
2185	{	2240	{
2186	seq_begin = cmdbuf_ptr;	2241	seq_begin = cmdbuf_ptr;
2187	ch = next_char ();	2242	ch = next_char ();
2188		2243
2189	if (ch == NOCHAR)	2244	if (ch == NOCHAR)
2190	break;	2245	break;
2191	}	2246	}
2192		2247
2193	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2248	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2194	{	2249	{
2195	if (!seen_input)	2250	if (expect_false (!seen_input))
2196	{	2251	{
2197	seen_input = 1;	2252	seen_input = 1;
2198	// many badly-written programs (e.g. jed) contain a race condition:	2253	// many badly-written programs (e.g. jed) contain a race condition:
2199	// they first read the screensize and then install a SIGWINCH handler.	2254	// they first read the screensize and then install a SIGWINCH handler.
2200	// some window managers resize the window early, and these programs	2255	// some window managers resize the window early, and these programs
…		…
2213	wchar_t *str = buf;	2268	wchar_t *str = buf;
2214	wchar_t *eol = str + min (ncol, UBUFSIZ);	2269	wchar_t *eol = str + min (ncol, UBUFSIZ);
2215		2270
2216	for (;;)	2271	for (;;)
2217	{	2272	{
2218	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2273	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219	break;	2274	break;
2220		2275
2221	*str++ = ch;	2276	*str++ = ch;
2222		2277
2223	if (ch == C0_LF \|\| str >= eol)	2278	if (expect_false (ch == C0_LF \|\| str >= eol))
2224	{	2279	{
2225	if (ch == C0_LF)	2280	if (ch == C0_LF)
2226	nlines++;	2281	nlines++;
2227		2282
2228	refresh_count++;	2283	refresh_count++;
…		…
2277	* What the heck we'll cheat and only refresh less than every page-full.	2332	* What the heck we'll cheat and only refresh less than every page-full.
2278	* if skipScroll is enabled.	2333	* if skipScroll is enabled.
2279	*/	2334	*/
2280	if (refreshnow)	2335	if (refreshnow)
2281	{	2336	{
2282	flag = true;
2283	scr_refresh ();	2337	scr_refresh ();
2284	want_refresh = 1;	2338	want_refresh = 1;
2285	}	2339	}
2286
2287	}	2340	}
2288	else	2341	else
2289	{	2342	{
2290	try	2343	try
2291	{	2344	{
…		…
2299	}	2352	}
2300		2353
2301	ch = NOCHAR;	2354	ch = NOCHAR;
2302	}	2355	}
2303	}	2356	}
2304
2305	return flag;
2306	}	2357	}
2307		2358
2308	// read the next character	2359	// read the next character
2309	wchar_t	2360	wchar_t
2310	rxvt_term::next_char () NOTHROW	2361	rxvt_term::next_char () NOTHROW
2311	{	2362	{
2312	while (cmdbuf_ptr < cmdbuf_endp)	2363	while (cmdbuf_ptr < cmdbuf_endp)
2313	{	2364	{
2314	// assume 7-bit to be ascii ALWAYS	2365	// assume 7-bit to be ascii ALWAYS
2315	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2366	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2316	return *cmdbuf_ptr++;	2367	return *cmdbuf_ptr++;
2317		2368
2318	wchar_t wc;	2369	wchar_t wc;
2319	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2370	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320		2371
…		…
2324	cmdbuf_ptr = cmdbuf_endp;	2375	cmdbuf_ptr = cmdbuf_endp;
2325	break;	2376	break;
2326	}	2377	}
2327		2378
2328	if (len == (size_t)-1)	2379	if (len == (size_t)-1)
		2380	{
		2381	mbstate.reset (); // reset now undefined conversion state
2329	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2382	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2383	}
2330		2384
2331	// assume wchar == unicode	2385	// assume wchar == unicode
2332	cmdbuf_ptr += len;	2386	cmdbuf_ptr += len;
2333	return wc & UNICODE_MASK;	2387	return wc & UNICODE_MASK;
2334	}	2388	}
…		…
2378	/----------------------------------------------------------------------/	2432	/----------------------------------------------------------------------/
2379	#ifdef PRINTPIPE	2433	#ifdef PRINTPIPE
2380	FILE *	2434	FILE *
2381	rxvt_term::popen_printer ()	2435	rxvt_term::popen_printer ()
2382	{	2436	{
2383	FILE *stream = popen (rs[Rs_print_pipe], "w");	2437	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384		2438
2385	if (stream == NULL)	2439	if (stream == NULL)
2386	rxvt_warn ("can't open printer pipe, not printing.\n");	2440	rxvt_warn ("can't open printer pipe, not printing.\n");
2387		2441
2388	return stream;	2442	return stream;
…		…
2399	* simulate attached vt100 printer	2453	* simulate attached vt100 printer
2400	*/	2454	*/
2401	void	2455	void
2402	rxvt_term::process_print_pipe ()	2456	rxvt_term::process_print_pipe ()
2403	{	2457	{
2404	int done;	2458	FILE *fd = popen_printer ();
2405	FILE *fd;
2406		2459
2407	if ((fd = popen_printer ()) == NULL)	2460	if (!fd)
2408	return;	2461	return;
2409		2462
2410	/*	2463	/*
2411	* Send all input to the printer until either ESC[4i or ESC[?4i	2464	* Send all input to the printer until either ESC[4i or ESC[?4i
2412	* is received.	2465	* is received.
2413	*/	2466	*/
2414	for (done = 0; !done;)	2467	for (int done = 0; !done; )
2415	{	2468	{
2416	unsigned char buf[8];	2469	unsigned char buf[8];
2417	unicode_t ch;	2470	unicode_t ch;
2418	unsigned int i, len;	2471	unsigned int i, len;
2419		2472
…		…
2677	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2730	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678	case C1_SCI: /* ESC Z */	2731	case C1_SCI: /* ESC Z */
2679	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2732	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680	break; /* steal obsolete ESC [ c */	2733	break; /* steal obsolete ESC [ c */
2681		2734
2682	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2735	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683	case C1_CSI: /* ESC [ */	2736	case C1_CSI: /* ESC [ */
2684	process_csi_seq ();	2737	process_csi_seq ();
2685	break;	2738	break;
2686		2739
2687	/* 8.3.90: OPERATING SYSTEM COMMAND */	2740	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688	case C1_OSC: /* ESC ] */	2741	case C1_OSC: /* ESC ] */
2689	process_osc_seq ();	2742	process_osc_seq ();
2690	break;	2743	break;
2691		2744
2692	/* 8.3.106: RESET TO INITIAL STATE */	2745	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693	case 'c':	2746	case 'c':
2694	mbstate.reset ();	2747	mbstate.reset ();
2695	scr_poweron ();	2748	scr_poweron ();
2696	scrollbar_show (1);	2749	scrollBar.show (1);
2697	break;	2750	break;
2698		2751
2699	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2752	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700	case 'n':	2753	case 'n':
2701	scr_charset_choose (2);	2754	scr_charset_choose (2);
…		…
2752		2805
2753	nargs = 0;	2806	nargs = 0;
2754		2807
2755	priv = 0;	2808	priv = 0;
2756	ch = cmd_getc ();	2809	ch = cmd_getc ();
2757	if (ch >= '<' && ch <= '?')	2810	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2758	{	2811	{
2759	/* '<' '=' '>' '?' */	2812	/* '<' '=' '>' '?' '!' */
2760	priv = ch;	2813	priv = ch;
2761	ch = cmd_getc ();	2814	ch = cmd_getc ();
2762	}	2815	}
2763		2816
2764	/* read any numerical arguments */	2817	/* read any numerical arguments */
…		…
2818		2871
2819	case '?':	2872	case '?':
2820	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2873	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2821	process_terminal_mode (ch, priv, nargs, arg);	2874	process_terminal_mode (ch, priv, nargs, arg);
2822	break;	2875	break;
		2876
		2877	case '!':
		2878	if (ch == CSI_70)
		2879	{
		2880	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2881	scr_soft_reset ();
		2882
		2883	static const int pm_h[] = { 7, 25 };
		2884	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
		2885
		2886	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2887	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2823	}	2888	}
		2889	break;
		2890	}
		2891
2824	return;	2892	return;
2825	}	2893	}
2826		2894
2827	switch (ch)	2895	switch (ch)
2828	{	2896	{
…		…
3195	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3263	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3196	*/	3264	*/
3197	void	3265	void
3198	rxvt_term::process_dcs_seq ()	3266	rxvt_term::process_dcs_seq ()
3199	{	3267	{
3200	char *s;
3201	unicode_t eh;
3202
3203	/*	3268	/*
3204	* Not handled yet	3269	* Not handled yet
3205	*/	3270	*/
		3271
		3272	unicode_t eh;
3206	s = get_to_st (eh);	3273	char *s = get_to_st (eh);
3207	if (s)	3274	if (s)
3208	free (s);	3275	free (s);
3209		3276
3210	return;	3277	return;
3211	}	3278	}
…		…
3215	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3282	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3216	*/	3283	*/
3217	void	3284	void
3218	rxvt_term::process_osc_seq ()	3285	rxvt_term::process_osc_seq ()
3219	{	3286	{
3220	unicode_t ch, eh;
3221	int arg;	3287	int arg;
3222		3288
3223	ch = cmd_getc ();	3289	unicode_t ch = cmd_getc ();
3224	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3290	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225	arg = arg * 10 + (ch - '0');	3291	arg = arg * 10 + (ch - '0');
3226		3292
3227	if (ch == ';')	3293	if (ch == ';')
3228	{	3294	{
		3295	unicode_t eh;
3229	char *s = get_to_st (eh);	3296	char *s = get_to_st (eh);
3230		3297
3231	if (s)	3298	if (s)
3232	{	3299	{
3233	process_xterm_seq (arg, s, eh);	3300	process_xterm_seq (arg, s, eh);
…		…
3257		3324
3258	/*	3325	/*
3259	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3326	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3260	*/	3327	*/
3261	void	3328	void
3262	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3329	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263	{	3330	{
3264	int color;	3331	int color;
3265	char buf, name;	3332	char buf, name;
3266	bool query = str[0] == '?' && !str[1];	3333	bool query = str[0] == '?' && !str[1];
3267	int saveop = op;	3334	int saveop = op;
…		…
3308		3375
3309	XFree (value);	3376	XFree (value);
3310	}	3377	}
3311	else	3378	else
3312	{	3379	{
3313	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3380	char *eq = strchr (str, '=');
3314		3381
3315	if (eq)	3382	if (eq)
3316	{	3383	{
3317	*eq = 0;	3384	*eq = 0;
3318	set_utf8_property (display->atom (str), eq + 1);	3385	set_utf8_property (display->atom (str), eq + 1);
…		…
3358	process_color_seq (op, Color_pointer_fg, str, resp);	3425	process_color_seq (op, Color_pointer_fg, str, resp);
3359	break;	3426	break;
3360	case XTerm_Color_pointer_bg:	3427	case XTerm_Color_pointer_bg:
3361	process_color_seq (op, Color_pointer_bg, str, resp);	3428	process_color_seq (op, Color_pointer_bg, str, resp);
3362	break;	3429	break;
		3430	#ifdef OPTION_HC
		3431	case XTerm_Color_HC:
		3432	process_color_seq (op, Color_HC, str, resp);
		3433	break;
		3434	case XTerm_Color_HTC:
		3435	process_color_seq (op, Color_HTC, str, resp);
		3436	break;
		3437	#endif
3363	#ifndef NO_BOLD_UNDERLINE_REVERSE	3438	#ifndef NO_BOLD_UNDERLINE_REVERSE
3364	case XTerm_Color_RV:
3365	process_color_seq (op, Color_RV, str, resp);
3366	break;
3367	case Rxvt_Color_BD:
3368	case URxvt_Color_BD:	3439	case URxvt_Color_BD:
3369	process_color_seq (op, Color_BD, str, resp);	3440	process_color_seq (op, Color_BD, str, resp);
3370	break;	3441	break;
3371	case Rxvt_Color_UL:
3372	case URxvt_Color_UL:	3442	case URxvt_Color_UL:
3373	process_color_seq (op, Color_UL, str, resp);	3443	process_color_seq (op, Color_UL, str, resp);
3374	break;	3444	break;
3375	case URxvt_Color_IT:	3445	case URxvt_Color_IT:
3376	process_color_seq (op, Color_IT, str, resp);	3446	process_color_seq (op, Color_IT, str, resp);
3377	break;	3447	break;
3378	#endif	3448	#endif
		3449	case URxvt_Color_border:
		3450	process_color_seq (op, Color_border, str, resp);
		3451	break;
3379	#if ENABLE_TRANSPARENCY	3452	#if ENABLE_TRANSPARENCY
3380	case URxvt_Color_tint:	3453	case URxvt_Color_tint:
3381	process_color_seq (op, Color_tint, str, resp);	3454	process_color_seq (op, Color_tint, str, resp);
3382	{	3455	{
3383	bool changed = false;	3456	bool changed = false;
…		…
3398	case Rxvt_Pixmap:	3471	case Rxvt_Pixmap:
3399	if (!strcmp (str, "?"))	3472	if (!strcmp (str, "?"))
3400	{	3473	{
3401	char str[256];	3474	char str[256];
3402		3475
3403	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3476	sprintf (str, "[%dx%d+%d+%d]",
3404	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3477	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3405	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3478	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406	process_xterm_seq (XTerm_title, str, CHAR_ST);	3479	process_xterm_seq (XTerm_title, str, CHAR_ST);
3407	}	3480	}
3408	else	3481	else
3409	{	3482	{
3410	int changed = 0;	3483	int changed = 0;
3411		3484
3412	if (*str != ';')	3485	if (*str != ';')
3413	{	3486	{
3414	/* reset to default scaling :*/
3415	bgPixmap.unset_geometry ();
3416	if (bgPixmap.set_file (str)) /* change pixmap */	3487	if (bgPixmap.set_file (str)) /* change pixmap */
		3488	{
3417	changed++;	3489	changed++;
3418	str = strchr (str, ';');	3490	str = strchr (str, ';');
3419	if (str == NULL)	3491	if (str == NULL)
3420	bgPixmap.set_defaultGeometry ();	3492	bgPixmap.set_defaultGeometry ();
		3493	else
		3494	bgPixmap.set_geometry (str+1);
		3495	}
3421	}	3496	}
3422		3497	else
3423	while (str)
3424	{	3498	{
3425	str++;	3499	str++;
3426	if (bgPixmap.set_geometry (str))	3500	if (bgPixmap.set_geometry (str, true))
3427	changed++;	3501	changed++;
3428	str = strchr (str, ';');
3429	}	3502	}
3430		3503
3431	if (changed)	3504	if (changed)
		3505	{
		3506	if (bgPixmap.window_position_sensitive ())
		3507	{
		3508	int x, y;
		3509	get_window_origin (x, y);
		3510	bgPixmap.set_position (x, y);
		3511	}
3432	update_background ();	3512	update_background ();
		3513	}
3433	}	3514	}
3434	break;	3515	break;
3435	#endif	3516	#endif
3436		3517
3437	case XTerm_logfile:	3518	case XTerm_logfile:
…		…
3507	break;	3588	break;
3508	#endif	3589	#endif
3509		3590
3510	#if ENABLE_PERL	3591	#if ENABLE_PERL
3511	case URxvt_perl:	3592	case URxvt_perl:
3512	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3593	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513	; // no responses yet
3514	break;	3594	break;
3515	#endif	3595	#endif
3516	}	3596	}
3517	}	3597	}
3518	/----------------------------------------------------------------------/	3598	/----------------------------------------------------------------------/
…		…
3541	{	3621	{
3542	if (mode == 'r')	3622	if (mode == 'r')
3543	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3623	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544	else	3624	else
3545	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3625	state = (mode == 't') ? ! (priv_modes & bit) : mode;
		3626
3546	set_privmode (bit, state);	3627	set_privmode (bit, state);
3547	}	3628	}
3548		3629
3549	return state;	3630	return state;
3550	}	3631	}
…		…
3559	static const struct	3640	static const struct
3560	{	3641	{
3561	const int argval;	3642	const int argval;
3562	const unsigned long bit;	3643	const unsigned long bit;
3563	} argtopriv[] = {	3644	} argtopriv[] = {
3564	{ 1, PrivMode_aplCUR },	3645	{ 1, PrivMode_aplCUR }, // DECCKM
3565	{ 2, PrivMode_vt52 },	3646	{ 2, PrivMode_vt52 },
3566	{ 3, PrivMode_132 },	3647	{ 3, PrivMode_132 }, // DECCOLM
3567	{ 4, PrivMode_smoothScroll },	3648	{ 4, PrivMode_smoothScroll }, // DECSCLM
3568	{ 5, PrivMode_rVideo },	3649	{ 5, PrivMode_rVideo }, // DECSCNM
3569	{ 6, PrivMode_relOrigin },	3650	{ 6, PrivMode_relOrigin }, // DECOM
3570	{ 7, PrivMode_Autowrap },	3651	{ 7, PrivMode_Autowrap }, // DECAWM
3571	// 8, bi-directional support mode	3652	// 8, auto-repeat keys // DECARM
3572	{ 9, PrivMode_MouseX10 },	3653	{ 9, PrivMode_MouseX10 },
3573	// 18, 19 printing-related	3654	// 18 end FF to printer after print screen
		3655	// 19 Print screen prints full screen/scroll region
3574	{ 25, PrivMode_VisibleCursor },	3656	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575	#ifdef scrollBar_esc	3657	#ifdef scrollBar_esc
3576	{ scrollBar_esc, PrivMode_scrollBar },	3658	{ scrollBar_esc, PrivMode_scrollBar },
3577	#endif	3659	#endif
3578	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3660	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3661	// 38, tektronix mode // DECTEK
3579	{ 40, PrivMode_132OK },	3662	{ 40, PrivMode_132OK },
3580	// 41 xterm more fixes NYI	3663	// 41 xterm more fixes NYI
3581	// 45 margin bell NYI	3664	// 45 margin bell NYI
3582	// 46 start logging	3665	// 46 start logging
3583	{ 47, PrivMode_Screen },	3666	{ 47, PrivMode_Screen },
3584	{ 66, PrivMode_aplKP },	3667	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585	#ifndef NO_BACKSPACE_KEY	3668	#ifndef NO_BACKSPACE_KEY
3586	{ 67, PrivMode_BackSpace },	3669	{ 67, PrivMode_BackSpace }, // DECBKM
3587	#endif	3670	#endif
3588	{ 1000, PrivMode_MouseX11 },	3671	{ 1000, PrivMode_MouseX11 },
3589	{ 1002, PrivMode_MouseBtnEvent },	3672	{ 1002, PrivMode_MouseBtnEvent },
3590	{ 1003, PrivMode_MouseAnyEvent },	3673	{ 1003, PrivMode_MouseAnyEvent },
		3674	#if ENABLE_FRILLS
		3675	{ 1005, PrivMode_ExtModeMouse },
		3676	#endif
3591	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3677	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592	{ 1011, PrivMode_Keypress }, // rxvt extension	3678	{ 1011, PrivMode_Keypress }, // rxvt extension
		3679	#if ENABLE_FRILLS
		3680	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3681	#endif
3593	// 1035 enable modifiers for alt, numlock NYI	3682	// 1035 enable modifiers for alt, numlock NYI
3594	// 1036 send ESC for meta keys NYI	3683	// 1036 send ESC for meta keys NYI
3595	// 1037 send DEL for keypad delete NYI	3684	// 1037 send DEL for keypad delete NYI
3596	{ 1047, PrivMode_Screen },	3685	{ 1047, PrivMode_Screen },
3597	// 1048 save and restore cursor	3686	// 1048 save and restore cursor, implemented in code
3598	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3687	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3688	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3600	{ 2004, PrivMode_BracketPaste },	3689	{ 2004, PrivMode_BracketPaste },
3601	};	3690	};
3602		3691
…		…
3630		3719
3631	scr_touch (true);	3720	scr_touch (true);
3632	break;	3721	break;
3633	#endif	3722	#endif
3634	case 1048: /* alternative cursor save */	3723	case 1048: /* alternative cursor save */
3635	case 1049:
3636	if (option (Opt_secondaryScreen))	3724	if (option (Opt_secondaryScreen))
3637	if (mode == 0)	3725	if (mode == 0)
3638	scr_cursor (RESTORE);	3726	scr_cursor (RESTORE);
3639	else if (mode == 1)	3727	else if (mode == 1)
3640	scr_cursor (SAVE);	3728	scr_cursor (SAVE);
…		…
3653	*/	3741	*/
3654	set_privmode (PrivMode_vt52, 1);	3742	set_privmode (PrivMode_vt52, 1);
3655	break;	3743	break;
3656	case 3: /* 80/132 */	3744	case 3: /* 80/132 */
3657	if (priv_modes & PrivMode_132OK)	3745	if (priv_modes & PrivMode_132OK)
3658	{
3659	scr_poweron ();
3660	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3746	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661	}
3662	break;	3747	break;
3663	case 4: /* smooth scrolling */	3748	case 4: /* smooth scrolling */
3664	set_option (Opt_jumpScroll, !state);	3749	set_option (Opt_jumpScroll, !state);
3665	break;	3750	break;
3666	case 5: /* reverse video */	3751	case 5: /* reverse video */
…		…
3677	if (state) /* orthogonal */	3762	if (state) /* orthogonal */
3678	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3763	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3679	break;	3764	break;
3680	#ifdef scrollBar_esc	3765	#ifdef scrollBar_esc
3681	case scrollBar_esc:	3766	case scrollBar_esc:
3682	if (scrollbar_mapping (state))	3767	if (scrollBar.map (state))
3683	{	3768	{
3684	resize_all_windows (0, 0, 0);	3769	resize_all_windows (0, 0, 0);
3685	scr_touch (true);	3770	scr_touch (true);
3686	}	3771	}
3687	break;	3772	break;
…		…
3704	case 1003:	3789	case 1003:
3705	if (state)	3790	if (state)
3706	{	3791	{
3707	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3792	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3708	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3793	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3794	mouse_row = mouse_col = 0;
3709	vt_emask_mouse = PointerMotionMask;	3795	vt_emask_mouse = PointerMotionMask;
3710	}	3796	}
3711	else	3797	else
3712	vt_emask_mouse = NoEventMask;	3798	vt_emask_mouse = NoEventMask;
		3799
3713	vt_select_input ();	3800	vt_select_input ();
3714	break;	3801	break;
3715	case 1010: /* scroll to bottom on TTY output inhibit */	3802	case 1010: /* scroll to bottom on TTY output inhibit */
3716	set_option (Opt_scrollTtyOutput, !state);	3803	set_option (Opt_scrollTtyOutput, !state);
3717	break;	3804	break;
3718	case 1011: /* scroll to bottom on key press */	3805	case 1011: /* scroll to bottom on key press */
3719	set_option (Opt_scrollTtyKeypress, state);	3806	set_option (Opt_scrollTtyKeypress, state);
3720	break;	3807	break;
3721	case 1047: /* secondary screen w/ clearing last */	3808	case 1047: /* secondary screen w/ clearing last */
3722	if (option (Opt_secondaryScreen))	3809	if (option (Opt_secondaryScreen))
3723	if (current_screen != PRIMARY)	3810	if (!state)
3724	scr_erase_screen (2);	3811	scr_erase_screen (2);
		3812
3725	scr_change_screen (state);	3813	scr_change_screen (state);
3726	break;	3814	break;
3727	case 1049: /* secondary screen w/ clearing first */	3815	case 1049: /* secondary screen w/ clearing first */
		3816	if (option (Opt_secondaryScreen))
		3817	if (state)
		3818	scr_cursor (SAVE);
		3819
3728	scr_change_screen (state);	3820	scr_change_screen (state);
		3821
3729	if (option (Opt_secondaryScreen))	3822	if (option (Opt_secondaryScreen))
3730	if (current_screen != PRIMARY)	3823	if (state)
3731	scr_erase_screen (2);	3824	scr_erase_screen (2);
		3825	else
		3826	scr_cursor (RESTORE);
3732	break;	3827	break;
3733	default:	3828	default:
3734	break;	3829	break;
3735	}	3830	}
3736	}	3831	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.413 by ayin, Sun Feb 17 12:11:56 2008 UTC vs. Revision 1.462 by root, Wed Nov 24 04:07:39 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.413 by ayin, Sun Feb 17 12:11:56 2008 UTC vs.
Revision 1.462 by root, Wed Nov 24 04:07:39 2010 UTC