[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.218 by root, Sat Dec 31 16:40:28 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 (!IN_RANGE_EXC (x, 0, ncol)
141	\|\| y < 0 \|\| y >= TermWin.nrow)	141	\|\| !IN_RANGE_EXC (y, 0, 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 = ROW(y - 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], x, y);
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--;
157	}	158	}
158
159	}	159	}
160	#endif	160	#endif
161		161
		162	void
		163	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
		164	{
162	#if ENABLE_OVERLAY	165	#if ENABLE_OVERLAY
163	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font f = (fs)[fs->find_font (ch)];	167	rxvt_font f = (fs)[fs->find_font (ch)];
168	wchar_t chr, alloc, ch2;	168	wchar_t chr, alloc, ch2, *fname;
169	int len;	169	int len;
170		170
		171	fname = rxvt_utf8towcs (f->name);
		172
171	#if ENABLE_COMBINING	173	# if ENABLE_COMBINING
172	if (IS_COMPOSE (ch))	174	if (IS_COMPOSE (ch))
173	{	175	{
174	len = rxvt_composite.expand (ch, 0);	176	len = rxvt_composite.expand (ch, 0);
175	alloc = chr = new wchar_t[len];	177	alloc = chr = new wchar_t[len];
176	rxvt_composite.expand (ch, chr);	178	rxvt_composite.expand (ch, chr);
177	}	179	}
178	else	180	else
179	#endif	181	# endif
180	{	182	{
181	ch2 = ch;	183	ch2 = ch;
182		184
183	alloc = 0;	185	alloc = 0;
184	chr = &ch2;	186	chr = &ch2;
185	len = 1;	187	len = 1;
186	}	188	}
187		189
188	int width = strlen (f->name);	190	char attr[80]; // plenty
189		191
190	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		193	(int)r,
		194	fgcolor_of (r), bgcolor_of (r),
		195	r & RS_Bold ? " bold" : "",
		196	r & RS_Italic ? " italic" : "",
		197	r & RS_Blink ? " blink" : "",
		198	r & RS_RVid ? " rvid" : "",
		199	r & RS_Uline ? " uline" : "",
		200	r & RS_Careful ? " careful" : "");
		201
		202	int width = wcswidth (fname, wcslen (fname));
		203
		204	max_it (width, 8+5); // for char + hey
		205	max_it (width, strlen (attr));
		206
		207	if (y >= 0)
		208	{
		209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		210	x = 0;
		211	}
		212
		213	scr_overlay_new (x, y, width, len + 2);
191		214
192	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193		216
194	for (int y = 0; y < len; y++)	217	for (int y = 0; y < len; y++)
195	{	218	{
…		…
198	ch = *chr++;	221	ch = *chr++;
199		222
200	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
201	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
202	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
203	#if !UNICODE3	226	# if !UNICODE3
204	if (ch >= 0x10000)	227	if (ch >= 0x10000)
205	ch = 0xfffd;	228	ch = 0xfffd;
206	#endif	229	# endif
207	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
208	scr_overlay_set (12, y, NOCHAR, r);	231	scr_overlay_set (12, y, NOCHAR, r);
209	}	232	}
210		233
		234	scr_overlay_set (0, len , attr);
211	scr_overlay_set (0, len, f->name);	235	scr_overlay_set (0, len + 1, fname);
212		236
		237	free (fname);
		238
213	#if ENABLE_COMBINING	239	# if ENABLE_COMBINING
214	if (alloc)	240	if (alloc)
215	delete [] alloc;	241	delete [] alloc;
216	#endif	242	# endif
217	}
218	#endif	243	#endif
		244	}
