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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.421 by root, Wed Oct 15 17:16:47 2008 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 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
…		…
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
…		…
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.
1132	// since the linux guys additionally thought that breaking the only	1141	// since the linux guys additionally thought that breaking the only
1133	// known workaroudn against their unusable sched_yield hack is cool,	1142	// known workaround against their unusable sched_yield hack is cool,
1134	// we just nanosleep a bit and hope for the best.	1143	// we just nanosleep a bit and hope for the best.
1135		1144
1136	struct timespec ts = { 0, 1000 };	1145	struct timespec ts = { 0, 1000 };
1137	nanosleep (&ts, 0);	1146	nanosleep (&ts, 0);
1138		1147
…		…
1191	{	1200	{
1192	make_current ();	1201	make_current ();
1193		1202
1194	if (revents & ev::READ)	1203	if (revents & ev::READ)
1195	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1196	while (pty_fill ())	1205	for (int i = CBUFCNT; i-- && pty_fill (); )
1197	if (cmd_parse ())	1206	cmd_parse ();
1198	break;
1199		1207
1200	if (revents & ev::WRITE)	1208	if (revents & ev::WRITE)
1201	pty_write ();	1209	pty_write ();
1202		1210
1203	refresh_check ();	1211	refresh_check ();
…		…
1423	&& ev.xfocus.mode != NotifyGrab)	1431	&& ev.xfocus.mode != NotifyGrab)
1424	focus_out ();	1432	focus_out ();
1425	break;	1433	break;
1426		1434
1427	case ConfigureNotify:	1435	case ConfigureNotify:
1428	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430	szHint.width, szHint.height);*/
1431	if (ev.xconfigure.window == parent[0])	1436	if (ev.xconfigure.window == parent[0])
1432	{	1437	{
1433	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1438	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1434	;	1439	;
1435		1440
…		…
1462	selection_property (ev.xproperty.window, ev.xproperty.atom);	1467	selection_property (ev.xproperty.window, ev.xproperty.atom);
1463		1468
1464	break;	1469	break;
1465		1470
1466	case SelectionClear:	1471	case SelectionClear:
1467	selection_clear ();	1472	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1468	break;	1473	break;
1469		1474
1470	case SelectionNotify:	1475	case SelectionNotify:
1471	if (selection_wait == Sel_normal)	1476	if (selection_wait == Sel_normal)
1472	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1477	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1476	selection_send (ev.xselectionrequest);	1481	selection_send (ev.xselectionrequest);
1477	break;	1482	break;
1478		1483
1479	case MapNotify:	1484	case MapNotify:
1480	#ifdef HAVE_BG_PIXMAP	1485	#ifdef HAVE_BG_PIXMAP
1481	/* This is needed spcifically to fix the case of no window manager or a	1486	/* This is needed specifically to fix the case of no window manager or a
1482	* non-reparenting window manager. In those cases we never get first	1487	* non-reparenting window manager. In those cases we never get first
1483	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1488	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1484	* care of multiplicity of ConfigureNotify events arriwing while WM does	1489	* care of multiplicity of ConfigureNotify events arriving while WM does
1485	* reparenting.	1490	* reparenting.
1486	* We should not render background immidiately, as there could be several	1491	* We should not render background immediately, as there could be several
1487	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1492	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488	* by scheduling background redraw as soon as we can, but giving a short	1493	* by scheduling background redraw as soon as we can, but giving a short
1489	* bit of time for ConfigureNotifies to arrive.	1494	* bit of time for ConfigureNotifies to arrive.
1490	* We should render background PRIOR to drawing any text, but AFTER all	1495	* We should render background PRIOR to drawing any text, but AFTER all
1491	* of ConfigureNotifys for the best results.	1496	* of ConfigureNotifys for the best results.
…		…
1685	#endif	1690	#endif
1686		1691
1687	refresh_check ();	1692	refresh_check ();
1688	}	1693	}
1689		1694
		1695	#if ENABLE_FRILLS
1690	void	1696	void
1691	rxvt_term::set_urgency (bool enable)	1697	rxvt_term::set_urgency (bool enable)
1692	{	1698	{
1693	if (enable == urgency_hint)	1699	if (enable == urgency_hint)
1694	return;	1700	return;
…		…
1698	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1704	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1699	XSetWMHints (dpy, parent[0], h);	1705	XSetWMHints (dpy, parent[0], h);
1700	urgency_hint = enable;	1706	urgency_hint = enable;
1701	}	1707	}
1702	}	1708	}
		1709	#endif
1703		1710
1704	void	1711	void
1705	rxvt_term::focus_in ()	1712	rxvt_term::focus_in ()
1706	{	1713	{
1707	if (!focus)	1714	if (!focus)
…		…
1860	/* save the xbutton state (for ButtonRelease) */	1867	/* save the xbutton state (for ButtonRelease) */
1861	MEvent.state = ev.state;	1868	MEvent.state = ev.state;
1862	#ifdef MOUSE_REPORT_DOUBLECLICK	1869	#ifdef MOUSE_REPORT_DOUBLECLICK
1863	if (ev.button == MEvent.button && clickintime)	1870	if (ev.button == MEvent.button && clickintime)
1864	{	1871	{
1865	/* same button, within alloted time */	1872	/* same button, within allowed time */
1866	MEvent.clicks++;	1873	MEvent.clicks++;
1867		1874
1868	if (MEvent.clicks > 1)	1875	if (MEvent.clicks > 1)
1869	{	1876	{
1870	/* only report double clicks */	1877	/* only report double clicks */
…		…
2141	selection_make (ev.time);	2148	selection_make (ev.time);
2142	break;	2149	break;
2143		2150
2144	case Button2:	2151	case Button2:
2145	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2152	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2146	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2153	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2147	break;	2154	break;
2148		2155
2149	#ifdef MOUSE_WHEEL	2156	#ifdef MOUSE_WHEEL
2150	case Button4:	2157	case Button4:
2151	case Button5:	2158	case Button5:
…		…
2185	}	2192	}
2186	}	2193	}
2187		2194
2188	/}}} /	2195	/}}} /
2189		2196
2190	bool	2197	void
2191	rxvt_term::cmd_parse ()	2198	rxvt_term::cmd_parse ()
2192	{	2199	{
2193	bool flag = false;
2194	wchar_t ch = NOCHAR;	2200	wchar_t ch = NOCHAR;
2195	char *seq_begin; // remember start of esc-sequence here	2201	char *seq_begin; // remember start of esc-sequence here
2196		2202
2197	for (;;)	2203	for (;;)
2198	{	2204	{
…		…
2292	* What the heck we'll cheat and only refresh less than every page-full.	2298	* What the heck we'll cheat and only refresh less than every page-full.
2293	* if skipScroll is enabled.	2299	* if skipScroll is enabled.
2294	*/	2300	*/
2295	if (refreshnow)	2301	if (refreshnow)
2296	{	2302	{
2297	flag = true;
2298	scr_refresh ();	2303	scr_refresh ();
2299	want_refresh = 1;	2304	want_refresh = 1;
2300	}	2305	}
2301
2302	}	2306	}
2303	else	2307	else
2304	{	2308	{
2305	try	2309	try
2306	{	2310	{
…		…
2314	}	2318	}
2315		2319
2316	ch = NOCHAR;	2320	ch = NOCHAR;
2317	}	2321	}
2318	}	2322	}
2319
2320	return flag;
2321	}	2323	}
2322		2324
2323	// read the next character	2325	// read the next character
2324	wchar_t	2326	wchar_t
2325	rxvt_term::next_char () NOTHROW	2327	rxvt_term::next_char () NOTHROW
…		…
2340	break;	2342	break;
2341	}	2343	}
2342		2344
2343	if (len == (size_t)-1)	2345	if (len == (size_t)-1)
2344	{	2346	{
2345	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2347	mbstate.reset (); // reset now undefined conversion state
2346	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2348	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2347	}	2349	}
2348		2350
2349	// assume wchar == unicode	2351	// assume wchar == unicode
2350	cmdbuf_ptr += len;	2352	cmdbuf_ptr += len;
…		…
2694	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2696	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2695	case C1_SCI: /* ESC Z */	2697	case C1_SCI: /* ESC Z */
2696	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2698	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2697	break; /* steal obsolete ESC [ c */	2699	break; /* steal obsolete ESC [ c */
2698		2700
2699	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2701	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2700	case C1_CSI: /* ESC [ */	2702	case C1_CSI: /* ESC [ */
2701	process_csi_seq ();	2703	process_csi_seq ();
2702	break;	2704	break;
2703		2705
2704	/* 8.3.90: OPERATING SYSTEM COMMAND */	2706	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2705	case C1_OSC: /* ESC ] */	2707	case C1_OSC: /* ESC ] */
2706	process_osc_seq ();	2708	process_osc_seq ();
2707	break;	2709	break;
2708		2710
2709	/* 8.3.106: RESET TO INITIAL STATE */	2711	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2710	case 'c':	2712	case 'c':
2711	mbstate.reset ();	2713	mbstate.reset ();
2712	scr_poweron ();	2714	scr_poweron ();
2713	scrollBar.show (1);	2715	scrollBar.show (1);
2714	break;	2716	break;
…		…
2769		2771
2770	nargs = 0;	2772	nargs = 0;
2771		2773
2772	priv = 0;	2774	priv = 0;
2773	ch = cmd_getc ();	2775	ch = cmd_getc ();
2774	if (ch >= '<' && ch <= '?')	2776	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2775	{	2777	{
2776	/* '<' '=' '>' '?' */	2778	/* '<' '=' '>' '?' '!' */
2777	priv = ch;	2779	priv = ch;
2778	ch = cmd_getc ();	2780	ch = cmd_getc ();
2779	}	2781	}
2780		2782
2781	/* read any numerical arguments */	2783	/* read any numerical arguments */
…		…
2835		2837
2836	case '?':	2838	case '?':
2837	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2839	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2838	process_terminal_mode (ch, priv, nargs, arg);	2840	process_terminal_mode (ch, priv, nargs, arg);
2839	break;	2841	break;
		2842
		2843	case '!':
		2844	if (ch == CSI_70)
		2845	{
		2846	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2847	scr_soft_reset ();
		2848
		2849	static const int pm_h[] = { 7, 25 };
		2850	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2851
		2852	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2853	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2840	}	2854	}
		2855	break;
		2856	}
		2857
