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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 2005 UTC

…		…
135	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
136	{	136	{
137	x = Pixel2Col (x);	137	x = Pixel2Col (x);
138	y = Pixel2Row (y);	138	y = Pixel2Row (y);
139		139
140	if (x < 0 \|\| x >= TermWin.ncol	140	if (x < 0 \|\| x >= ncol
141	\|\| y < 0 \|\| y >= TermWin.nrow)	141	\|\| y < 0 \|\| y >= nrow)
142	return;	142	return;
143		143
144	for (;;)	144	for (;;)
145	{	145	{
146	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	const line_t &l = save[y + saveLines - view_start];
		147
		148	text_t t = l.t[x];
147		149
148	if (t != NOCHAR \|\| !x)	150	if (t != NOCHAR \|\| !x)
149	{	151	{
150	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	152	iso14755_51 (l.t[x], l.r[x]);
151	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152	iso14755buf = ISO_14755_54;	153	iso14755buf = ISO_14755_54;
153	break;	154	break;
154	}	155	}
155		156
156	x--;	157	x--;
…		…
163	void	164	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	165	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165	{	166	{
166	rxvt_fontset *fs = FONTSET (r);	167	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font f = (fs)[fs->find_font (ch)];	168	rxvt_font f = (fs)[fs->find_font (ch)];
168	wchar_t chr, alloc, ch2;	169	wchar_t chr, alloc, ch2, *fname;
169	int len;	170	int len;
		171
		172	fname = rxvt_utf8towcs (f->name);
170		173
171	#if ENABLE_COMBINING	174	#if ENABLE_COMBINING
172	if (IS_COMPOSE (ch))	175	if (IS_COMPOSE (ch))
173	{	176	{
174	len = rxvt_composite.expand (ch, 0);	177	len = rxvt_composite.expand (ch, 0);
…		…
183	alloc = 0;	186	alloc = 0;
184	chr = &ch2;	187	chr = &ch2;
185	len = 1;	188	len = 1;
186	}	189	}
187		190
188	int width = strlen (f->name);	191	int width = wcswidth (fname, wcslen (fname));
189		192
190	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	193	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191		194
192	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	195	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193		196
…		…
206	#endif	209	#endif
207	scr_overlay_set (11, y, ch, r);	210	scr_overlay_set (11, y, ch, r);
208	scr_overlay_set (12, y, NOCHAR, r);	211	scr_overlay_set (12, y, NOCHAR, r);
209	}	212	}
210		213
211	scr_overlay_set (0, len, f->name);	214	scr_overlay_set (0, len, fname);
		215
		216	free (fname);
212		217
213	#if ENABLE_COMBINING	218	#if ENABLE_COMBINING
214	if (alloc)	219	if (alloc)
215	delete [] alloc;	220	delete [] alloc;
216	#endif	221	#endif
…		…
316		321
317	// the XOpenIM manpage lies about hardcoding the locale	322	// the XOpenIM manpage lies about hardcoding the locale
318	// at the point of XOpenIM, so temporarily switch locales	323	// at the point of XOpenIM, so temporarily switch locales
319	if (rs[Rs_imLocale])	324	if (rs[Rs_imLocale])
320	SET_LOCALE (rs[Rs_imLocale]);	325	SET_LOCALE (rs[Rs_imLocale]);
		326
321	// assume wchar_t == unicode or better	327	// assume wchar_t == unicode or better
322	len = XwcLookupString (Input_Context, &ev, wkbuf,	328	len = XwcLookupString (Input_Context, &ev, wkbuf,
323	KBUFSZ, &keysym, &status_return);	329	KBUFSZ, &keysym, &status_return);
		330
324	if (rs[Rs_imLocale])	331	if (rs[Rs_imLocale])
325	SET_LOCALE (locale);	332	SET_LOCALE (locale);
326		333
327	if (status_return == XLookupChars	334	if (status_return == XLookupChars
328	\|\| status_return == XLookupBoth)	335	\|\| status_return == XLookupBoth)
…		…
360	#ifdef KEYSYM_RESOURCE	367	#ifdef KEYSYM_RESOURCE
361	if (keyboard->dispatch (this, keysym, ev.state))	368	if (keyboard->dispatch (this, keysym, ev.state))
362	return;	369	return;
363	#endif	370	#endif
364		371
365	if (TermWin.saveLines)	372	if (saveLines)
366	{	373	{
367	#ifdef UNSHIFTED_SCROLLKEYS	374	#ifdef UNSHIFTED_SCROLLKEYS
368	if (!ctrl && !meta)	375	if (!ctrl && !meta)
369	#else	376	#else
370	if (IS_SCROLL_MOD)	377	if (IS_SCROLL_MOD)
371	#endif	378	#endif
372	{	379	{
373	int lnsppg;	380	int lnsppg;
374		381
375	#ifdef PAGING_CONTEXT_LINES	382	#ifdef PAGING_CONTEXT_LINES
376	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	383	lnsppg = nrow - PAGING_CONTEXT_LINES;
377	#else	384	#else
378	lnsppg = TermWin.nrow * 4 / 5;	385	lnsppg = nrow * 4 / 5;
379	#endif	386	#endif
380	if (keysym == XK_Prior)	387	if (keysym == XK_Prior)
381	{	388	{
382	scr_page (UP, lnsppg);	389	scr_page (UP, lnsppg);
383	return;	390	return;
…		…
839		846
840	if (len <= 0)	847	if (len <= 0)
841	return; /* not mapped */	848	return; /* not mapped */
842		849
843	if (options & Opt_scrollTtyKeypress)	850	if (options & Opt_scrollTtyKeypress)
844	if (TermWin.view_start)	851	if (view_start)
845	{	852	{
846	TermWin.view_start = 0;	853	view_start = 0;
847	want_refresh = 1;	854	want_refresh = 1;
848	}	855	}
849		856
850	/*	857	/*
851	* these modifications only affect the static keybuffer	858	* these modifications only affect the static keybuffer
…		…
1028	{	1035	{
1029	if (mouse_slip_wheel_speed == 0	1036	if (mouse_slip_wheel_speed == 0
1030	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1037	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031	: scr_page (UP, mouse_slip_wheel_speed))	1038	: scr_page (UP, mouse_slip_wheel_speed))
1032	{	1039	{
1033	if (TermWin.view_start == TermWin.nscrolled \|\|	1040	if (view_start == nsaved \|\|
1034	TermWin.view_start == 0)	1041	view_start == 0)
1035	mouse_slip_wheel_speed = 0;	1042	mouse_slip_wheel_speed = 0;
1036		1043
1037	refresh_type \|= SMOOTH_REFRESH;	1044	refresh_type \|= SMOOTH_REFRESH;
1038	want_refresh = 1;	1045	want_refresh = 1;
1039	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1046	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
…		…
1086	}	1093	}
1087		1094
1088	void	1095	void
1089	rxvt_term::pointer_unblank ()	1096	rxvt_term::pointer_unblank ()
1090	{	1097	{
1091	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1098	XDefineCursor (display->display, vt, TermWin_cursor);
1092	recolour_cursor ();	1099	recolour_cursor ();
1093		1100
1094	#ifdef POINTER_BLANK	1101	#ifdef POINTER_BLANK
1095	hidden_pointer = 0;	1102	hidden_pointer = 0;
1096		1103
…		…
1104	rxvt_term::pointer_blank ()	1111	rxvt_term::pointer_blank ()
1105	{	1112	{
1106	if (! (options & Opt_pointerBlank))	1113	if (! (options & Opt_pointerBlank))
1107	return;	1114	return;
1108		1115
1109	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);	1116	XDefineCursor (display->display, vt, display->blank_cursor);
1110	XFlush (display->display);	1117	XFlush (display->display);
1111		1118
1112	hidden_pointer = 1;	1119	hidden_pointer = 1;
1113	}	1120	}
1114		1121
…		…
1416	case FocusOut:	1423	case FocusOut:
1417	focus_out ();	1424	focus_out ();
1418	break;	1425	break;
1419		1426
1420	case ConfigureNotify:	1427	case ConfigureNotify:
1421	if (ev.xconfigure.window == TermWin.parent[0])	1428	if (ev.xconfigure.window == parent[0])
1422	{	1429	{
1423	int height, width;
1424
1425	do
1426	{ /* Wrap lots of configures into one */
1427	width = ev.xconfigure.width;
1428	height = ev.xconfigure.height;
1429	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1430	}
1431	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));	1430	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1431	;
1432		1432
1433	if (szHint.width != width \|\| szHint.height != height)	1433	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1434	{	1434	{
1435	seen_resize = 1;	1435	seen_resize = 1;
1436	resize_all_windows (width, height, 1);	1436	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437	}	1437	}
1438		1438
1439	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1439	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440	if (options & Opt_transparent)	1440	if (options & Opt_transparent)
1441	check_our_parents ();	1441	check_our_parents ();
…		…
1462	case SelectionRequest:	1462	case SelectionRequest:
1463	selection_send (ev.xselectionrequest);	1463	selection_send (ev.xselectionrequest);
1464	break;	1464	break;
1465		1465
1466	case UnmapNotify:	1466	case UnmapNotify:
1467	TermWin.mapped = 0;	1467	mapped = 0;
1468	#ifdef TEXT_BLINK	1468	#ifdef TEXT_BLINK
1469	text_blink_ev.stop ();	1469	text_blink_ev.stop ();
1470	#endif	1470	#endif
1471	break;	1471	break;
1472		1472
1473	case MapNotify:	1473	case MapNotify:
1474	TermWin.mapped = 1;	1474	mapped = 1;
1475	#ifdef TEXT_BLINK	1475	#ifdef TEXT_BLINK
1476	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1476	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477	#endif	1477	#endif
1478	break;	1478	break;
1479		1479
…		…
1483	break;	1483	break;
1484	#endif /* TRANSPARENT */	1484	#endif /* TRANSPARENT */
1485		1485
1486	case GraphicsExpose:	1486	case GraphicsExpose:
1487	case Expose:	1487	case Expose:
1488	if (ev.xany.window == TermWin.vt)	1488	if (ev.xany.window == vt)
1489	{	1489	{
1490	do	1490	do
1491	scr_expose (ev.xexpose.x, ev.xexpose.y,	1491	scr_expose (ev.xexpose.x, ev.xexpose.y,
1492	ev.xexpose.width, ev.xexpose.height, False);	1492	ev.xexpose.width, ev.xexpose.height, False);
1493	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));	1493	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494		1494
1495	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1495	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496		1496
1497	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))	1497	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498	scr_expose (ev.xexpose.x, ev.xexpose.y,	1498	scr_expose (ev.xexpose.x, ev.xexpose.y,
1499	ev.xexpose.width, ev.xexpose.height, False);	1499	ev.xexpose.width, ev.xexpose.height, False);
1500		1500
1501	scr_refresh (refresh_type);	1501	scr_refresh (refresh_type);
1502	}	1502	}
…		…
1518	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1518	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519	menubar_expose ();	1519	menubar_expose ();
1520	#endif	1520	#endif
1521		1521
1522	#ifdef TRANSPARENT	1522	#ifdef TRANSPARENT
1523	if (am_transparent && ev.xany.window == TermWin.parent[0])	1523	if (am_transparent && ev.xany.window == parent[0])
1524	XClearWindow (disp, ev.xany.window);	1524	XClearWindow (disp, ev.xany.window);
1525	#endif	1525	#endif
1526	}	1526	}
1527	break;	1527	break;
1528		1528
…		…
1539	}	1539	}
1540	#endif	1540	#endif
1541	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1541	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542	break;	1542	break;
1543		1543
1544	if (ev.xany.window == TermWin.vt)	1544	if (ev.xany.window == vt)
1545	{	1545	{
1546	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1546	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1547	{	1547	{
1548	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))	1548	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549	;	1549	;
1550		1550
1551	XQueryPointer (disp, TermWin.vt,	1551	XQueryPointer (disp, vt,
1552	&unused_root, &unused_child,	1552	&unused_root, &unused_child,
1553	&unused_root_x, &unused_root_y,	1553	&unused_root_x, &unused_root_y,
1554	&ev.xbutton.x, &ev.xbutton.y,	1554	&ev.xbutton.x, &ev.xbutton.y,
1555	&ev.xbutton.state);	1555	&ev.xbutton.state);
1556	#ifdef MOUSE_THRESHOLD	1556	#ifdef MOUSE_THRESHOLD
…		…
1568	#endif	1568	#endif
1569	selection_extend (ev.xbutton.x, ev.xbutton.y,	1569	selection_extend (ev.xbutton.x, ev.xbutton.y,
1570	ev.xbutton.state & Button3Mask ? 2 : 0);	1570	ev.xbutton.state & Button3Mask ? 2 : 0);
1571		1571
1572	#ifdef SELECTION_SCROLLING	1572	#ifdef SELECTION_SCROLLING
1573	if (ev.xbutton.y < TermWin.int_bwidth	1573	if (ev.xbutton.y < int_bwidth
1574	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1574	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1575	{	1575	{
1576	int dist;	1576	int dist;
1577		1577
1578	/* don't clobber the current delay if we are	1578	/* don't clobber the current delay if we are
1579	* already in the middle of scrolling.	1579	* already in the middle of scrolling.
…		…
1587	selection_save_x = ev.xbutton.x;	1587	selection_save_x = ev.xbutton.x;
1588	selection_save_y = ev.xbutton.y;	1588	selection_save_y = ev.xbutton.y;
1589	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1589	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590		1590
1591	/* calc number of lines to scroll */	1591	/* calc number of lines to scroll */
1592	if (ev.xbutton.y < TermWin.int_bwidth)	1592	if (ev.xbutton.y < int_bwidth)
1593	{	1593	{
1594	scroll_selection_dir = UP;	1594	scroll_selection_dir = UP;
1595	dist = TermWin.int_bwidth - ev.xbutton.y;	1595	dist = int_bwidth - ev.xbutton.y;
1596	}	1596	}
1597	else	1597	else
1598	{	1598	{
1599	scroll_selection_dir = DN;	1599	scroll_selection_dir = DN;
1600	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1600	dist = ev.xbutton.y - (int_bwidth + height);
1601	}	1601	}
1602		1602
1603	scroll_selection_lines = Pixel2Height (dist)	1603	scroll_selection_lines = Pixel2Height (dist)
1604	/ SELECTION_SCROLL_LINE_SPEEDUP	1604	/ SELECTION_SCROLL_LINE_SPEEDUP
1605	+ 1;	1605	+ 1;
…		…
1642	}	1642	}
1643		1643
1644	void	1644	void
1645	rxvt_term::focus_in ()	1645	rxvt_term::focus_in ()
1646	{	1646	{
1647	if (!TermWin.focus)	1647	if (!focus)
1648	{	1648	{
1649	TermWin.focus = 1;	1649	focus = 1;
1650	want_refresh = 1;	1650	want_refresh = 1;
1651	#ifdef USE_XIM	1651	#if USE_XIM
1652	if (Input_Context != NULL)	1652	if (Input_Context != NULL)
1653	{	1653	{
1654	IMSetStatusPosition ();	1654	IMSetStatusPosition ();
1655	XSetICFocus (Input_Context);	1655	XSetICFocus (Input_Context);
1656	}	1656	}
1657	#endif	1657	#endif
1658	#ifdef CURSOR_BLINK	1658	#if CURSOR_BLINK
1659	if (options & Opt_cursorBlink)	1659	if (options & Opt_cursorBlink)
1660	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1660	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661	#endif	1661	#endif
1662	#ifdef OFF_FOCUS_FADING	1662	#if OFF_FOCUS_FADING
1663	if (rs[Rs_fade])	1663	if (rs[Rs_fade])
1664	{	1664	{
1665	pix_colors = pix_colors_focused;	1665	pix_colors = pix_colors_focused;
1666	scr_recolour ();	1666	scr_recolour ();
1667	}	1667	}
…		…
1670	}	1670	}
1671		1671
1672	void	1672	void
1673	rxvt_term::focus_out ()	1673	rxvt_term::focus_out ()
1674	{	1674	{
1675	if (TermWin.focus)	1675	if (focus)
1676	{	1676	{
1677	TermWin.focus = 0;	1677	focus = 0;
1678	want_refresh = 1;	1678	want_refresh = 1;
1679		1679
1680	#if ENABLE_FRILLS \|\| ISO_14755	1680	#if ENABLE_FRILLS \|\| ISO_14755
1681	iso14755buf = 0;	1681	iso14755buf = 0;
1682	#endif	1682	#endif
1683	#if ENABLE_OVERLAY	1683	#if ENABLE_OVERLAY
1684	scr_overlay_off ();	1684	scr_overlay_off ();
1685	#endif	1685	#endif
1686	#ifdef USE_XIM	1686	#if USE_XIM
1687	if (Input_Context != NULL)	1687	if (Input_Context != NULL)
1688	XUnsetICFocus (Input_Context);	1688	XUnsetICFocus (Input_Context);
1689	#endif	1689	#endif
1690	#ifdef CURSOR_BLINK	1690	#if CURSOR_BLINK
1691	if (options & Opt_cursorBlink)	1691	if (options & Opt_cursorBlink)
1692	cursor_blink_ev.stop ();	1692	cursor_blink_ev.stop ();
1693	hidden_cursor = 0;	1693	hidden_cursor = 0;
1694	#endif	1694	#endif
1695	#ifdef OFF_FOCUS_FADING	1695	#if OFF_FOCUS_FADING
1696	if (rs[Rs_fade])	1696	if (rs[Rs_fade])
1697	{	1697	{
1698	pix_colors = pix_colors_unfocused;	1698	pix_colors = pix_colors_unfocused;
1699	scr_recolour ();	1699	scr_recolour ();
1700	}	1700	}
…		…
1739	reportmode = !! (priv_modes & PrivMode_mouse_report);	1739	reportmode = !! (priv_modes & PrivMode_mouse_report);
1740		1740
1741	/*	1741	/*
1742	* VT window processing of button press	1742	* VT window processing of button press
1743	*/	1743	*/
1744	if (ev.window == TermWin.vt)	1744	if (ev.window == vt)
1745	{	1745	{
1746	#if ISO_14755	1746	#if ISO_14755
1747	// 5.4	1747	// 5.4
1748	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1748	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1749	{	1749	{
…		…
1954	case Button3:	1954	case Button3:
1955	if (scrollBar.style != R_SB_XTERM)	1955	if (scrollBar.style != R_SB_XTERM)
1956	{	1956	{
1957	if (scrollbar_above_slider (ev.y))	1957	if (scrollbar_above_slider (ev.y))
1958	# ifdef RXVT_SCROLL_FULL	1958	# ifdef RXVT_SCROLL_FULL
1959	scr_page (UP, TermWin.nrow - 1);	1959	scr_page (UP, nrow - 1);
1960	# else	1960	# else
1961	scr_page (UP, TermWin.nrow / 4);	1961	scr_page (UP, nrow / 4);
1962	# endif	1962	# endif
1963	else if (scrollbar_below_slider (ev.y))	1963	else if (scrollbar_below_slider (ev.y))
1964	# ifdef RXVT_SCROLL_FULL	1964	# ifdef RXVT_SCROLL_FULL
1965	scr_page (DN, TermWin.nrow - 1);	1965	scr_page (DN, nrow - 1);
1966	# else	1966	# else
1967	scr_page (DN, TermWin.nrow / 4);	1967	scr_page (DN, nrow / 4);
1968	# endif	1968	# endif
1969	else	1969	else
1970	scrollBar.setMotion ();	1970	scrollBar.setMotion ();
1971	}	1971	}
1972	else	1972	else
1973	{	1973	{
1974	scr_page ((ev.button == Button1 ? DN : UP),	1974	scr_page ((ev.button == Button1 ? DN : UP),
1975	(TermWin.nrow	1975	(nrow
1976	* scrollbar_position (ev.y)	1976	* scrollbar_position (ev.y)
1977	/ scrollbar_size ()));	1977	/ scrollbar_size ()));
1978	}	1978	}
1979		1979
1980	break;	1980	break;
…		…
2012	#ifdef SELECTION_SCROLLING	2012	#ifdef SELECTION_SCROLLING
2013	if (sel_scroll_ev.active)	2013	if (sel_scroll_ev.active)
2014	sel_scroll_ev.stop();	2014	sel_scroll_ev.stop();
2015	#endif	2015	#endif
2016		2016
2017	if (ev.window == TermWin.vt)	2017	if (ev.window == vt)
2018	{	2018	{
2019	#if ISO_14755	2019	#if ISO_14755
2020	// 5.4	2020	// 5.4
2021	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2021	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2022	return;	2022	return;
…		…
2073	v = ev.button == Button4 ? UP : DN;	2073	v = ev.button == Button4 ? UP : DN;
2074		2074
2075	if (ev.state & ShiftMask)	2075	if (ev.state & ShiftMask)
2076	i = 1;	2076	i = 1;
2077	else if (options & Opt_mouseWheelScrollPage)	2077	else if (options & Opt_mouseWheelScrollPage)
2078	i = TermWin.nrow - 1;	2078	i = nrow - 1;
2079	else	2079	else
2080	i = 5;	2080	i = 5;
2081		2081
2082	# ifdef MOUSE_SLIP_WHEELING	2082	# ifdef MOUSE_SLIP_WHEELING
2083	if (ev.state & ControlMask)	2083	if (ev.state & ControlMask)
2084	{	2084	{
2085	mouse_slip_wheel_speed += v ? -1 : 1;	2085	mouse_slip_wheel_speed += v ? -1 : 1;
2086	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2086	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2087	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2087	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088		2088
2089	if (slip_wheel_ev.at < NOW)	2089	if (slip_wheel_ev.at < NOW)
2090	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2090	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091		2091
2092	slip_wheel_ev.start ();	2092	slip_wheel_ev.start ();
…		…
2374	return pchanged; /* Don't try any more */	2374	return pchanged; /* Don't try any more */
2375		2375
2376	XGetWindowAttributes (disp, display->root, &wrootattr);	2376	XGetWindowAttributes (disp, display->root, &wrootattr);
2377	rootdepth = wrootattr.depth;	2377	rootdepth = wrootattr.depth;
2378		2378
2379	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	2379	XGetWindowAttributes (disp, parent[0], &wattr);
2380		2380
2381	if (rootdepth != wattr.depth)	2381	if (rootdepth != wattr.depth)
2382	{	2382	{
2383	if (am_transparent)	2383	if (am_transparent)
2384	{	2384	{
2385	pchanged = 1;	2385	pchanged = 1;
2386	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2386	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387	am_transparent = am_pixmap_trans = 0;	2387	am_transparent = am_pixmap_trans = 0;
2388	}	2388	}
2389		2389
2390	return pchanged; /* Don't try any more */	2390	return pchanged; /* Don't try any more */
2391	}	2391	}
…		…
2432	Window cr;	2432	Window cr;
2433	XImage *image;	2433	XImage *image;
2434	GC gc;	2434	GC gc;
2435	XGCValues gcvalue;	2435	XGCValues gcvalue;
2436		2436
2437	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	2437	XTranslateCoordinates (disp, parent[0], display->root,
2438	0, 0, &sx, &sy, &cr);	2438	0, 0, &sx, &sy, &cr);
2439	nw = (unsigned int)szHint.width;	2439	nw = (unsigned int)szHint.width;
2440	nh = (unsigned int)szHint.height;	2440	nh = (unsigned int)szHint.height;
2441	nx = ny = 0;	2441	nx = ny = 0;
2442		2442
…		…
2468	if (image == NULL)	2468	if (image == NULL)
2469	{	2469	{
2470	if (am_transparent && am_pixmap_trans)	2470	if (am_transparent && am_pixmap_trans)
2471	{	2471	{
2472	pchanged = 1;	2472	pchanged = 1;
2473	if (TermWin.pixmap != None)	2473	if (pixmap != None)
2474	{	2474	{
2475	XFreePixmap (disp, TermWin.pixmap);	2475	XFreePixmap (disp, pixmap);
2476	TermWin.pixmap = None;	2476	pixmap = None;
2477	}	2477	}
2478	}	2478	}
2479		2479
2480	am_pixmap_trans = 0;	2480	am_pixmap_trans = 0;
2481	}	2481	}
2482	else	2482	else
2483	{	2483	{
2484	if (TermWin.pixmap != None)	2484	if (pixmap != None)
2485	XFreePixmap (disp, TermWin.pixmap);	2485	XFreePixmap (disp, pixmap);
2486		2486
2487	#if TINTING	2487	#if TINTING
2488	if (ISSET_PIXCOLOR (Color_tint))	2488	if (ISSET_PIXCOLOR (Color_tint))
2489	{	2489	{
2490	unsigned short rm, gm, bm;	2490	unsigned short rm, gm, bm;
…		…
2494		2494
2495	ShadeXImage (display, image, shade, rm, gm, bm);	2495	ShadeXImage (display, image, shade, rm, gm, bm);
2496	}	2496	}
2497	#endif	2497	#endif
2498		2498
2499	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,	2499	pixmap = XCreatePixmap (disp, vt,
2500	szHint.width, szHint.height, image->depth);	2500	szHint.width, szHint.height, image->depth);
2501	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);	2501	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,	2502	XPutImage (disp, pixmap, gc, image, 0, 0,
2503	nx, ny, image->width, image->height);	2503	nx, ny, image->width, image->height);
2504	XFreeGC (disp, gc);	2504	XFreeGC (disp, gc);
2505	XDestroyImage (image);	2505	XDestroyImage (image);
2506	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);	2506	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507	XClearWindow (disp, TermWin.parent[0]);	2507	XClearWindow (disp, parent[0]);
2508		2508
2509	if (!am_transparent \|\| !am_pixmap_trans)	2509	if (!am_transparent \|\| !am_pixmap_trans)
2510	pchanged = 1;	2510	pchanged = 1;
2511		2511
2512	am_transparent = am_pixmap_trans = 1;	2512	am_transparent = am_pixmap_trans = 1;
2513	}	2513	}
2514	}	2514	}
2515		2515
2516	if (am_pixmap_trans)	2516	if (am_pixmap_trans)
2517	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2517	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518	else	2518	else
2519	{	2519	{
2520	unsigned int n;	2520	unsigned int n;
2521	/*	2521	/*
2522	* InheritPixmap transparency	2522	* InheritPixmap transparency
2523	*/	2523	*/
2524	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2524	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525	{	2525	{
2526	oldp = TermWin.parent[i];	2526	oldp = parent[i];
2527	XQueryTree (disp, TermWin.parent[i - 1], &root,	2527	XQueryTree (disp, parent[i - 1], &root,
2528	&TermWin.parent[i], &list, &n);	2528	&parent[i], &list, &n);
2529	XFree (list);	2529	XFree (list);
2530		2530
2531	if (TermWin.parent[i] == display->root)	2531	if (parent[i] == display->root)
2532	{	2532	{
2533	if (oldp != None)	2533	if (oldp != None)
2534	pchanged = 1;	2534	pchanged = 1;
2535		2535
2536	break;	2536	break;
2537	}	2537	}
2538		2538
2539	if (oldp != TermWin.parent[i])	2539	if (oldp != parent[i])
2540	pchanged = 1;	2540	pchanged = 1;
2541	}	2541	}
2542		2542
2543	n = 0;	2543	n = 0;
2544		2544
2545	if (pchanged)	2545	if (pchanged)
2546	{	2546	{
2547	for (; n < (unsigned int)i; n++)	2547	for (; n < (unsigned int)i; n++)
2548	{	2548	{
2549	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);	2549	XGetWindowAttributes (disp, parent[n], &wattr);
2550	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2550	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2551	{	2551	{
2552	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2552	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553	break;	2553	break;
2554	}	2554	}
2555	}	2555	}
2556	}	2556	}
2557		2557
2558	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2558	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559	{	2559	{
2560	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);	2560	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2561	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562	am_transparent = 0;	2562	am_transparent = 0;
2563	/* XXX: also turn off Opt_transparent? */	2563	/* XXX: also turn off Opt_transparent? */
2564	}	2564	}
2565	else	2565	else
2566	{	2566	{
…		…
2569	* needed for fvwm2.2.2 (and before?) */	2569	* needed for fvwm2.2.2 (and before?) */
2570	sleep (1);	2570	sleep (1);
2571	#endif	2571	#endif
2572	for (n = 0; n < (unsigned int)i; n++)	2572	for (n = 0; n < (unsigned int)i; n++)
2573	{	2573	{
2574	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);	2574	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575	XClearWindow (disp, TermWin.parent[n]);	2575	XClearWindow (disp, parent[n]);
2576	}	2576	}
2577		2577
2578	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579	am_transparent = 1;	2579	am_transparent = 1;
2580	}	2580	}
2581		2581
2582	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2582	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583	TermWin.parent[i] = None;	2583	parent[i] = None;
2584	}	2584	}
2585		2585
2586	if (scrollBar.win)	2586	if (scrollBar.win)
2587	{	2587	{
2588	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2588	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
…		…
2640	/* Read a text string from the input buffer */	2640	/* Read a text string from the input buffer */
2641	unicode_t buf[UBUFSIZ];	2641	unicode_t buf[UBUFSIZ];
2642	bool refreshnow = false;	2642	bool refreshnow = false;
2643	int nlines = 0;	2643	int nlines = 0;
2644	unicode_t *str = buf;	2644	unicode_t *str = buf;
		2645	unicode_t *eol = str + min (ncol, UBUFSIZ);
2645		2646
2646	for (;;)	2647	for (;;)
2647	{	2648	{
2648	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2649	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649	break;	2650	break;
2650		2651
2651	*str++ = ch;	2652	*str++ = ch;
2652		2653
2653	if (ch == C0_LF)	2654	if (ch == C0_LF \|\| str >= eol)
2654	{	2655	{
		2656	if (ch == C0_LF)
2655	nlines++;	2657	nlines++;
		2658
2656	refresh_count++;	2659	refresh_count++;
2657		2660
2658	if (!(options & Opt_jumpScroll)	2661	if (!(options & Opt_jumpScroll)
2659	\|\| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2662	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2660	{	2663	{
2661	refreshnow = true;	2664	refreshnow = true;
2662	ch = NOCHAR;	2665	ch = NOCHAR;
2663	break;	2666	break;
2664	}	2667	}
2665		2668
2666	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2669	// scr_add_lines only works for nlines <= nrow - 1.
2667	if (nlines >= TermWin.nrow - 1)	2670	if (nlines >= nrow - 1)
2668	{	2671	{
2669	scr_add_lines (buf, nlines, str - buf);	2672	scr_add_lines (buf, nlines, str - buf);
2670	nlines = 0;	2673	nlines = 0;
2671	str = buf;	2674	str = buf;
		2675	eol = str + min (ncol, UBUFSIZ);
2672	}	2676	}
2673	}
2674		2677
2675	if (str >= buf + UBUFSIZ)	2678	if (str >= eol)
2676	{	2679	{
		2680	if (eol >= buf + UBUFSIZ)
		2681	{
2677	ch = NOCHAR;	2682	ch = NOCHAR;
2678	break;	2683	break;
		2684	}
		2685	else
		2686	eol = min (eol + ncol, buf + UBUFSIZ);
		2687	}
		2688
2679	}	2689	}
2680		2690
2681	seq_begin = cmdbuf_ptr;	2691	seq_begin = cmdbuf_ptr;
2682	ch = next_char ();	2692	ch = next_char ();
2683	}	2693	}
…		…
3342		3352
3343	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3353	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344	arg[0] = -arg[0];	3354	arg[0] = -arg[0];
3345	/* FALLTHROUGH */	3355	/* FALLTHROUGH */
3346	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3356	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3357	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348	break;	3358	break;
3349		3359
3350	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3360	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351	tt_write ((const unsigned char *)VT100_ANS,	3361	tt_write ((const unsigned char *)VT100_ANS,
3352	(unsigned int) (sizeof (VT100_ANS) - 1));	3362	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3477	{	3487	{
3478	/*	3488	/*
3479	* commands	3489	* commands
3480	*/	3490	*/
3481	case 1: /* deiconify window */	3491	case 1: /* deiconify window */
3482	XMapWindow (disp, TermWin.parent[0]);	3492	XMapWindow (disp, parent[0]);
3483	break;	3493	break;
3484	case 2: /* iconify window */	3494	case 2: /* iconify window */
3485	XIconifyWindow (disp, TermWin.parent[0], display->screen);	3495	XIconifyWindow (disp, parent[0], display->screen);
3486	break;	3496	break;
3487	case 3: /* set position (pixels) */	3497	case 3: /* set position (pixels) */
3488	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);	3498	XMoveWindow (disp, parent[0], args[1], args[2]);
3489	break;	3499	break;
3490	case 4: /* set size (pixels) */	3500	case 4: /* set size (pixels) */
3491	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3501	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492	break;	3502	break;
3493	case 5: /* raise window */	3503	case 5: /* raise window */
3494	XRaiseWindow (disp, TermWin.parent[0]);	3504	XRaiseWindow (disp, parent[0]);
3495	break;	3505	break;
3496	case 6: /* lower window */	3506	case 6: /* lower window */
3497	XLowerWindow (disp, TermWin.parent[0]);	3507	XLowerWindow (disp, parent[0]);
3498	break;	3508	break;
3499	case 7: /* refresh window */	3509	case 7: /* refresh window */
3500	scr_touch (true);	3510	scr_touch (true);
3501	break;	3511	break;
3502	case 8: /* set size (chars) */	3512	case 8: /* set size (chars) */
3503	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3513	set_widthheight ((unsigned int) (args[2] * fwidth),
3504	(unsigned int) (args[1] * TermWin.fheight));	3514	(unsigned int) (args[1] * fheight));
3505	break;	3515	break;
3506		3516
3507	//case 9: NYI, TODO, restore maximized window or maximize window	3517	//case 9: NYI, TODO, restore maximized window or maximize window
3508	default:	3518	default:
3509	if (args[0] >= 24) /* set height (chars) */	3519	if (args[0] >= 24) /* set height (chars) */
3510	set_widthheight ((unsigned int)TermWin.width,	3520	set_widthheight ((unsigned int)width,
3511	(unsigned int) (args[1] * TermWin.fheight));	3521	(unsigned int) (args[1] * fheight));
3512	break;	3522	break;
3513		3523
3514		3524
3515	/*	3525	/*
3516	* reports - some output format copied from XTerm	3526	* reports - some output format copied from XTerm
3517	*/	3527	*/
3518	case 11: /* report window state */	3528	case 11: /* report window state */
3519	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3529	XGetWindowAttributes (disp, parent[0], &wattr);
3520	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3530	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521	break;	3531	break;
3522	case 13: /* report window position */	3532	case 13: /* report window position */
3523	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3533	XGetWindowAttributes (disp, parent[0], &wattr);
3524	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,	3534	XTranslateCoordinates (disp, parent[0], wattr.root,
3525	-wattr.border_width, -wattr.border_width,	3535	-wattr.border_width, -wattr.border_width,
3526	&x, &y, &wdummy);	3536	&x, &y, &wdummy);
3527	tt_printf ("\033[3;%d;%dt", x, y);	3537	tt_printf ("\033[3;%d;%dt", x, y);
3528	break;	3538	break;
3529	case 14: /* report window size (pixels) */	3539	case 14: /* report window size (pixels) */
3530	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3540	XGetWindowAttributes (disp, parent[0], &wattr);
3531	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3541	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532	break;	3542	break;
3533	case 18: /* report text area size (chars) */	3543	case 18: /* report text area size (chars) */
3534	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3544	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535	break;	3545	break;
3536	case 19: /* report window size (chars) */	3546	case 19: /* report window size (chars) */
3537	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3547	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538	break;	3548	break;
3539	case 20: /* report icon label */	3549	case 20: /* report icon label */
3540	{	3550	{
3541	char *s;	3551	char *s;
3542	XGetIconName (disp, TermWin.parent[0], &s);	3552	XGetIconName (disp, parent[0], &s);
3543	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3553	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3544	XFree (s);	3554	XFree (s);
3545	}	3555	}
3546	break;	3556	break;
3547	case 21: /* report window title */	3557	case 21: /* report window title */
3548	{	3558	{
3549	char *s;	3559	char *s;
3550	XFetchName (disp, TermWin.parent[0], &s);	3560	XFetchName (disp, parent[0], &s);
3551	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3561	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3552	XFree (s);	3562	XFree (s);
3553	}	3563	}
3554	break;	3564	break;
3555	}	3565	}
…		…
3588	else if (ch < 0x20)	3598	else if (ch < 0x20)
3589	return NULL; /* other control character - exit */	3599	return NULL; /* other control character - exit */
3590		3600
3591	seen_esc = false;	3601	seen_esc = false;
3592		3602
3593	if (n >= sizeof (string) - 1)	3603	if (n >= STRING_MAX - 1)
3594	// stop at some sane length	3604	// stop at some sane length
3595	return NULL;	3605	return NULL;
3596		3606
3597	if (ch == C0_SYN)	3607	if (ch == C0_SYN)
3598	string[n++] = cmd_get8 ();	3608	string[n++] = cmd_get8 ();
…		…
3666	set_window_color (color, str);	3676	set_window_color (color, str);
3667	}	3677	}
3668		3678
3669	/*	3679	/*
3670	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3680	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3671	* 0 = change iconName/title
3672	* 1 = change iconName
3673	* 2 = change title
3674	* 4 = change color
3675	* 10 = change fg color
3676	* 11 = change bg color
3677	* 12 = change text color
3678	* 13 = change mouse foreground color
3679	* 17 = change highlight character colour
3680	* 18 = change bold character color
3681	* 19 = change underlined character color
3682	* 46 = change logfile (not implemented)
3683	* 50 = change font
3684	*
3685	* rxvt extensions:
3686	* 20 = bg pixmap
3687	* 39 = change default fg color
3688	* 49 = change default bg color
3689	* 55 = dump scrollback buffer and all of screen
3690	* 701 = change locale
3691	* 702 = find font
3692	* 703 = menu
3693	*/	3681	*/
3694	void	3682	void
3695	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3683	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3696	{	3684	{
3697	int changed = 0;	3685	int changed = 0;
…		…
3723	unsigned long bytes_after;	3711	unsigned long bytes_after;
3724	unsigned char *value = 0;	3712	unsigned char *value = 0;
3725	const char *str = "";	3713	const char *str = "";
3726		3714
3727	if (prop	3715	if (prop
3728	&& XGetWindowProperty (disp, TermWin.parent[0],	3716	&& XGetWindowProperty (disp, parent[0],
3729	prop, 0, 1<<16, 0, AnyPropertyType,	3717	prop, 0, 1<<16, 0, AnyPropertyType,
3730	&actual_type, &actual_format,	3718	&actual_type, &actual_format,
3731	&nitems, &bytes_after, &value) == Success	3719	&nitems, &bytes_after, &value) == Success
3732	&& actual_type != None	3720	&& actual_type != None
3733	&& actual_format == 8)	3721	&& actual_format == 8)
…		…
3745	{	3733	{
3746	*eq = 0;	3734	*eq = 0;
3747	set_utf8_property (display->atom (str), eq + 1);	3735	set_utf8_property (display->atom (str), eq + 1);
3748	}	3736	}
3749	else	3737	else
3750	XDeleteProperty (disp, TermWin.parent[0],	3738	XDeleteProperty (disp, parent[0],
3751	display->atom (str));	3739	display->atom (str));
3752	}	3740	}
3753	break;	3741	break;
3754		3742
3755	case XTerm_Color:	3743	case XTerm_Color:
…		…
3796	break;	3784	break;
3797	#ifndef NO_BOLD_UNDERLINE_REVERSE	3785	#ifndef NO_BOLD_UNDERLINE_REVERSE
3798	case XTerm_Color_BD:	3786	case XTerm_Color_BD:
3799	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3787	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3800	break;	3788	break;
3801	case XTerm_Color_IT:
3802	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3803	break;
3804	case XTerm_Color_UL:	3789	case XTerm_Color_UL:
3805	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3790	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3806	break;	3791	break;
3807	case XTerm_Color_RV:	3792	case XTerm_Color_RV:
3808	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3793	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3809	break;	3794	break;
		3795	case URxvt_Color_IT:
		3796	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3797	break;
3810	#endif	3798	#endif
3811	#if TRANSPARENT && TINTING	3799	#if TRANSPARENT && TINTING
3812	case XTerm_Color_tint:	3800	case URxvt_Color_tint:
3813	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3801	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3814	check_our_parents ();	3802	check_our_parents ();
3815	if (am_transparent)	3803	if (am_transparent)
3816	want_full_refresh = want_refresh = 1;	3804	want_full_refresh = want_refresh = 1;
3817	break;	3805	break;
3818	#endif	3806	#endif
…		…
3852		3840
3853	case XTerm_logfile:	3841	case XTerm_logfile:
3854	// TODO, when secure mode?	3842	// TODO, when secure mode?
3855	break;	3843	break;
3856		3844
		3845	#ifdef MENUBAR
		3846	case URxvt_Menu:
		3847	if (options & Opt_insecure)
		3848	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3849	break;
		3850	#endif
		3851	#if 0
		3852	case XTerm_dumpscreen: /* no error notices */
		3853	{
		3854	int fd;
		3855	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
		3856	{
		3857	scr_dump (fd);
		3858	close (fd);
		3859	}
		3860	}
		3861	break;
		3862	#endif
3857	case XTerm_font:	3863	case XTerm_font:
3858	op = URxvt_font;	3864	op = URxvt_font;
3859	case URxvt_font:	3865	case URxvt_font:
3860	#if ENABLE_STYLES	3866	#if ENABLE_STYLES
3861	case URxvt_boldFont:	3867	case URxvt_boldFont:
3862	case URxvt_italicFont:	3868	case URxvt_italicFont:
3863	case URxvt_boldItalicFont:	3869	case URxvt_boldItalicFont:
3864	#endif	3870	#endif
3865	if (query)	3871	if (query)
3866	tt_printf ("\33]%d;%-.250s%c", saveop,	3872	tt_printf ("\33]%d;%-.250s%c", saveop,
3867	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3873	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3868	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3874	? fontset[op - URxvt_font]->fontdesc : "",
3869	resp);	3875	resp);
3870	else	3876	else
3871	{	3877	{
3872	const char *&res = rs[Rs_font + (op - URxvt_font)];	3878	const char *&res = rs[Rs_font + (op - URxvt_font)];
3873		3879
…		…
3876	set_fonts ();	3882	set_fonts ();
3877	}	3883	}
3878	break;	3884	break;
3879		3885
3880	#if ENABLE_FRILLS	3886	#if ENABLE_FRILLS
3881	case XTerm_locale:	3887	case URxvt_locale:
3882	if (query)	3888	if (query)
3883	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3889	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3884	else	3890	else
3885	{	3891	{
3886	set_locale (str);	3892	set_locale (str);
3887	pty.set_utf8_mode (enc_utf8);	3893	pty.set_utf8_mode (enc_utf8);
3888	init_xlocale ();	3894	init_xlocale ();
3889	}	3895	}
3890	break;	3896	break;
3891	#endif
3892		3897
3893	#ifdef MENUBAR	3898	case URxvt_view_up:
3894	case XTerm_Menu:	3899	case URxvt_view_down:
3895	if (options & Opt_insecure)	3900	int lines = atoi (str);
3896	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3901
3897	break;	3902	if (lines)
3898	#endif	3903	scr_page (op == URxvt_view_up ? UP : DN, lines);
3899	#if 0
3900	case XTerm_dumpscreen: /* no error notices */
3901	{	3904	else
3902	int fd;
3903	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3904	{	3905	{
3905	scr_dump (fd);	3906	scr_erase_savelines ();
3906	close (fd);
3907	}	3907	}
3908	}	3908
3909	break;	3909	break;
3910	#endif	3910	#endif
3911	}	3911	}
3912	}	3912	}
3913	/----------------------------------------------------------------------/	3913	/----------------------------------------------------------------------/
…		…
4046	*/	4046	*/
4047	PrivMode (1, PrivMode_vt52);	4047	PrivMode (1, PrivMode_vt52);
4048	break;	4048	break;
4049	case 3: /* 80/132 */	4049	case 3: /* 80/132 */
4050	if (priv_modes & PrivMode_132OK)	4050	if (priv_modes & PrivMode_132OK)
4051	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4051	set_widthheight (((state ? 132 : 80) * fwidth), height);
4052	break;	4052	break;
4053	case 4: /* smooth scrolling */	4053	case 4: /* smooth scrolling */
4054	if (state)	4054	if (state)
4055	options &= ~Opt_jumpScroll;	4055	options &= ~Opt_jumpScroll;
4056	else	4056	else

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.200 by root, Sun Feb 20 19:45:30 2005 UTC vs. Revision 1.210 by root, Tue Dec 20 20:58:31 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 2005 UTC