219		245
220	void	246	void
221	rxvt_term::commit_iso14755 ()	247	rxvt_term::commit_iso14755 ()
222	{	248	{
223	wchar_t ch[2];	249	wchar_t ch[2];
…		…
316		342
317	// the XOpenIM manpage lies about hardcoding the locale	343	// the XOpenIM manpage lies about hardcoding the locale
318	// at the point of XOpenIM, so temporarily switch locales	344	// at the point of XOpenIM, so temporarily switch locales
319	if (rs[Rs_imLocale])	345	if (rs[Rs_imLocale])
320	SET_LOCALE (rs[Rs_imLocale]);	346	SET_LOCALE (rs[Rs_imLocale]);
		347
321	// assume wchar_t == unicode or better	348	// assume wchar_t == unicode or better
322	len = XwcLookupString (Input_Context, &ev, wkbuf,	349	len = XwcLookupString (Input_Context, &ev, wkbuf,
323	KBUFSZ, &keysym, &status_return);	350	KBUFSZ, &keysym, &status_return);
		351
324	if (rs[Rs_imLocale])	352	if (rs[Rs_imLocale])
325	SET_LOCALE (locale);	353	SET_LOCALE (locale);
326		354
327	if (status_return == XLookupChars	355	if (status_return == XLookupChars
328	\|\| status_return == XLookupBoth)	356	\|\| status_return == XLookupBoth)
…		…
360	#ifdef KEYSYM_RESOURCE	388	#ifdef KEYSYM_RESOURCE
361	if (keyboard->dispatch (this, keysym, ev.state))	389	if (keyboard->dispatch (this, keysym, ev.state))
362	return;	390	return;
363	#endif	391	#endif
364		392
365	if (TermWin.saveLines)	393	if (saveLines)
366	{	394	{
367	#ifdef UNSHIFTED_SCROLLKEYS	395	#ifdef UNSHIFTED_SCROLLKEYS
368	if (!ctrl && !meta)	396	if (!ctrl && !meta)
369	#else	397	#else
370	if (IS_SCROLL_MOD)	398	if (IS_SCROLL_MOD)
371	#endif	399	#endif
372	{	400	{
373	int lnsppg;	401	int lnsppg;
374		402
375	#ifdef PAGING_CONTEXT_LINES	403	#ifdef PAGING_CONTEXT_LINES
376	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	404	lnsppg = nrow - PAGING_CONTEXT_LINES;
377	#else	405	#else
378	lnsppg = TermWin.nrow * 4 / 5;	406	lnsppg = nrow * 4 / 5;
379	#endif	407	#endif
380	if (keysym == XK_Prior)	408	if (keysym == XK_Prior)
381	{	409	{
382	scr_page (UP, lnsppg);	410	scr_page (UP, lnsppg);
383	return;	411	return;
…		…
839		867
840	if (len <= 0)	868	if (len <= 0)
841	return; /* not mapped */	869	return; /* not mapped */
842		870
843	if (options & Opt_scrollTtyKeypress)	871	if (options & Opt_scrollTtyKeypress)
844	if (TermWin.view_start)	872	if (view_start)
845	{	873	{
846	TermWin.view_start = 0;	874	view_start = 0;
847	want_refresh = 1;	875	want_refresh = 1;
848	}	876	}
849		877
850	/*	878	/*
851	* these modifications only affect the static keybuffer	879	* these modifications only affect the static keybuffer
…		…
1028	{	1056	{
1029	if (mouse_slip_wheel_speed == 0	1057	if (mouse_slip_wheel_speed == 0
1030	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1058	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031	: scr_page (UP, mouse_slip_wheel_speed))	1059	: scr_page (UP, mouse_slip_wheel_speed))
1032	{	1060	{
1033	if (TermWin.view_start == TermWin.nscrolled \|\|	1061	if (view_start == nsaved \|\|
1034	TermWin.view_start == 0)	1062	view_start == 0)
1035	mouse_slip_wheel_speed = 0;	1063	mouse_slip_wheel_speed = 0;
1036		1064
1037	refresh_type \|= SMOOTH_REFRESH;	1065	refresh_type \|= SMOOTH_REFRESH;
1038	want_refresh = 1;	1066	want_refresh = 1;
1039	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1067	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
…		…
1061	if (n > 0)	1089	if (n > 0)
1062	{	1090	{
1063	cmdbuf_endp += n;	1091	cmdbuf_endp += n;
1064	return true;	1092	return true;
1065	}	1093	}
1066	else if (n < 0 && errno != EAGAIN)	1094	else if ((n < 0 && errno != EAGAIN && errno != EINTR) \|\| n == 0)
		1095	{
		1096	pty_ev.stop ();
		1097
		1098	if (!(options & Opt_hold))
1067	destroy ();	1099	destroy ();
		1100	}
1068		1101
1069	return false;	1102	return false;
1070	}	1103	}
1071		1104
1072	void	1105	void
…		…
1086	}	1119	}
1087		1120
1088	void	1121	void
1089	rxvt_term::pointer_unblank ()	1122	rxvt_term::pointer_unblank ()
1090	{	1123	{
1091	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1124	XDefineCursor (display->display, vt, TermWin_cursor);
1092	recolour_cursor ();	1125	recolour_cursor ();
1093		1126
1094	#ifdef POINTER_BLANK	1127	#ifdef POINTER_BLANK
1095	hidden_pointer = 0;	1128	hidden_pointer = 0;
1096		1129
…		…
1104	rxvt_term::pointer_blank ()	1137	rxvt_term::pointer_blank ()
1105	{	1138	{
1106	if (! (options & Opt_pointerBlank))	1139	if (! (options & Opt_pointerBlank))
1107	return;	1140	return;
1108		1141
1109	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);	1142	XDefineCursor (display->display, vt, display->blank_cursor);
1110	XFlush (display->display);	1143	XFlush (display->display);
1111		1144
1112	hidden_pointer = 1;	1145	hidden_pointer = 1;
1113	}	1146	}
1114		1147
…		…
1416	case FocusOut:	1449	case FocusOut:
1417	focus_out ();	1450	focus_out ();
1418	break;	1451	break;
1419		1452
1420	case ConfigureNotify:	1453	case ConfigureNotify:
1421	if (ev.xconfigure.window == TermWin.parent[0])	1454	if (ev.xconfigure.window == parent[0])
1422	{	1455	{
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));	1456	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1457	;
1432		1458
1433	if (szHint.width != width \|\| szHint.height != height)	1459	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1434	{	1460	{
1435	seen_resize = 1;	1461	seen_resize = 1;
1436	resize_all_windows (width, height, 1);	1462	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437	}	1463	}
1438		1464
1439	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1465	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440	if (options & Opt_transparent)	1466	if (options & Opt_transparent)
1441	check_our_parents ();	1467	check_our_parents ();
…		…
1462	case SelectionRequest:	1488	case SelectionRequest:
1463	selection_send (ev.xselectionrequest);	1489	selection_send (ev.xselectionrequest);
1464	break;	1490	break;
1465		1491
1466	case UnmapNotify:	1492	case UnmapNotify:
1467	TermWin.mapped = 0;	1493	mapped = 0;
1468	#ifdef TEXT_BLINK	1494	#ifdef TEXT_BLINK
1469	text_blink_ev.stop ();	1495	text_blink_ev.stop ();
1470	#endif	1496	#endif
1471	break;	1497	break;
1472		1498
1473	case MapNotify:	1499	case MapNotify:
1474	TermWin.mapped = 1;	1500	mapped = 1;
1475	#ifdef TEXT_BLINK	1501	#ifdef TEXT_BLINK
1476	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1502	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477	#endif	1503	#endif
1478	break;	1504	break;
1479		1505
…		…
1483	break;	1509	break;
1484	#endif /* TRANSPARENT */	1510	#endif /* TRANSPARENT */
1485		1511
1486	case GraphicsExpose:	1512	case GraphicsExpose:
1487	case Expose:	1513	case Expose:
1488	if (ev.xany.window == TermWin.vt)	1514	if (ev.xany.window == vt)
1489	{	1515	{
1490	do	1516	do
1491	scr_expose (ev.xexpose.x, ev.xexpose.y,	1517	scr_expose (ev.xexpose.x, ev.xexpose.y,
1492	ev.xexpose.width, ev.xexpose.height, False);	1518	ev.xexpose.width, ev.xexpose.height, False);
1493	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));	1519	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494		1520
1495	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496		1522
1497	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))	1523	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498	scr_expose (ev.xexpose.x, ev.xexpose.y,	1524	scr_expose (ev.xexpose.x, ev.xexpose.y,
1499	ev.xexpose.width, ev.xexpose.height, False);	1525	ev.xexpose.width, ev.xexpose.height, False);
1500		1526
1501	scr_refresh (refresh_type);	1527	scr_refresh (refresh_type);
1502	}	1528	}
…		…
1518	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1544	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519	menubar_expose ();	1545	menubar_expose ();
1520	#endif	1546	#endif
1521		1547
1522	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1523	if (am_transparent && ev.xany.window == TermWin.parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1524	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (disp, ev.xany.window);
1525	#endif	1551	#endif
1526	}	1552	}
1527	break;	1553	break;
1528		1554
…		…
1539	}	1565	}
1540	#endif	1566	#endif
1541	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1567	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542	break;	1568	break;
1543		1569
1544	if (ev.xany.window == TermWin.vt)	1570	if (ev.xany.window == vt)
1545	{	1571	{
1546	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1572	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1547	{	1573	{
1548	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))	1574	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549	;	1575	;
1550		1576
1551	XQueryPointer (disp, TermWin.vt,	1577	XQueryPointer (disp, vt,
1552	&unused_root, &unused_child,	1578	&unused_root, &unused_child,
1553	&unused_root_x, &unused_root_y,	1579	&unused_root_x, &unused_root_y,
1554	&ev.xbutton.x, &ev.xbutton.y,	1580	&ev.xbutton.x, &ev.xbutton.y,
1555	&ev.xbutton.state);	1581	&ev.xbutton.state);
1556	#ifdef MOUSE_THRESHOLD	1582	#ifdef MOUSE_THRESHOLD
…		…
1568	#endif	1594	#endif
1569	selection_extend (ev.xbutton.x, ev.xbutton.y,	1595	selection_extend (ev.xbutton.x, ev.xbutton.y,
1570	ev.xbutton.state & Button3Mask ? 2 : 0);	1596	ev.xbutton.state & Button3Mask ? 2 : 0);
1571		1597
1572	#ifdef SELECTION_SCROLLING	1598	#ifdef SELECTION_SCROLLING
1573	if (ev.xbutton.y < TermWin.int_bwidth	1599	if (ev.xbutton.y < int_bwidth
1574	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1600	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1575	{	1601	{
1576	int dist;	1602	int dist;
1577		1603
1578	/* don't clobber the current delay if we are	1604	/* don't clobber the current delay if we are
1579	* already in the middle of scrolling.	1605	* already in the middle of scrolling.
…		…
1587	selection_save_x = ev.xbutton.x;	1613	selection_save_x = ev.xbutton.x;
1588	selection_save_y = ev.xbutton.y;	1614	selection_save_y = ev.xbutton.y;
1589	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1615	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590		1616
1591	/* calc number of lines to scroll */	1617	/* calc number of lines to scroll */
1592	if (ev.xbutton.y < TermWin.int_bwidth)	1618	if (ev.xbutton.y < int_bwidth)
1593	{	1619	{
1594	scroll_selection_dir = UP;	1620	scroll_selection_dir = UP;
1595	dist = TermWin.int_bwidth - ev.xbutton.y;	1621	dist = int_bwidth - ev.xbutton.y;
1596	}	1622	}
1597	else	1623	else
1598	{	1624	{
1599	scroll_selection_dir = DN;	1625	scroll_selection_dir = DN;
1600	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1626	dist = ev.xbutton.y - (int_bwidth + height);
1601	}	1627	}
1602		1628
1603	scroll_selection_lines = Pixel2Height (dist)	1629	scroll_selection_lines = Pixel2Height (dist)
1604	/ SELECTION_SCROLL_LINE_SPEEDUP	1630	/ SELECTION_SCROLL_LINE_SPEEDUP
1605	+ 1;	1631	+ 1;
1606	MIN_IT (scroll_selection_lines,	1632	min_it (scroll_selection_lines,
1607	SELECTION_SCROLL_MAX_LINES);	1633	SELECTION_SCROLL_MAX_LINES);
1608	}	1634	}
1609	else	1635	else
1610	{	1636	{
1611	/* we are within the text window, so we	1637	/* we are within the text window, so we
…		…
1642	}	1668	}
1643		1669
1644	void	1670	void
1645	rxvt_term::focus_in ()	1671	rxvt_term::focus_in ()
1646	{	1672	{
1647	if (!TermWin.focus)	1673	if (!focus)
1648	{	1674	{
1649	TermWin.focus = 1;	1675	focus = 1;
1650	want_refresh = 1;	1676	want_refresh = 1;
1651	#ifdef USE_XIM	1677	#if USE_XIM
1652	if (Input_Context != NULL)	1678	if (Input_Context != NULL)
1653	{	1679	{
1654	IMSetStatusPosition ();	1680	IMSetStatusPosition ();
1655	XSetICFocus (Input_Context);	1681	XSetICFocus (Input_Context);
1656	}	1682	}
1657	#endif	1683	#endif
1658	#ifdef CURSOR_BLINK	1684	#if CURSOR_BLINK
1659	if (options & Opt_cursorBlink)	1685	if (options & Opt_cursorBlink)
1660	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1686	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661	#endif	1687	#endif
1662	#ifdef OFF_FOCUS_FADING	1688	#if OFF_FOCUS_FADING
1663	if (rs[Rs_fade])	1689	if (rs[Rs_fade])
1664	{	1690	{
1665	pix_colors = pix_colors_focused;	1691	pix_colors = pix_colors_focused;
1666	scr_recolour ();	1692	scr_recolour ();
1667	}	1693	}
…		…
1670	}	1696	}
1671		1697
1672	void	1698	void
1673	rxvt_term::focus_out ()	1699	rxvt_term::focus_out ()
1674	{	1700	{
1675	if (TermWin.focus)	1701	if (focus)
1676	{	1702	{
1677	TermWin.focus = 0;	1703	focus = 0;
1678	want_refresh = 1;	1704	want_refresh = 1;
1679		1705
1680	#if ENABLE_FRILLS \|\| ISO_14755	1706	#if ENABLE_FRILLS \|\| ISO_14755
1681	iso14755buf = 0;	1707	iso14755buf = 0;
1682	#endif	1708	#endif
1683	#if ENABLE_OVERLAY	1709	#if ENABLE_OVERLAY
1684	scr_overlay_off ();	1710	scr_overlay_off ();
1685	#endif	1711	#endif
1686	#ifdef USE_XIM	1712	#if USE_XIM
1687	if (Input_Context != NULL)	1713	if (Input_Context != NULL)
1688	XUnsetICFocus (Input_Context);	1714	XUnsetICFocus (Input_Context);
1689	#endif	1715	#endif
1690	#ifdef CURSOR_BLINK	1716	#if CURSOR_BLINK
1691	if (options & Opt_cursorBlink)	1717	if (options & Opt_cursorBlink)
1692	cursor_blink_ev.stop ();	1718	cursor_blink_ev.stop ();
1693	hidden_cursor = 0;	1719	hidden_cursor = 0;
1694	#endif	1720	#endif
1695	#ifdef OFF_FOCUS_FADING	1721	#if OFF_FOCUS_FADING
1696	if (rs[Rs_fade])	1722	if (rs[Rs_fade])
1697	{	1723	{
1698	pix_colors = pix_colors_unfocused;	1724	pix_colors = pix_colors_unfocused;
1699	scr_recolour ();	1725	scr_recolour ();
1700	}	1726	}
…		…
1739	reportmode = !! (priv_modes & PrivMode_mouse_report);	1765	reportmode = !! (priv_modes & PrivMode_mouse_report);
1740		1766
1741	/*	1767	/*
1742	* VT window processing of button press	1768	* VT window processing of button press
1743	*/	1769	*/
1744	if (ev.window == TermWin.vt)	1770	if (ev.window == vt)
1745	{	1771	{
1746	#if ISO_14755	1772	#if ISO_14755
1747	// 5.4	1773	// 5.4
1748	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1774	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1749	{	1775	{
…		…
1954	case Button3:	1980	case Button3:
1955	if (scrollBar.style != R_SB_XTERM)	1981	if (scrollBar.style != R_SB_XTERM)
1956	{	1982	{
1957	if (scrollbar_above_slider (ev.y))	1983	if (scrollbar_above_slider (ev.y))
1958	# ifdef RXVT_SCROLL_FULL	1984	# ifdef RXVT_SCROLL_FULL
1959	scr_page (UP, TermWin.nrow - 1);	1985	scr_page (UP, nrow - 1);
1960	# else	1986	# else
1961	scr_page (UP, TermWin.nrow / 4);	1987	scr_page (UP, nrow / 4);
1962	# endif	1988	# endif
1963	else if (scrollbar_below_slider (ev.y))	1989	else if (scrollbar_below_slider (ev.y))
1964	# ifdef RXVT_SCROLL_FULL	1990	# ifdef RXVT_SCROLL_FULL
1965	scr_page (DN, TermWin.nrow - 1);	1991	scr_page (DN, nrow - 1);
1966	# else	1992	# else
1967	scr_page (DN, TermWin.nrow / 4);	1993	scr_page (DN, nrow / 4);
1968	# endif	1994	# endif
1969	else	1995	else
1970	scrollBar.setMotion ();	1996	scrollBar.setMotion ();
1971	}	1997	}
1972	else	1998	else
1973	{	1999	{
1974	scr_page ((ev.button == Button1 ? DN : UP),	2000	scr_page ((ev.button == Button1 ? DN : UP),
1975	(TermWin.nrow	2001	(nrow
1976	* scrollbar_position (ev.y)	2002	* scrollbar_position (ev.y)
1977	/ scrollbar_size ()));	2003	/ scrollbar_size ()));
1978	}	2004	}
1979		2005
1980	break;	2006	break;
…		…
2012	#ifdef SELECTION_SCROLLING	2038	#ifdef SELECTION_SCROLLING
2013	if (sel_scroll_ev.active)	2039	if (sel_scroll_ev.active)
2014	sel_scroll_ev.stop();	2040	sel_scroll_ev.stop();
2015	#endif	2041	#endif
2016		2042
2017	if (ev.window == TermWin.vt)	2043	if (ev.window == vt)
2018	{	2044	{
2019	#if ISO_14755	2045	#if ISO_14755
2020	// 5.4	2046	// 5.4
2021	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2047	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2022	return;	2048	return;
…		…
2073	v = ev.button == Button4 ? UP : DN;	2099	v = ev.button == Button4 ? UP : DN;
2074		2100
2075	if (ev.state & ShiftMask)	2101	if (ev.state & ShiftMask)
2076	i = 1;	2102	i = 1;
2077	else if (options & Opt_mouseWheelScrollPage)	2103	else if (options & Opt_mouseWheelScrollPage)
2078	i = TermWin.nrow - 1;	2104	i = nrow - 1;
2079	else	2105	else
2080	i = 5;	2106	i = 5;
2081		2107
2082	# ifdef MOUSE_SLIP_WHEELING	2108	# ifdef MOUSE_SLIP_WHEELING
2083	if (ev.state & ControlMask)	2109	if (ev.state & ControlMask)
2084	{	2110	{
2085	mouse_slip_wheel_speed += v ? -1 : 1;	2111	mouse_slip_wheel_speed += v ? -1 : 1;
2086	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2112	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;	2113	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088		2114
2089	if (slip_wheel_ev.at < NOW)	2115	if (slip_wheel_ev.at < NOW)
2090	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2116	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091		2117
2092	slip_wheel_ev.start ();	2118	slip_wheel_ev.start ();
…		…
2374	return pchanged; /* Don't try any more */	2400	return pchanged; /* Don't try any more */
2375		2401
2376	XGetWindowAttributes (disp, display->root, &wrootattr);	2402	XGetWindowAttributes (disp, display->root, &wrootattr);
2377	rootdepth = wrootattr.depth;	2403	rootdepth = wrootattr.depth;
2378		2404
2379	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	2405	XGetWindowAttributes (disp, parent[0], &wattr);
2380		2406
2381	if (rootdepth != wattr.depth)	2407	if (rootdepth != wattr.depth)
2382	{	2408	{
2383	if (am_transparent)	2409	if (am_transparent)
2384	{	2410	{
2385	pchanged = 1;	2411	pchanged = 1;
2386	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2412	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387	am_transparent = am_pixmap_trans = 0;	2413	am_transparent = am_pixmap_trans = 0;
2388	}	2414	}
2389		2415
2390	return pchanged; /* Don't try any more */	2416	return pchanged; /* Don't try any more */
2391	}	2417	}
…		…
2432	Window cr;	2458	Window cr;
2433	XImage *image;	2459	XImage *image;
2434	GC gc;	2460	GC gc;
2435	XGCValues gcvalue;	2461	XGCValues gcvalue;
2436		2462
2437	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	2463	XTranslateCoordinates (disp, parent[0], display->root,
2438	0, 0, &sx, &sy, &cr);	2464	0, 0, &sx, &sy, &cr);
2439	nw = (unsigned int)szHint.width;	2465	nw = (unsigned int)szHint.width;
2440	nh = (unsigned int)szHint.height;	2466	nh = (unsigned int)szHint.height;
2441	nx = ny = 0;	2467	nx = ny = 0;
2442		2468
…		…
2452	nh += sy;	2478	nh += sy;
2453	ny = -sy;	2479	ny = -sy;
2454	sy = 0;	2480	sy = 0;
2455	}	2481	}
2456		2482
2457	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2483	min_it (nw, (unsigned int) (wrootattr.width - sx));
2458	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2484	min_it (nh, (unsigned int) (wrootattr.height - sy));
2459		2485
2460	XSync (disp, False);	2486	XSync (disp, False);
2461	allowedxerror = -1;	2487	allowedxerror = -1;
2462	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2488	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463		2489
…		…
2468	if (image == NULL)	2494	if (image == NULL)
2469	{	2495	{
2470	if (am_transparent && am_pixmap_trans)	2496	if (am_transparent && am_pixmap_trans)
2471	{	2497	{
2472	pchanged = 1;	2498	pchanged = 1;
2473	if (TermWin.pixmap != None)	2499	if (pixmap != None)
2474	{	2500	{
2475	XFreePixmap (disp, TermWin.pixmap);	2501	XFreePixmap (disp, pixmap);
2476	TermWin.pixmap = None;	2502	pixmap = None;
2477	}	2503	}
2478	}	2504	}
2479		2505
2480	am_pixmap_trans = 0;	2506	am_pixmap_trans = 0;
2481	}	2507	}
2482	else	2508	else
2483	{	2509	{
2484	if (TermWin.pixmap != None)	2510	if (pixmap != None)
2485	XFreePixmap (disp, TermWin.pixmap);	2511	XFreePixmap (disp, pixmap);
2486		2512
2487	#if TINTING	2513	#if TINTING
2488	if (ISSET_PIXCOLOR (Color_tint))	2514	if (ISSET_PIXCOLOR (Color_tint))
2489	{	2515	{
2490	unsigned short rm, gm, bm;	2516	unsigned short rm, gm, bm;
…		…
2494		2520
2495	ShadeXImage (display, image, shade, rm, gm, bm);	2521	ShadeXImage (display, image, shade, rm, gm, bm);
2496	}	2522	}
2497	#endif	2523	#endif
2498		2524
2499	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,	2525	pixmap = XCreatePixmap (disp, vt,
2500	szHint.width, szHint.height, image->depth);	2526	szHint.width, szHint.height, image->depth);
2501	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);	2527	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,	2528	XPutImage (disp, pixmap, gc, image, 0, 0,
2503	nx, ny, image->width, image->height);	2529	nx, ny, image->width, image->height);
2504	XFreeGC (disp, gc);	2530	XFreeGC (disp, gc);
2505	XDestroyImage (image);	2531	XDestroyImage (image);
2506	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);	2532	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507	XClearWindow (disp, TermWin.parent[0]);	2533	XClearWindow (disp, parent[0]);
2508		2534
2509	if (!am_transparent \|\| !am_pixmap_trans)	2535	if (!am_transparent \|\| !am_pixmap_trans)
2510	pchanged = 1;	2536	pchanged = 1;
2511		2537
2512	am_transparent = am_pixmap_trans = 1;	2538	am_transparent = am_pixmap_trans = 1;
2513	}	2539	}
2514	}	2540	}
2515		2541
2516	if (am_pixmap_trans)	2542	if (am_pixmap_trans)
2517	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2543	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518	else	2544	else
2519	{	2545	{
2520	unsigned int n;	2546	unsigned int n;
2521	/*	2547	/*
2522	* InheritPixmap transparency	2548	* InheritPixmap transparency
2523	*/	2549	*/
2524	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2550	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525	{	2551	{
2526	oldp = TermWin.parent[i];	2552	oldp = parent[i];
2527	XQueryTree (disp, TermWin.parent[i - 1], &root,	2553	XQueryTree (disp, parent[i - 1], &root,
2528	&TermWin.parent[i], &list, &n);	2554	&parent[i], &list, &n);
2529	XFree (list);	2555	XFree (list);
2530		2556
2531	if (TermWin.parent[i] == display->root)	2557	if (parent[i] == display->root)
2532	{	2558	{
2533	if (oldp != None)	2559	if (oldp != None)
2534	pchanged = 1;	2560	pchanged = 1;
2535		2561
2536	break;	2562	break;
2537	}	2563	}
2538		2564
2539	if (oldp != TermWin.parent[i])	2565	if (oldp != parent[i])
2540	pchanged = 1;	2566	pchanged = 1;
2541	}	2567	}
2542		2568
2543	n = 0;	2569	n = 0;
2544		2570
2545	if (pchanged)	2571	if (pchanged)
2546	{	2572	{
2547	for (; n < (unsigned int)i; n++)	2573	for (; n < (unsigned int)i; n++)
2548	{	2574	{
2549	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);	2575	XGetWindowAttributes (disp, parent[n], &wattr);
2550	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2576	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2551	{	2577	{
2552	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2578	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553	break;	2579	break;
2554	}	2580	}
2555	}	2581	}
2556	}	2582	}
2557		2583
2558	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2584	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559	{	2585	{
2560	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);	2586	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2587	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562	am_transparent = 0;	2588	am_transparent = 0;
2563	/* XXX: also turn off Opt_transparent? */	2589	/* XXX: also turn off Opt_transparent? */
2564	}	2590	}
2565	else	2591	else
2566	{	2592	{
…		…
2569	* needed for fvwm2.2.2 (and before?) */	2595	* needed for fvwm2.2.2 (and before?) */
2570	sleep (1);	2596	sleep (1);
2571	#endif	2597	#endif
2572	for (n = 0; n < (unsigned int)i; n++)	2598	for (n = 0; n < (unsigned int)i; n++)
2573	{	2599	{
2574	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);	2600	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575	XClearWindow (disp, TermWin.parent[n]);	2601	XClearWindow (disp, parent[n]);
2576	}	2602	}
2577		2603
2578	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2604	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579	am_transparent = 1;	2605	am_transparent = 1;
2580	}	2606	}
2581		2607
2582	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2608	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583	TermWin.parent[i] = None;	2609	parent[i] = None;
2584	}	2610	}
2585		2611
2586	if (scrollBar.win)	2612	if (scrollBar.win)
2587	{	2613	{
2588	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2614	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
…		…
2640	/* Read a text string from the input buffer */	2666	/* Read a text string from the input buffer */
2641	unicode_t buf[UBUFSIZ];	2667	unicode_t buf[UBUFSIZ];
2642	bool refreshnow = false;	2668	bool refreshnow = false;
2643	int nlines = 0;	2669	int nlines = 0;
2644	unicode_t *str = buf;	2670	unicode_t *str = buf;
		2671	unicode_t *eol = str + min (ncol, UBUFSIZ);
2645		2672
2646	for (;;)	2673	for (;;)
2647	{	2674	{
2648	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2675	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649	break;	2676	break;
2650		2677
2651	*str++ = ch;	2678	*str++ = ch;
2652		2679
2653	if (ch == C0_LF)	2680	if (ch == C0_LF \|\| str >= eol)
2654	{	2681	{
		2682	if (ch == C0_LF)
2655	nlines++;	2683	nlines++;
		2684
2656	refresh_count++;	2685	refresh_count++;
2657		2686
2658	if (!(options & Opt_jumpScroll)	2687	if (!(options & Opt_jumpScroll)
2659	\|\| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2688	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2660	{	2689	{
2661	refreshnow = true;	2690	refreshnow = true;
2662	ch = NOCHAR;	2691	ch = NOCHAR;
2663	break;	2692	break;
2664	}	2693	}
2665		2694
2666	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2695	// scr_add_lines only works for nlines <= nrow - 1.
2667	if (nlines >= TermWin.nrow - 1)	2696	if (nlines >= nrow - 1)
2668	{	2697	{
2669	scr_add_lines (buf, nlines, str - buf);	2698	scr_add_lines (buf, nlines, str - buf);
2670	nlines = 0;	2699	nlines = 0;
2671	str = buf;	2700	str = buf;
		2701	eol = str + min (ncol, UBUFSIZ);
2672	}	2702	}
2673	}
2674		2703
2675	if (str >= buf + UBUFSIZ)	2704	if (str >= eol)
2676	{	2705	{
		2706	if (eol >= buf + UBUFSIZ)
		2707	{
2677	ch = NOCHAR;	2708	ch = NOCHAR;
2678	break;	2709	break;
		2710	}
		2711	else
		2712	eol = min (eol + ncol, buf + UBUFSIZ);
		2713	}
		2714
2679	}	2715	}
2680		2716
2681	seq_begin = cmdbuf_ptr;	2717	seq_begin = cmdbuf_ptr;
2682	ch = next_char ();	2718	ch = next_char ();
2683	}	2719	}
…		…
3342		3378
3343	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3379	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344	arg[0] = -arg[0];	3380	arg[0] = -arg[0];
3345	/* FALLTHROUGH */	3381	/* FALLTHROUGH */
3346	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3382	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3383	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348	break;	3384	break;
3349		3385
3350	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3386	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351	tt_write ((const unsigned char *)VT100_ANS,	3387	tt_write ((const unsigned char *)VT100_ANS,
3352	(unsigned int) (sizeof (VT100_ANS) - 1));	3388	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3477	{	3513	{
3478	/*	3514	/*
3479	* commands	3515	* commands
3480	*/	3516	*/
3481	case 1: /* deiconify window */	3517	case 1: /* deiconify window */
3482	XMapWindow (disp, TermWin.parent[0]);	3518	XMapWindow (disp, parent[0]);
3483	break;	3519	break;
3484	case 2: /* iconify window */	3520	case 2: /* iconify window */
3485	XIconifyWindow (disp, TermWin.parent[0], display->screen);	3521	XIconifyWindow (disp, parent[0], display->screen);
3486	break;	3522	break;
3487	case 3: /* set position (pixels) */	3523	case 3: /* set position (pixels) */
3488	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);	3524	XMoveWindow (disp, parent[0], args[1], args[2]);
3489	break;	3525	break;
3490	case 4: /* set size (pixels) */	3526	case 4: /* set size (pixels) */
3491	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3527	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492	break;	3528	break;
3493	case 5: /* raise window */	3529	case 5: /* raise window */
3494	XRaiseWindow (disp, TermWin.parent[0]);	3530	XRaiseWindow (disp, parent[0]);
3495	break;	3531	break;
3496	case 6: /* lower window */	3532	case 6: /* lower window */
3497	XLowerWindow (disp, TermWin.parent[0]);	3533	XLowerWindow (disp, parent[0]);
3498	break;	3534	break;
3499	case 7: /* refresh window */	3535	case 7: /* refresh window */
3500	scr_touch (true);	3536	scr_touch (true);
3501	break;	3537	break;
3502	case 8: /* set size (chars) */	3538	case 8: /* set size (chars) */
3503	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3539	set_widthheight ((unsigned int) (args[2] * fwidth),
3504	(unsigned int) (args[1] * TermWin.fheight));	3540	(unsigned int) (args[1] * fheight));
3505	break;	3541	break;
3506		3542
3507	//case 9: NYI, TODO, restore maximized window or maximize window	3543	//case 9: NYI, TODO, restore maximized window or maximize window
3508	default:	3544	default:
3509	if (args[0] >= 24) /* set height (chars) */	3545	if (args[0] >= 24) /* set height (chars) */
3510	set_widthheight ((unsigned int)TermWin.width,	3546	set_widthheight ((unsigned int)width,
3511	(unsigned int) (args[1] * TermWin.fheight));	3547	(unsigned int) (args[1] * fheight));
3512	break;	3548	break;
3513		3549
3514		3550
3515	/*	3551	/*
3516	* reports - some output format copied from XTerm	3552	* reports - some output format copied from XTerm
3517	*/	3553	*/
3518	case 11: /* report window state */	3554	case 11: /* report window state */
3519	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3555	XGetWindowAttributes (disp, parent[0], &wattr);
3520	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3556	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521	break;	3557	break;
3522	case 13: /* report window position */	3558	case 13: /* report window position */
3523	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3559	XGetWindowAttributes (disp, parent[0], &wattr);
3524	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,	3560	XTranslateCoordinates (disp, parent[0], wattr.root,
3525	-wattr.border_width, -wattr.border_width,	3561	-wattr.border_width, -wattr.border_width,
3526	&x, &y, &wdummy);	3562	&x, &y, &wdummy);
3527	tt_printf ("\033[3;%d;%dt", x, y);	3563	tt_printf ("\033[3;%d;%dt", x, y);
3528	break;	3564	break;
3529	case 14: /* report window size (pixels) */	3565	case 14: /* report window size (pixels) */
3530	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3566	XGetWindowAttributes (disp, parent[0], &wattr);
3531	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3567	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532	break;	3568	break;
3533	case 18: /* report text area size (chars) */	3569	case 18: /* report text area size (chars) */
3534	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3570	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535	break;	3571	break;
3536	case 19: /* report window size (chars) */	3572	case 19: /* report window size (chars) */
3537	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3573	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538	break;	3574	break;
3539	case 20: /* report icon label */	3575	case 20: /* report icon label */
3540	{	3576	{
3541	char *s;	3577	char *s;
3542	XGetIconName (disp, TermWin.parent[0], &s);	3578	XGetIconName (disp, parent[0], &s);
3543	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3579	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3544	XFree (s);	3580	XFree (s);
3545	}	3581	}
3546	break;	3582	break;
3547	case 21: /* report window title */	3583	case 21: /* report window title */
3548	{	3584	{
3549	char *s;	3585	char *s;
3550	XFetchName (disp, TermWin.parent[0], &s);	3586	XFetchName (disp, parent[0], &s);
3551	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3587	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3552	XFree (s);	3588	XFree (s);
3553	}	3589	}
3554	break;	3590	break;
3555	}	3591	}
…		…
3588	else if (ch < 0x20)	3624	else if (ch < 0x20)
3589	return NULL; /* other control character - exit */	3625	return NULL; /* other control character - exit */
3590		3626
3591	seen_esc = false;	3627	seen_esc = false;
3592		3628
3593	if (n >= sizeof (string) - 1)	3629	if (n >= STRING_MAX - 1)
3594	// stop at some sane length	3630	// stop at some sane length
3595	return NULL;	3631	return NULL;
3596		3632
3597	if (ch == C0_SYN)	3633	if (ch == C0_SYN)
3598	string[n++] = cmd_get8 ();	3634	string[n++] = cmd_get8 ();
…		…
3666	set_window_color (color, str);	3702	set_window_color (color, str);
3667	}	3703	}
3668		3704
3669	/*	3705	/*
3670	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3706	* 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	*/	3707	*/
3694	void	3708	void
3695	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3709	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3696	{	3710	{
3697	int changed = 0;	3711	int changed = 0;
…		…
3723	unsigned long bytes_after;	3737	unsigned long bytes_after;
3724	unsigned char *value = 0;	3738	unsigned char *value = 0;
3725	const char *str = "";	3739	const char *str = "";
3726		3740
3727	if (prop	3741	if (prop
3728	&& XGetWindowProperty (disp, TermWin.parent[0],	3742	&& XGetWindowProperty (disp, parent[0],
3729	prop, 0, 1<<16, 0, AnyPropertyType,	3743	prop, 0, 1<<16, 0, AnyPropertyType,
3730	&actual_type, &actual_format,	3744	&actual_type, &actual_format,
3731	&nitems, &bytes_after, &value) == Success	3745	&nitems, &bytes_after, &value) == Success
3732	&& actual_type != None	3746	&& actual_type != None
3733	&& actual_format == 8)	3747	&& actual_format == 8)
…		…
3745	{	3759	{
3746	*eq = 0;	3760	*eq = 0;
3747	set_utf8_property (display->atom (str), eq + 1);	3761	set_utf8_property (display->atom (str), eq + 1);
3748	}	3762	}
3749	else	3763	else
3750	XDeleteProperty (disp, TermWin.parent[0],	3764	XDeleteProperty (disp, parent[0],
3751	display->atom (str));	3765	display->atom (str));
3752	}	3766	}
3753	break;	3767	break;
3754		3768
3755	case XTerm_Color:	3769	case XTerm_Color:
…		…
3796	break;	3810	break;
3797	#ifndef NO_BOLD_UNDERLINE_REVERSE	3811	#ifndef NO_BOLD_UNDERLINE_REVERSE
3798	case XTerm_Color_BD:	3812	case XTerm_Color_BD:
3799	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3813	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3800	break;	3814	break;
3801	case XTerm_Color_IT:
3802	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3803	break;
3804	case XTerm_Color_UL:	3815	case XTerm_Color_UL:
3805	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3816	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3806	break;	3817	break;
3807	case XTerm_Color_RV:	3818	case XTerm_Color_RV:
3808	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3819	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3809	break;	3820	break;
		3821	case URxvt_Color_IT:
		3822	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3823	break;
3810	#endif	3824	#endif
3811	#if TRANSPARENT && TINTING	3825	#if TRANSPARENT && TINTING
3812	case XTerm_Color_tint:	3826	case URxvt_Color_tint:
3813	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3827	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3814	check_our_parents ();	3828	check_our_parents ();
3815	if (am_transparent)	3829	if (am_transparent)
3816	want_full_refresh = want_refresh = 1;	3830	want_full_refresh = want_refresh = 1;
3817	break;	3831	break;
3818	#endif	3832	#endif
…		…
3852		3866
3853	case XTerm_logfile:	3867	case XTerm_logfile:
3854	// TODO, when secure mode?	3868	// TODO, when secure mode?
3855	break;	3869	break;
3856		3870
		3871	#ifdef MENUBAR
		3872	case URxvt_Menu:
		3873	if (options & Opt_insecure)
		3874	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3875	break;
		3876	#endif
		3877	#if 0
		3878	case XTerm_dumpscreen: /* no error notices */
		3879	{
		3880	int fd;
		3881	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
		3882	{
		3883	scr_dump (fd);
		3884	close (fd);
		3885	}
		3886	}
		3887	break;
		3888	#endif
3857	case XTerm_font:	3889	case XTerm_font:
3858	op = URxvt_font;	3890	op = URxvt_font;
3859	case URxvt_font:	3891	case URxvt_font:
3860	#if ENABLE_STYLES	3892	#if ENABLE_STYLES
3861	case URxvt_boldFont:	3893	case URxvt_boldFont:
3862	case URxvt_italicFont:	3894	case URxvt_italicFont:
3863	case URxvt_boldItalicFont:	3895	case URxvt_boldItalicFont:
3864	#endif	3896	#endif
3865	if (query)	3897	if (query)
3866	tt_printf ("\33]%d;%-.250s%c", saveop,	3898	tt_printf ("\33]%d;%-.250s%c", saveop,
3867	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3899	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3868	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3900	? fontset[op - URxvt_font]->fontdesc : "",
3869	resp);	3901	resp);
3870	else	3902	else
3871	{	3903	{
3872	const char *&res = rs[Rs_font + (op - URxvt_font)];	3904	const char *&res = rs[Rs_font + (op - URxvt_font)];
3873		3905
…		…
3876	set_fonts ();	3908	set_fonts ();
3877	}	3909	}
3878	break;	3910	break;
3879		3911
3880	#if ENABLE_FRILLS	3912	#if ENABLE_FRILLS
3881	case XTerm_locale:	3913	case URxvt_locale:
3882	if (query)	3914	if (query)
3883	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3915	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3884	else	3916	else
3885	{	3917	{
3886	set_locale (str);	3918	set_locale (str);
3887	pty.set_utf8_mode (enc_utf8);	3919	pty.set_utf8_mode (enc_utf8);
3888	init_xlocale ();	3920	init_xlocale ();
3889	}	3921	}
3890	break;	3922	break;
3891	#endif
3892		3923
3893	#ifdef MENUBAR	3924	case URxvt_view_up:
3894	case XTerm_Menu:	3925	case URxvt_view_down:
3895	if (options & Opt_insecure)	3926	int lines = atoi (str);
3896	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3927
3897	break;	3928	if (lines)
3898	#endif	3929	scr_page (op == URxvt_view_up ? UP : DN, lines);
3899	#if 0
3900	case XTerm_dumpscreen: /* no error notices */
3901	{	3930	else
3902	int fd;
3903	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3904	{	3931	{
3905	scr_dump (fd);	3932	scr_erase_savelines ();
3906	close (fd);
3907	}	3933	}
3908	}	3934
3909	break;	3935	break;
3910	#endif	3936	#endif
3911	}	3937	}
3912	}	3938	}
3913	/----------------------------------------------------------------------/	3939	/----------------------------------------------------------------------/
…		…
4046	*/	4072	*/
4047	PrivMode (1, PrivMode_vt52);	4073	PrivMode (1, PrivMode_vt52);
4048	break;	4074	break;
4049	case 3: /* 80/132 */	4075	case 3: /* 80/132 */
4050	if (priv_modes & PrivMode_132OK)	4076	if (priv_modes & PrivMode_132OK)
4051	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4077	set_widthheight (((state ? 132 : 80) * fwidth), height);
4052	break;	4078	break;
4053	case 4: /* smooth scrolling */	4079	case 4: /* smooth scrolling */
4054	if (state)	4080	if (state)
4055	options &= ~Opt_jumpScroll;	4081	options &= ~Opt_jumpScroll;
4056	else	4082	else
…		…
4373	}	4399	}
4374		4400
4375	memmove (v_buffer, v_buffer + written, v_buflen);	4401	memmove (v_buffer, v_buffer + written, v_buflen);
4376	}	4402	}
4377	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	4403	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4378	// original code just ignores this...	4404	pty_ev.set (EVENT_READ);
4379	destroy ();
4380	}	4405	}
4381		4406
4382	/----------------------- end-of-file (C source) -----------------------/	4407	/----------------------- end-of-file (C source) -----------------------/
4383		4408

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.218 by root, Sat Dec 31 16:40:28 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.218 by root, Sat Dec 31 16:40:28 2005 UTC