2841	return;	2858	return;
2842	}	2859	}
2843		2860
2844	switch (ch)	2861	switch (ch)
2845	{	2862	{
…		…
3212	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3229	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3213	*/	3230	*/
3214	void	3231	void
3215	rxvt_term::process_dcs_seq ()	3232	rxvt_term::process_dcs_seq ()
3216	{	3233	{
3217	char *s;
3218	unicode_t eh;
3219
3220	/*	3234	/*
3221	* Not handled yet	3235	* Not handled yet
3222	*/	3236	*/
		3237
		3238	unicode_t eh;
3223	s = get_to_st (eh);	3239	char *s = get_to_st (eh);
3224	if (s)	3240	if (s)
3225	free (s);	3241	free (s);
3226		3242
3227	return;	3243	return;
3228	}	3244	}
…		…
3232	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3248	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3233	*/	3249	*/
3234	void	3250	void
3235	rxvt_term::process_osc_seq ()	3251	rxvt_term::process_osc_seq ()
3236	{	3252	{
3237	unicode_t ch, eh;
3238	int arg;	3253	int arg;
3239		3254
3240	ch = cmd_getc ();	3255	unicode_t ch = cmd_getc ();
3241	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3256	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3242	arg = arg * 10 + (ch - '0');	3257	arg = arg * 10 + (ch - '0');
3243		3258
3244	if (ch == ';')	3259	if (ch == ';')
3245	{	3260	{
		3261	unicode_t eh;
3246	char *s = get_to_st (eh);	3262	char *s = get_to_st (eh);
3247		3263
3248	if (s)	3264	if (s)
3249	{	3265	{
3250	process_xterm_seq (arg, s, eh);	3266	process_xterm_seq (arg, s, eh);
…		…
3274		3290
3275	/*	3291	/*
3276	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3292	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3277	*/	3293	*/
3278	void	3294	void
3279	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3295	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3280	{	3296	{
3281	int color;	3297	int color;
3282	char buf, name;	3298	char buf, name;
3283	bool query = str[0] == '?' && !str[1];	3299	bool query = str[0] == '?' && !str[1];
3284	int saveop = op;	3300	int saveop = op;
…		…
3325		3341
3326	XFree (value);	3342	XFree (value);
3327	}	3343	}
3328	else	3344	else
3329	{	3345	{
3330	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3346	char *eq = strchr (str, '=');
3331		3347
3332	if (eq)	3348	if (eq)
3333	{	3349	{
3334	*eq = 0;	3350	*eq = 0;
3335	set_utf8_property (display->atom (str), eq + 1);	3351	set_utf8_property (display->atom (str), eq + 1);
…		…
3375	process_color_seq (op, Color_pointer_fg, str, resp);	3391	process_color_seq (op, Color_pointer_fg, str, resp);
3376	break;	3392	break;
3377	case XTerm_Color_pointer_bg:	3393	case XTerm_Color_pointer_bg:
3378	process_color_seq (op, Color_pointer_bg, str, resp);	3394	process_color_seq (op, Color_pointer_bg, str, resp);
3379	break;	3395	break;
		3396	#ifdef OPTION_HC
		3397	case XTerm_Color_HC:
		3398	process_color_seq (op, Color_HC, str, resp);
		3399	break;
		3400	case XTerm_Color_HTC:
		3401	process_color_seq (op, Color_HTC, str, resp);
		3402	break;
		3403	#endif
3380	#ifndef NO_BOLD_UNDERLINE_REVERSE	3404	#ifndef NO_BOLD_UNDERLINE_REVERSE
3381	case XTerm_Color_RV:
3382	process_color_seq (op, Color_RV, str, resp);
3383	break;
3384	case Rxvt_Color_BD:
3385	case URxvt_Color_BD:	3405	case URxvt_Color_BD:
3386	process_color_seq (op, Color_BD, str, resp);	3406	process_color_seq (op, Color_BD, str, resp);
3387	break;	3407	break;
3388	case Rxvt_Color_UL:
3389	case URxvt_Color_UL:	3408	case URxvt_Color_UL:
3390	process_color_seq (op, Color_UL, str, resp);	3409	process_color_seq (op, Color_UL, str, resp);
3391	break;	3410	break;
3392	case URxvt_Color_IT:	3411	case URxvt_Color_IT:
3393	process_color_seq (op, Color_IT, str, resp);	3412	process_color_seq (op, Color_IT, str, resp);
3394	break;	3413	break;
3395	#endif	3414	#endif
		3415	case URxvt_Color_border:
		3416	process_color_seq (op, Color_border, str, resp);
		3417	break;
3396	#if ENABLE_TRANSPARENCY	3418	#if ENABLE_TRANSPARENCY
3397	case URxvt_Color_tint:	3419	case URxvt_Color_tint:
3398	process_color_seq (op, Color_tint, str, resp);	3420	process_color_seq (op, Color_tint, str, resp);
3399	{	3421	{
3400	bool changed = false;	3422	bool changed = false;
…		…
3415	case Rxvt_Pixmap:	3437	case Rxvt_Pixmap:
3416	if (!strcmp (str, "?"))	3438	if (!strcmp (str, "?"))
3417	{	3439	{
3418	char str[256];	3440	char str[256];
3419		3441
3420	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3442	sprintf (str, "[%dx%d+%d+%d]",
3421	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3443	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3422	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3444	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3423	process_xterm_seq (XTerm_title, str, CHAR_ST);	3445	process_xterm_seq (XTerm_title, str, CHAR_ST);
3424	}	3446	}
3425	else	3447	else
3426	{	3448	{
3427	int changed = 0;	3449	int changed = 0;
3428		3450
3429	if (*str != ';')	3451	if (*str != ';')
3430	{	3452	{
3431	/* reset to default scaling :*/
3432	bgPixmap.unset_geometry ();
3433	if (bgPixmap.set_file (str)) /* change pixmap */	3453	if (bgPixmap.set_file (str)) /* change pixmap */
3434	changed++;	3454	changed++;
3435	str = strchr (str, ';');	3455	str = strchr (str, ';');
3436	if (str == NULL)	3456	if (str == NULL)
3437	bgPixmap.set_defaultGeometry ();	3457	bgPixmap.set_defaultGeometry ();
		3458	else
		3459	bgPixmap.set_geometry (str+1);
3438	}	3460	}
3439		3461	else
3440	while (str)
3441	{	3462	{
3442	str++;	3463	str++;
3443	if (bgPixmap.set_geometry (str))	3464	if (bgPixmap.set_geometry (str, true))
3444	changed++;	3465	changed++;
3445	str = strchr (str, ';');
3446	}	3466	}
3447		3467
3448	if (changed)	3468	if (changed)
3449	update_background ();	3469	update_background ();
3450	}	3470	}
…		…
3557	{	3577	{
3558	if (mode == 'r')	3578	if (mode == 'r')
3559	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3579	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3560	else	3580	else
3561	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3581	state = (mode == 't') ? ! (priv_modes & bit) : mode;
		3582
3562	set_privmode (bit, state);	3583	set_privmode (bit, state);
3563	}	3584	}
3564		3585
3565	return state;	3586	return state;
3566	}	3587	}
…		…
3575	static const struct	3596	static const struct
3576	{	3597	{
3577	const int argval;	3598	const int argval;
3578	const unsigned long bit;	3599	const unsigned long bit;
3579	} argtopriv[] = {	3600	} argtopriv[] = {
3580	{ 1, PrivMode_aplCUR },	3601	{ 1, PrivMode_aplCUR }, // DECCKM
3581	{ 2, PrivMode_vt52 },	3602	{ 2, PrivMode_vt52 },
3582	{ 3, PrivMode_132 },	3603	{ 3, PrivMode_132 }, // DECCOLM
3583	{ 4, PrivMode_smoothScroll },	3604	{ 4, PrivMode_smoothScroll }, // DECSCLM
3584	{ 5, PrivMode_rVideo },	3605	{ 5, PrivMode_rVideo }, // DECSCNM
3585	{ 6, PrivMode_relOrigin },	3606	{ 6, PrivMode_relOrigin }, // DECOM
3586	{ 7, PrivMode_Autowrap },	3607	{ 7, PrivMode_Autowrap }, // DECAWM
3587	// 8, bi-directional support mode	3608	// 8, auto-repeat keys // DECARM
3588	{ 9, PrivMode_MouseX10 },	3609	{ 9, PrivMode_MouseX10 },
3589	// 18, 19 printing-related	3610	// 18 end FF to printer after print screen
		3611	// 19 Print screen prints full screen/scroll region
3590	{ 25, PrivMode_VisibleCursor },	3612	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3591	#ifdef scrollBar_esc	3613	#ifdef scrollBar_esc
3592	{ scrollBar_esc, PrivMode_scrollBar },	3614	{ scrollBar_esc, PrivMode_scrollBar },
3593	#endif	3615	#endif
3594	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3616	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3617	// 38, tektronix mode // DECTEK
3595	{ 40, PrivMode_132OK },	3618	{ 40, PrivMode_132OK },
3596	// 41 xterm more fixes NYI	3619	// 41 xterm more fixes NYI
3597	// 45 margin bell NYI	3620	// 45 margin bell NYI
3598	// 46 start logging	3621	// 46 start logging
3599	{ 47, PrivMode_Screen },	3622	{ 47, PrivMode_Screen },
3600	{ 66, PrivMode_aplKP },	3623	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3601	#ifndef NO_BACKSPACE_KEY	3624	#ifndef NO_BACKSPACE_KEY
3602	{ 67, PrivMode_BackSpace },	3625	{ 67, PrivMode_BackSpace }, // DECBKM
3603	#endif	3626	#endif
3604	{ 1000, PrivMode_MouseX11 },	3627	{ 1000, PrivMode_MouseX11 },
3605	{ 1002, PrivMode_MouseBtnEvent },	3628	{ 1002, PrivMode_MouseBtnEvent },
3606	{ 1003, PrivMode_MouseAnyEvent },	3629	{ 1003, PrivMode_MouseAnyEvent },
3607	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3630	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3646		3669
3647	scr_touch (true);	3670	scr_touch (true);
3648	break;	3671	break;
3649	#endif	3672	#endif
3650	case 1048: /* alternative cursor save */	3673	case 1048: /* alternative cursor save */
3651	case 1049:
3652	if (option (Opt_secondaryScreen))	3674	if (option (Opt_secondaryScreen))
3653	if (mode == 0)	3675	if (mode == 0)
3654	scr_cursor (RESTORE);	3676	scr_cursor (RESTORE);
3655	else if (mode == 1)	3677	else if (mode == 1)
3656	scr_cursor (SAVE);	3678	scr_cursor (SAVE);
…		…
3669	*/	3691	*/
3670	set_privmode (PrivMode_vt52, 1);	3692	set_privmode (PrivMode_vt52, 1);
3671	break;	3693	break;
3672	case 3: /* 80/132 */	3694	case 3: /* 80/132 */
3673	if (priv_modes & PrivMode_132OK)	3695	if (priv_modes & PrivMode_132OK)
3674	{
3675	scr_poweron ();
3676	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3696	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3677	}
3678	break;	3697	break;
3679	case 4: /* smooth scrolling */	3698	case 4: /* smooth scrolling */
3680	set_option (Opt_jumpScroll, !state);	3699	set_option (Opt_jumpScroll, !state);
3681	break;	3700	break;
3682	case 5: /* reverse video */	3701	case 5: /* reverse video */
…		…
3724	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3743	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725	vt_emask_mouse = PointerMotionMask;	3744	vt_emask_mouse = PointerMotionMask;
3726	}	3745	}
3727	else	3746	else
3728	vt_emask_mouse = NoEventMask;	3747	vt_emask_mouse = NoEventMask;
		3748
3729	vt_select_input ();	3749	vt_select_input ();
3730	break;	3750	break;
3731	case 1010: /* scroll to bottom on TTY output inhibit */	3751	case 1010: /* scroll to bottom on TTY output inhibit */
3732	set_option (Opt_scrollTtyOutput, !state);	3752	set_option (Opt_scrollTtyOutput, !state);
3733	break;	3753	break;
3734	case 1011: /* scroll to bottom on key press */	3754	case 1011: /* scroll to bottom on key press */
3735	set_option (Opt_scrollTtyKeypress, state);	3755	set_option (Opt_scrollTtyKeypress, state);
3736	break;	3756	break;
3737	case 1047: /* secondary screen w/ clearing last */	3757	case 1047: /* secondary screen w/ clearing last */
3738	if (option (Opt_secondaryScreen))	3758	if (option (Opt_secondaryScreen))
3739	if (current_screen != PRIMARY)	3759	if (!state)
3740	scr_erase_screen (2);	3760	scr_erase_screen (2);
		3761
3741	scr_change_screen (state);	3762	scr_change_screen (state);
3742	break;	3763	break;
3743	case 1049: /* secondary screen w/ clearing first */	3764	case 1049: /* secondary screen w/ clearing first */
		3765	if (option (Opt_secondaryScreen))
		3766	if (state)
		3767	scr_cursor (SAVE);
		3768
3744	scr_change_screen (state);	3769	scr_change_screen (state);
		3770
3745	if (option (Opt_secondaryScreen))	3771	if (option (Opt_secondaryScreen))
3746	if (current_screen != PRIMARY)	3772	if (state)
3747	scr_erase_screen (2);	3773	scr_erase_screen (2);
		3774	else
		3775	scr_cursor (RESTORE);
3748	break;	3776	break;
3749	default:	3777	default:
3750	break;	3778	break;
3751	}	3779	}
3752	}	3780	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.421 by root, Wed Oct 15 17:16:47 2008 UTC vs. Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.421 by root, Wed Oct 15 17:16:47 2008 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC