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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
52		52
53	#ifdef KEYSYM_RESOURCE	53	#ifdef KEYSYM_RESOURCE
54	# include "keyboard.h"	54	# include "keyboard.h"
55	#endif	55	#endif
56		56
57	#include <cwchar>
58	#include <csignal>	57	#include <csignal>
59		58
60	/----------------------------------------------------------------------/	59	/----------------------------------------------------------------------/
61		60
62	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
118	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
119	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
120	XK_Print, 0x2399,	119	XK_Print, 0x2399,
121		120
122	XK_space, 0x2423,	121	XK_space, 0x2423,
		122
		123	#ifdef XK_KP_Begin
		124	XK_KP_Prior, 0x21de,
		125	XK_KP_Next, 0x21df,
		126	XK_KP_Begin, 0x2320,
		127	XK_KP_Insert, 0x2380,
		128	XK_KP_Delete, 0x2326,
123	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
124	0,	131	0,
125	};	132	};
126		133
127	void	134	void
128	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
129	{	136	{
130	x = Pixel2Col (x);	137	x = Pixel2Col (x);
131	y = Pixel2Row (y);	138	y = Pixel2Row (y);
132		139
133	if (x < 0 \|\| x >= TermWin.ncol	140	if (!IN_RANGE_EXC (x, 0, ncol)
134	\|\| y < 0 \|\| y >= TermWin.nrow)	141	\|\| !IN_RANGE_EXC (y, 0, nrow))
135	return;	142	return;
136		143
137	for (;;)	144	for (;;)
138	{	145	{
139	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];
140		149
141	if (t != NOCHAR \|\| !x)	150	if (t != NOCHAR \|\| !x)
142	{	151	{
143	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	152	iso14755_51 (l.t[x], l.r[x]);
144	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145	iso14755buf = ISO_14755_54;	153	iso14755buf = ISO_14755_54;
146	break;	154	break;
147	}	155	}
148		156
149	x--;	157	x--;
150	}	158	}
151
152	}	159	}
153	#endif	160	#endif
154		161
155	#if ENABLE_OVERLAY	162	#if ENABLE_OVERLAY
156	void	163	void
157	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
158	{	165	{
159	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
160	rxvt_font f = (fs)[fs->find_font (ch)];	167	rxvt_font f = (fs)[fs->find_font (ch)];
161	wchar_t chr, alloc, ch2;	168	wchar_t chr, alloc, ch2, *fname;
162	int len;	169	int len;
		170
		171	fname = rxvt_utf8towcs (f->name);
163		172
164	#if ENABLE_COMBINING	173	#if ENABLE_COMBINING
165	if (IS_COMPOSE (ch))	174	if (IS_COMPOSE (ch))
166	{	175	{
167	len = rxvt_composite.expand (ch, 0);	176	len = rxvt_composite.expand (ch, 0);
…		…
176	alloc = 0;	185	alloc = 0;
177	chr = &ch2;	186	chr = &ch2;
178	len = 1;	187	len = 1;
179	}	188	}
180		189
181	int width = strlen (f->name);	190	int width = wcswidth (fname, wcslen (fname));
182		191
183	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	192	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
184		193
185	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	194	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186		195
…		…
199	#endif	208	#endif
200	scr_overlay_set (11, y, ch, r);	209	scr_overlay_set (11, y, ch, r);
201	scr_overlay_set (12, y, NOCHAR, r);	210	scr_overlay_set (12, y, NOCHAR, r);
202	}	211	}
203		212
204	scr_overlay_set (0, len, f->name);	213	scr_overlay_set (0, len, fname);
		214
		215	free (fname);
205		216
206	#if ENABLE_COMBINING	217	#if ENABLE_COMBINING
207	if (alloc)	218	if (alloc)
208	delete [] alloc;	219	delete [] alloc;
209	#endif	220	#endif
…		…
277	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	288	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278	* escape sequence to toggle the Keypad.	289	* escape sequence to toggle the Keypad.
279	*	290	*
280	* Always permit `shift' to override the current setting	291	* Always permit `shift' to override the current setting
281	*/	292	*/
282	shft = (ev.state & ShiftMask);	293	shft = ev.state & ShiftMask;
283	ctrl = (ev.state & ControlMask);	294	ctrl = ev.state & ControlMask;
284	meta = (ev.state & ModMetaMask);	295	meta = ev.state & ModMetaMask;
285		296
286	if (numlock_state \|\| (ev.state & ModNumLockMask))	297	if (numlock_state \|\| (ev.state & ModNumLockMask))
287	{	298	{
288	numlock_state = (ev.state & ModNumLockMask);	299	numlock_state = (ev.state & ModNumLockMask);
289	PrivMode ((!numlock_state), PrivMode_aplKP);	300	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
309		320
310	// the XOpenIM manpage lies about hardcoding the locale	321	// the XOpenIM manpage lies about hardcoding the locale
311	// at the point of XOpenIM, so temporarily switch locales	322	// at the point of XOpenIM, so temporarily switch locales
312	if (rs[Rs_imLocale])	323	if (rs[Rs_imLocale])
313	SET_LOCALE (rs[Rs_imLocale]);	324	SET_LOCALE (rs[Rs_imLocale]);
		325
314	// assume wchar_t == unicode or better	326	// assume wchar_t == unicode or better
315	len = XwcLookupString (Input_Context, &ev, wkbuf,	327	len = XwcLookupString (Input_Context, &ev, wkbuf,
316	KBUFSZ, &keysym, &status_return);	328	KBUFSZ, &keysym, &status_return);
		329
317	if (rs[Rs_imLocale])	330	if (rs[Rs_imLocale])
318	SET_LOCALE (locale);	331	SET_LOCALE (locale);
319		332
320	if (status_return == XLookupChars	333	if (status_return == XLookupChars
321	\|\| status_return == XLookupBoth)	334	\|\| status_return == XLookupBoth)
…		…
353	#ifdef KEYSYM_RESOURCE	366	#ifdef KEYSYM_RESOURCE
354	if (keyboard->dispatch (this, keysym, ev.state))	367	if (keyboard->dispatch (this, keysym, ev.state))
355	return;	368	return;
356	#endif	369	#endif
357		370
358	if (TermWin.saveLines)	371	if (saveLines)
359	{	372	{
360	#ifdef UNSHIFTED_SCROLLKEYS	373	#ifdef UNSHIFTED_SCROLLKEYS
361	if (!ctrl && !meta)	374	if (!ctrl && !meta)
362	#else	375	#else
363	if (IS_SCROLL_MOD)	376	if (IS_SCROLL_MOD)
364	#endif	377	#endif
365	{	378	{
366	int lnsppg;	379	int lnsppg;
367		380
368	#ifdef PAGING_CONTEXT_LINES	381	#ifdef PAGING_CONTEXT_LINES
369	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	382	lnsppg = nrow - PAGING_CONTEXT_LINES;
370	#else	383	#else
371	lnsppg = TermWin.nrow * 4 / 5;	384	lnsppg = nrow * 4 / 5;
372	#endif	385	#endif
373	if (keysym == XK_Prior)	386	if (keysym == XK_Prior)
374	{	387	{
375	scr_page (UP, lnsppg);	388	scr_page (UP, lnsppg);
376	return;	389	return;
…		…
513	else	526	else
514	strcpy (kbuf, key_backspace);	527	strcpy (kbuf, key_backspace);
515	break;	528	break;
516	#endif	529	#endif
517	#ifndef NO_DELETE_KEY	530	#ifndef NO_DELETE_KEY
		531	# ifdef XK_KP_Prior
		532	case XK_KP_Delete:
		533	/* allow shift to override */
		534	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		535	{
		536	strcpy (kbuf, "\033On");
		537	break;
		538	}
		539	/* FALLTHROUGH */
		540	# endif
518	case XK_Delete:	541	case XK_Delete:
519	strcpy (kbuf, key_delete);	542	strcpy (kbuf, key_delete);
520	break;	543	break;
521	#endif	544	#endif
522	case XK_Tab:	545	case XK_Tab:
…		…
625	#ifdef XK_KP_Begin	648	#ifdef XK_KP_Begin
626	case XK_KP_Begin:	649	case XK_KP_Begin:
627	strcpy (kbuf, "\033Ou");	650	strcpy (kbuf, "\033Ou");
628	break;	651	break;
629		652
630	case XK_KP_Insert:
631	strcpy (kbuf, "\033Op");
632	break;
633
634	case XK_KP_Delete:
635	strcpy (kbuf, "\033On");
636	break;
637	#endif	653	#endif
638	case XK_KP_F1: /* "\033OP" */	654	case XK_KP_F1: /* "\033OP" */
639	case XK_KP_F2: /* "\033OQ" */	655	case XK_KP_F2: /* "\033OQ" */
640	case XK_KP_F3: /* "\033OR" */	656	case XK_KP_F3: /* "\033OR" */
641	case XK_KP_F4: /* "\033OS" */	657	case XK_KP_F4: /* "\033OS" */
…		…
673	break;	689	break;
674		690
675	case XK_Find:	691	case XK_Find:
676	strcpy (kbuf, "\033[1~");	692	strcpy (kbuf, "\033[1~");
677	break;	693	break;
		694
		695	#ifdef XK_KP_End
		696	case XK_KP_Insert:
		697	/* allow shift to override */
		698	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		699	{
		700	strcpy (kbuf, "\033Op");
		701	break;
		702	}
		703	/* FALLTHROUGH */
		704	#endif
678	case XK_Insert:	705	case XK_Insert:
679	strcpy (kbuf, "\033[2~");	706	strcpy (kbuf, "\033[2~");
680	break;	707	break;
681	#ifdef DXK_Remove /* support for DEC remove like key */	708	#ifdef DXK_Remove /* support for DEC remove like key */
682	case DXK_Remove:	709	case DXK_Remove:
…		…
818		845
819	if (len <= 0)	846	if (len <= 0)
820	return; /* not mapped */	847	return; /* not mapped */
821		848
822	if (options & Opt_scrollTtyKeypress)	849	if (options & Opt_scrollTtyKeypress)
823	if (TermWin.view_start)	850	if (view_start)
824	{	851	{
825	TermWin.view_start = 0;	852	view_start = 0;
826	want_refresh = 1;	853	want_refresh = 1;
827	}	854	}
828		855
829	/*	856	/*
830	* these modifications only affect the static keybuffer	857	* these modifications only affect the static keybuffer
…		…
1007	{	1034	{
1008	if (mouse_slip_wheel_speed == 0	1035	if (mouse_slip_wheel_speed == 0
1009	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1036	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010	: scr_page (UP, mouse_slip_wheel_speed))	1037	: scr_page (UP, mouse_slip_wheel_speed))
1011	{	1038	{
1012	if (TermWin.view_start == TermWin.nscrolled \|\|	1039	if (view_start == nsaved \|\|
1013	TermWin.view_start == 0)	1040	view_start == 0)
1014	mouse_slip_wheel_speed = 0;	1041	mouse_slip_wheel_speed = 0;
1015		1042
1016	refresh_type \|= SMOOTH_REFRESH;	1043	refresh_type \|= SMOOTH_REFRESH;
1017	want_refresh = 1;	1044	want_refresh = 1;
1018	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1045	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
…		…
1040	if (n > 0)	1067	if (n > 0)
1041	{	1068	{
1042	cmdbuf_endp += n;	1069	cmdbuf_endp += n;
1043	return true;	1070	return true;
1044	}	1071	}
1045	else if (n < 0 && errno != EAGAIN)	1072	else if ((n < 0 && errno != EAGAIN && errno != EINTR) \|\| n == 0)
		1073	{
		1074	pty_ev.stop ();
		1075
		1076	if (!(options & Opt_hold))
1046	destroy ();	1077	destroy ();
		1078	}
1047		1079
1048	return false;	1080	return false;
1049	}	1081	}
1050		1082
1051	void	1083	void
…		…
1065	}	1097	}
1066		1098
1067	void	1099	void
1068	rxvt_term::pointer_unblank ()	1100	rxvt_term::pointer_unblank ()
1069	{	1101	{
1070	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1102	XDefineCursor (display->display, vt, TermWin_cursor);
1071	recolour_cursor ();	1103	recolour_cursor ();
1072		1104
1073	#ifdef POINTER_BLANK	1105	#ifdef POINTER_BLANK
1074	hidden_pointer = 0;	1106	hidden_pointer = 0;
1075		1107
…		…
1083	rxvt_term::pointer_blank ()	1115	rxvt_term::pointer_blank ()
1084	{	1116	{
1085	if (! (options & Opt_pointerBlank))	1117	if (! (options & Opt_pointerBlank))
1086	return;	1118	return;
1087		1119
1088	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);	1120	XDefineCursor (display->display, vt, display->blank_cursor);
1089	XFlush (display->display);	1121	XFlush (display->display);
1090		1122
1091	hidden_pointer = 1;	1123	hidden_pointer = 1;
1092	}	1124	}
1093		1125
…		…
1309	button_release (ev.xbutton);	1341	button_release (ev.xbutton);
1310	break;	1342	break;
1311		1343
1312	case ClientMessage:	1344	case ClientMessage:
1313	if (ev.xclient.format == 32	1345	if (ev.xclient.format == 32
		1346	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1347	{
1314	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1348	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1315	destroy ();	1349	destroy ();
		1350	#if ENABLE_EWMH
		1351	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1352	XSendEvent (disp, ev.xclient.window = display->root,
		1353	False, SubstructureRedirectMask \| SubstructureNotifyMask,
		1354	&ev);
		1355	#endif
		1356	}
		1357	#if ENABLE_XEMBED
		1358	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1359	{
		1360	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1361	focus_in ();
		1362	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1363	focus_out ();
		1364	}
		1365	#endif
1316	#ifdef OFFIX_DND	1366	#ifdef OFFIX_DND
1317	/* OffiX Dnd (drag 'n' drop) protocol */	1367	/* OffiX Dnd (drag 'n' drop) protocol */
1318	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1368	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1319	&& (ev.xclient.data.l[0] == DndFile	1369	&& (ev.xclient.data.l[0] == DndFile
1320	\|\| ev.xclient.data.l[0] == DndDir	1370	\|\| ev.xclient.data.l[0] == DndDir
1321	\|\| ev.xclient.data.l[0] == DndLink))	1371	\|\| ev.xclient.data.l[0] == DndLink))
1322	{	1372	{
1323	/* Get Dnd data */	1373	/* Get Dnd data */
1324	Atom ActualType;	1374	Atom ActualType;
1325	int ActualFormat;	1375	int ActualFormat;
1326	unsigned char *data;	1376	unsigned char *data;
…		…
1369	break;	1419	break;
1370	}	1420	}
1371	break;	1421	break;
1372		1422
1373	case FocusIn:	1423	case FocusIn:
1374	if (!TermWin.focus)	1424	focus_in ();
		1425	break;
		1426
		1427	case FocusOut:
		1428	focus_out ();
		1429	break;
		1430
		1431	case ConfigureNotify:
		1432	if (ev.xconfigure.window == parent[0])
1375	{	1433	{
1376	TermWin.focus = 1;
1377	want_refresh = 1;
1378	#ifdef USE_XIM
1379	if (Input_Context != NULL)
1380	{
1381	IMSetStatusPosition ();
1382	XSetICFocus (Input_Context);
1383	}
1384	#endif
1385	#ifdef CURSOR_BLINK
1386	if (options & Opt_cursorBlink)
1387	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388	#endif
1389	#ifdef OFF_FOCUS_FADING
1390	if (rs[Rs_fade])
1391	{
1392	pix_colors = pix_colors_focused;
1393	scr_recolour ();
1394	}
1395	#endif
1396
1397	}
1398	break;
1399
1400	case FocusOut:
1401	if (TermWin.focus)
1402	{
1403	TermWin.focus = 0;
1404	want_refresh = 1;
1405
1406	#if ENABLE_FRILLS \|\| ISO_14755
1407	iso14755buf = 0;
1408	#endif
1409	#if ENABLE_OVERLAY
1410	scr_overlay_off ();
1411	#endif
1412	#ifdef USE_XIM
1413	if (Input_Context != NULL)
1414	XUnsetICFocus (Input_Context);
1415	#endif
1416	#ifdef CURSOR_BLINK
1417	if (options & Opt_cursorBlink)
1418	cursor_blink_ev.stop ();
1419	hidden_cursor = 0;
1420	#endif
1421	#ifdef OFF_FOCUS_FADING
1422	if (rs[Rs_fade])
1423	{
1424	pix_colors = pix_colors_unfocused;
1425	scr_recolour ();
1426	}
1427	#endif
1428	}
1429	break;
1430
1431	case ConfigureNotify:
1432	if (ev.xconfigure.window == TermWin.parent[0])
1433	{
1434	int height, width;
1435
1436	do
1437	{ /* Wrap lots of configures into one */
1438	width = ev.xconfigure.width;
1439	height = ev.xconfigure.height;
1440	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1441	}
1442	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));	1434	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1435	;
1443		1436
1444	if (szHint.width != width \|\| szHint.height != height)	1437	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1445	{	1438	{
1446	seen_resize = 1;	1439	seen_resize = 1;
1447	resize_all_windows (width, height, 1);	1440	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448	}	1441	}
1449		1442
1450	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1443	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451	if (options & Opt_transparent)	1444	if (options & Opt_transparent)
1452	check_our_parents ();	1445	check_our_parents ();
…		…
1473	case SelectionRequest:	1466	case SelectionRequest:
1474	selection_send (ev.xselectionrequest);	1467	selection_send (ev.xselectionrequest);
1475	break;	1468	break;
1476		1469
1477	case UnmapNotify:	1470	case UnmapNotify:
1478	TermWin.mapped = 0;	1471	mapped = 0;
1479	#ifdef TEXT_BLINK	1472	#ifdef TEXT_BLINK
1480	text_blink_ev.stop ();	1473	text_blink_ev.stop ();
1481	#endif	1474	#endif
1482	break;	1475	break;
1483		1476
1484	case MapNotify:	1477	case MapNotify:
1485	TermWin.mapped = 1;	1478	mapped = 1;
1486	#ifdef TEXT_BLINK	1479	#ifdef TEXT_BLINK
1487	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1480	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488	#endif	1481	#endif
1489	break;	1482	break;
1490		1483
…		…
1494	break;	1487	break;
1495	#endif /* TRANSPARENT */	1488	#endif /* TRANSPARENT */
1496		1489
1497	case GraphicsExpose:	1490	case GraphicsExpose:
1498	case Expose:	1491	case Expose:
1499	if (ev.xany.window == TermWin.vt)	1492	if (ev.xany.window == vt)
1500	{	1493	{
1501	do	1494	do
1502	scr_expose (ev.xexpose.x, ev.xexpose.y,	1495	scr_expose (ev.xexpose.x, ev.xexpose.y,
1503	ev.xexpose.width, ev.xexpose.height, False);	1496	ev.xexpose.width, ev.xexpose.height, False);
1504	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));	1497	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505		1498
1506	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1499	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507		1500
1508	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))	1501	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509	scr_expose (ev.xexpose.x, ev.xexpose.y,	1502	scr_expose (ev.xexpose.x, ev.xexpose.y,
1510	ev.xexpose.width, ev.xexpose.height, False);	1503	ev.xexpose.width, ev.xexpose.height, False);
1511		1504
1512	scr_refresh (refresh_type);	1505	scr_refresh (refresh_type);
1513	}	1506	}
…		…
1529	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1522	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530	menubar_expose ();	1523	menubar_expose ();
1531	#endif	1524	#endif
1532		1525
1533	#ifdef TRANSPARENT	1526	#ifdef TRANSPARENT
1534	if (am_transparent && ev.xany.window == TermWin.parent[0])	1527	if (am_transparent && ev.xany.window == parent[0])
1535	XClearWindow (disp, ev.xany.window);	1528	XClearWindow (disp, ev.xany.window);
1536	#endif	1529	#endif
1537	}	1530	}
1538	break;	1531	break;
1539		1532
…		…
1550	}	1543	}
1551	#endif	1544	#endif
1552	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1545	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553	break;	1546	break;
1554		1547
1555	if (ev.xany.window == TermWin.vt)	1548	if (ev.xany.window == vt)
1556	{	1549	{
1557	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1550	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1558	{	1551	{
1559	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))	1552	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560	;	1553	;
1561		1554
1562	XQueryPointer (disp, TermWin.vt,	1555	XQueryPointer (disp, vt,
1563	&unused_root, &unused_child,	1556	&unused_root, &unused_child,
1564	&unused_root_x, &unused_root_y,	1557	&unused_root_x, &unused_root_y,
1565	&ev.xbutton.x, &ev.xbutton.y,	1558	&ev.xbutton.x, &ev.xbutton.y,
1566	&ev.xbutton.state);	1559	&ev.xbutton.state);
1567	#ifdef MOUSE_THRESHOLD	1560	#ifdef MOUSE_THRESHOLD
…		…
1579	#endif	1572	#endif
1580	selection_extend (ev.xbutton.x, ev.xbutton.y,	1573	selection_extend (ev.xbutton.x, ev.xbutton.y,
1581	ev.xbutton.state & Button3Mask ? 2 : 0);	1574	ev.xbutton.state & Button3Mask ? 2 : 0);
1582		1575
1583	#ifdef SELECTION_SCROLLING	1576	#ifdef SELECTION_SCROLLING
1584	if (ev.xbutton.y < TermWin.int_bwidth	1577	if (ev.xbutton.y < int_bwidth
1585	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1578	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1586	{	1579	{
1587	int dist;	1580	int dist;
1588		1581
1589	/* don't clobber the current delay if we are	1582	/* don't clobber the current delay if we are
1590	* already in the middle of scrolling.	1583	* already in the middle of scrolling.
…		…
1598	selection_save_x = ev.xbutton.x;	1591	selection_save_x = ev.xbutton.x;
1599	selection_save_y = ev.xbutton.y;	1592	selection_save_y = ev.xbutton.y;
1600	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1593	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1601		1594
1602	/* calc number of lines to scroll */	1595	/* calc number of lines to scroll */
1603	if (ev.xbutton.y < TermWin.int_bwidth)	1596	if (ev.xbutton.y < int_bwidth)
1604	{	1597	{
1605	scroll_selection_dir = UP;	1598	scroll_selection_dir = UP;
1606	dist = TermWin.int_bwidth - ev.xbutton.y;	1599	dist = int_bwidth - ev.xbutton.y;
1607	}	1600	}
1608	else	1601	else
1609	{	1602	{
1610	scroll_selection_dir = DN;	1603	scroll_selection_dir = DN;
1611	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1604	dist = ev.xbutton.y - (int_bwidth + height);
1612	}	1605	}
1613		1606
1614	scroll_selection_lines = Pixel2Height (dist)	1607	scroll_selection_lines = Pixel2Height (dist)
1615	/ SELECTION_SCROLL_LINE_SPEEDUP	1608	/ SELECTION_SCROLL_LINE_SPEEDUP
1616	+ 1;	1609	+ 1;
1617	MIN_IT (scroll_selection_lines,	1610	min_it (scroll_selection_lines,
1618	SELECTION_SCROLL_MAX_LINES);	1611	SELECTION_SCROLL_MAX_LINES);
1619	}	1612	}
1620	else	1613	else
1621	{	1614	{
1622	/* we are within the text window, so we	1615	/* we are within the text window, so we
…		…
1650	}	1643	}
1651	break;	1644	break;
1652	}	1645	}
1653	}	1646	}
1654		1647
		1648	void
		1649	rxvt_term::focus_in ()
		1650	{
		1651	if (!focus)
		1652	{
		1653	focus = 1;
		1654	want_refresh = 1;
		1655	#if USE_XIM
		1656	if (Input_Context != NULL)
		1657	{
		1658	IMSetStatusPosition ();
		1659	XSetICFocus (Input_Context);
		1660	}
		1661	#endif
		1662	#if CURSOR_BLINK
		1663	if (options & Opt_cursorBlink)
		1664	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1665	#endif
		1666	#if OFF_FOCUS_FADING
		1667	if (rs[Rs_fade])
		1668	{
		1669	pix_colors = pix_colors_focused;
		1670	scr_recolour ();
		1671	}
		1672	#endif
		1673	}
		1674	}
		1675
		1676	void
		1677	rxvt_term::focus_out ()
		1678	{
		1679	if (focus)
		1680	{
		1681	focus = 0;
		1682	want_refresh = 1;
		1683
		1684	#if ENABLE_FRILLS \|\| ISO_14755
		1685	iso14755buf = 0;
		1686	#endif
		1687	#if ENABLE_OVERLAY
		1688	scr_overlay_off ();
		1689	#endif
		1690	#if USE_XIM
		1691	if (Input_Context != NULL)
		1692	XUnsetICFocus (Input_Context);
		1693	#endif
		1694	#if CURSOR_BLINK
		1695	if (options & Opt_cursorBlink)
		1696	cursor_blink_ev.stop ();
		1697	hidden_cursor = 0;
		1698	#endif
		1699	#if OFF_FOCUS_FADING
		1700	if (rs[Rs_fade])
		1701	{
		1702	pix_colors = pix_colors_unfocused;
		1703	scr_recolour ();
		1704	}
		1705	#endif
		1706	}
		1707	}
		1708
1655	#if TRANSPARENT	1709	#if TRANSPARENT
1656	void	1710	void
1657	rxvt_term::rootwin_cb (XEvent &ev)	1711	rxvt_term::rootwin_cb (XEvent &ev)
1658	{	1712	{
1659	SET_R (this);	1713	SET_R (this);
…		…
1689	reportmode = !! (priv_modes & PrivMode_mouse_report);	1743	reportmode = !! (priv_modes & PrivMode_mouse_report);
1690		1744
1691	/*	1745	/*
1692	* VT window processing of button press	1746	* VT window processing of button press
1693	*/	1747	*/
1694	if (ev.window == TermWin.vt)	1748	if (ev.window == vt)
1695	{	1749	{
1696	#if ISO_14755	1750	#if ISO_14755
1697	// 5.4	1751	// 5.4
1698	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1752	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1699	{	1753	{
…		…
1904	case Button3:	1958	case Button3:
1905	if (scrollBar.style != R_SB_XTERM)	1959	if (scrollBar.style != R_SB_XTERM)
1906	{	1960	{
1907	if (scrollbar_above_slider (ev.y))	1961	if (scrollbar_above_slider (ev.y))
1908	# ifdef RXVT_SCROLL_FULL	1962	# ifdef RXVT_SCROLL_FULL
1909	scr_page (UP, TermWin.nrow - 1);	1963	scr_page (UP, nrow - 1);
1910	# else	1964	# else
1911	scr_page (UP, TermWin.nrow / 4);	1965	scr_page (UP, nrow / 4);
1912	# endif	1966	# endif
1913	else if (scrollbar_below_slider (ev.y))	1967	else if (scrollbar_below_slider (ev.y))
1914	# ifdef RXVT_SCROLL_FULL	1968	# ifdef RXVT_SCROLL_FULL
1915	scr_page (DN, TermWin.nrow - 1);	1969	scr_page (DN, nrow - 1);
1916	# else	1970	# else
1917	scr_page (DN, TermWin.nrow / 4);	1971	scr_page (DN, nrow / 4);
1918	# endif	1972	# endif
1919	else	1973	else
1920	scrollBar.setMotion ();	1974	scrollBar.setMotion ();
1921	}	1975	}
1922	else	1976	else
1923	{	1977	{
1924	scr_page ((ev.button == Button1 ? DN : UP),	1978	scr_page ((ev.button == Button1 ? DN : UP),
1925	(TermWin.nrow	1979	(nrow
1926	* scrollbar_position (ev.y)	1980	* scrollbar_position (ev.y)
1927	/ scrollbar_size ()));	1981	/ scrollbar_size ()));
1928	}	1982	}
1929		1983
1930	break;	1984	break;
…		…
1962	#ifdef SELECTION_SCROLLING	2016	#ifdef SELECTION_SCROLLING
1963	if (sel_scroll_ev.active)	2017	if (sel_scroll_ev.active)
1964	sel_scroll_ev.stop();	2018	sel_scroll_ev.stop();
1965	#endif	2019	#endif
1966		2020
1967	if (ev.window == TermWin.vt)	2021	if (ev.window == vt)
1968	{	2022	{
1969	#if ISO_14755	2023	#if ISO_14755
1970	// 5.4	2024	// 5.4
1971	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2025	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1972	return;	2026	return;
…		…
2023	v = ev.button == Button4 ? UP : DN;	2077	v = ev.button == Button4 ? UP : DN;
2024		2078
2025	if (ev.state & ShiftMask)	2079	if (ev.state & ShiftMask)
2026	i = 1;	2080	i = 1;
2027	else if (options & Opt_mouseWheelScrollPage)	2081	else if (options & Opt_mouseWheelScrollPage)
2028	i = TermWin.nrow - 1;	2082	i = nrow - 1;
2029	else	2083	else
2030	i = 5;	2084	i = 5;
2031		2085
2032	# ifdef MOUSE_SLIP_WHEELING	2086	# ifdef MOUSE_SLIP_WHEELING
2033	if (ev.state & ControlMask)	2087	if (ev.state & ControlMask)
2034	{	2088	{
2035	mouse_slip_wheel_speed += v ? -1 : 1;	2089	mouse_slip_wheel_speed += v ? -1 : 1;
2036	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2090	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2037	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2091	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2038		2092
2039	if (slip_wheel_ev.at < NOW)	2093	if (slip_wheel_ev.at < NOW)
2040	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2094	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2041		2095
2042	slip_wheel_ev.start ();	2096	slip_wheel_ev.start ();
…		…
2324	return pchanged; /* Don't try any more */	2378	return pchanged; /* Don't try any more */
2325		2379
2326	XGetWindowAttributes (disp, display->root, &wrootattr);	2380	XGetWindowAttributes (disp, display->root, &wrootattr);
2327	rootdepth = wrootattr.depth;	2381	rootdepth = wrootattr.depth;
2328		2382
2329	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	2383	XGetWindowAttributes (disp, parent[0], &wattr);
2330		2384
2331	if (rootdepth != wattr.depth)	2385	if (rootdepth != wattr.depth)
2332	{	2386	{
2333	if (am_transparent)	2387	if (am_transparent)
2334	{	2388	{
2335	pchanged = 1;	2389	pchanged = 1;
2336	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2390	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2337	am_transparent = am_pixmap_trans = 0;	2391	am_transparent = am_pixmap_trans = 0;
2338	}	2392	}
2339		2393
2340	return pchanged; /* Don't try any more */	2394	return pchanged; /* Don't try any more */
2341	}	2395	}
…		…
2382	Window cr;	2436	Window cr;
2383	XImage *image;	2437	XImage *image;
2384	GC gc;	2438	GC gc;
2385	XGCValues gcvalue;	2439	XGCValues gcvalue;
2386		2440
2387	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	2441	XTranslateCoordinates (disp, parent[0], display->root,
2388	0, 0, &sx, &sy, &cr);	2442	0, 0, &sx, &sy, &cr);
2389	nw = (unsigned int)szHint.width;	2443	nw = (unsigned int)szHint.width;
2390	nh = (unsigned int)szHint.height;	2444	nh = (unsigned int)szHint.height;
2391	nx = ny = 0;	2445	nx = ny = 0;
2392		2446
…		…
2402	nh += sy;	2456	nh += sy;
2403	ny = -sy;	2457	ny = -sy;
2404	sy = 0;	2458	sy = 0;
2405	}	2459	}
2406		2460
2407	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2461	min_it (nw, (unsigned int) (wrootattr.width - sx));
2408	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2462	min_it (nh, (unsigned int) (wrootattr.height - sy));
2409		2463
2410	XSync (disp, False);	2464	XSync (disp, False);
2411	allowedxerror = -1;	2465	allowedxerror = -1;
2412	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2466	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2413		2467
…		…
2418	if (image == NULL)	2472	if (image == NULL)
2419	{	2473	{
2420	if (am_transparent && am_pixmap_trans)	2474	if (am_transparent && am_pixmap_trans)
2421	{	2475	{
2422	pchanged = 1;	2476	pchanged = 1;
2423	if (TermWin.pixmap != None)	2477	if (pixmap != None)
2424	{	2478	{
2425	XFreePixmap (disp, TermWin.pixmap);	2479	XFreePixmap (disp, pixmap);
2426	TermWin.pixmap = None;	2480	pixmap = None;
2427	}	2481	}
2428	}	2482	}
2429		2483
2430	am_pixmap_trans = 0;	2484	am_pixmap_trans = 0;
2431	}	2485	}
2432	else	2486	else
2433	{	2487	{
2434	if (TermWin.pixmap != None)	2488	if (pixmap != None)
2435	XFreePixmap (disp, TermWin.pixmap);	2489	XFreePixmap (disp, pixmap);
2436		2490
2437	#if TINTING	2491	#if TINTING
2438	if (ISSET_PIXCOLOR (Color_tint))	2492	if (ISSET_PIXCOLOR (Color_tint))
2439	{	2493	{
2440	unsigned short rm, gm, bm;	2494	unsigned short rm, gm, bm;
…		…
2444		2498
2445	ShadeXImage (display, image, shade, rm, gm, bm);	2499	ShadeXImage (display, image, shade, rm, gm, bm);
2446	}	2500	}
2447	#endif	2501	#endif
2448		2502
2449	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,	2503	pixmap = XCreatePixmap (disp, vt,
2450	szHint.width, szHint.height, image->depth);	2504	szHint.width, szHint.height, image->depth);
2451	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);	2505	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2452	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,	2506	XPutImage (disp, pixmap, gc, image, 0, 0,
2453	nx, ny, image->width, image->height);	2507	nx, ny, image->width, image->height);
2454	XFreeGC (disp, gc);	2508	XFreeGC (disp, gc);
2455	XDestroyImage (image);	2509	XDestroyImage (image);
2456	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);	2510	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2457	XClearWindow (disp, TermWin.parent[0]);	2511	XClearWindow (disp, parent[0]);
2458		2512
2459	if (!am_transparent \|\| !am_pixmap_trans)	2513	if (!am_transparent \|\| !am_pixmap_trans)
2460	pchanged = 1;	2514	pchanged = 1;
2461		2515
2462	am_transparent = am_pixmap_trans = 1;	2516	am_transparent = am_pixmap_trans = 1;
2463	}	2517	}
2464	}	2518	}
2465		2519
2466	if (am_pixmap_trans)	2520	if (am_pixmap_trans)
2467	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2521	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2468	else	2522	else
2469	{	2523	{
2470	unsigned int n;	2524	unsigned int n;
2471	/*	2525	/*
2472	* InheritPixmap transparency	2526	* InheritPixmap transparency
2473	*/	2527	*/
2474	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2528	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2475	{	2529	{
2476	oldp = TermWin.parent[i];	2530	oldp = parent[i];
2477	XQueryTree (disp, TermWin.parent[i - 1], &root,	2531	XQueryTree (disp, parent[i - 1], &root,
2478	&TermWin.parent[i], &list, &n);	2532	&parent[i], &list, &n);
2479	XFree (list);	2533	XFree (list);
2480		2534
2481	if (TermWin.parent[i] == display->root)	2535	if (parent[i] == display->root)
2482	{	2536	{
2483	if (oldp != None)	2537	if (oldp != None)
2484	pchanged = 1;	2538	pchanged = 1;
2485		2539
2486	break;	2540	break;
2487	}	2541	}
2488		2542
2489	if (oldp != TermWin.parent[i])	2543	if (oldp != parent[i])
2490	pchanged = 1;	2544	pchanged = 1;
2491	}	2545	}
2492		2546
2493	n = 0;	2547	n = 0;
2494		2548
2495	if (pchanged)	2549	if (pchanged)
2496	{	2550	{
2497	for (; n < (unsigned int)i; n++)	2551	for (; n < (unsigned int)i; n++)
2498	{	2552	{
2499	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);	2553	XGetWindowAttributes (disp, parent[n], &wattr);
2500	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2554	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2501	{	2555	{
2502	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2556	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2503	break;	2557	break;
2504	}	2558	}
2505	}	2559	}
2506	}	2560	}
2507		2561
2508	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2562	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2509	{	2563	{
2510	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);	2564	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2511	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2565	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2512	am_transparent = 0;	2566	am_transparent = 0;
2513	/* XXX: also turn off Opt_transparent? */	2567	/* XXX: also turn off Opt_transparent? */
2514	}	2568	}
2515	else	2569	else
2516	{	2570	{
…		…
2519	* needed for fvwm2.2.2 (and before?) */	2573	* needed for fvwm2.2.2 (and before?) */
2520	sleep (1);	2574	sleep (1);
2521	#endif	2575	#endif
2522	for (n = 0; n < (unsigned int)i; n++)	2576	for (n = 0; n < (unsigned int)i; n++)
2523	{	2577	{
2524	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);	2578	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2525	XClearWindow (disp, TermWin.parent[n]);	2579	XClearWindow (disp, parent[n]);
2526	}	2580	}
2527		2581
2528	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2582	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2529	am_transparent = 1;	2583	am_transparent = 1;
2530	}	2584	}
2531		2585
2532	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2586	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2533	TermWin.parent[i] = None;	2587	parent[i] = None;
2534	}	2588	}
2535		2589
2536	if (scrollBar.win)	2590	if (scrollBar.win)
2537	{	2591	{
2538	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2592	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
…		…
2581	// some window managers resize the window early, and these programs	2635	// some window managers resize the window early, and these programs
2582	// then sometimes get the size wrong.	2636	// then sometimes get the size wrong.
2583	// unfortunately other programs are even more buggy and dislike	2637	// unfortunately other programs are even more buggy and dislike
2584	// being sent SIGWINCH, so only do it when we were in fact being	2638	// being sent SIGWINCH, so only do it when we were in fact being
2585	// resized.	2639	// resized.
2586	if (seen_resize)	2640	if (seen_resize && cmd_pid)
2587	kill (-cmd_pid, SIGWINCH);	2641	kill (-cmd_pid, SIGWINCH);
2588	}	2642	}
2589		2643
2590	/* Read a text string from the input buffer */	2644	/* Read a text string from the input buffer */
2591	unicode_t buf[UBUFSIZ];	2645	unicode_t buf[UBUFSIZ];
2592	bool refreshnow = false;	2646	bool refreshnow = false;
2593	int nlines = 0;	2647	int nlines = 0;
2594	unicode_t *str = buf;	2648	unicode_t *str = buf;
		2649	unicode_t *eol = str + min (ncol, UBUFSIZ);
2595		2650
2596	for (;;)	2651	for (;;)
2597	{	2652	{
2598	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2653	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599	break;	2654	break;
2600		2655
2601	*str++ = ch;	2656	*str++ = ch;
2602		2657
2603	if (ch == C0_LF)	2658	if (ch == C0_LF \|\| str >= eol)
2604	{	2659	{
		2660	if (ch == C0_LF)
2605	nlines++;	2661	nlines++;
		2662
2606	refresh_count++;	2663	refresh_count++;
2607		2664
2608	if (!(options & Opt_jumpScroll)	2665	if (!(options & Opt_jumpScroll)
2609	\|\| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2666	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2610	{	2667	{
2611	refreshnow = true;	2668	refreshnow = true;
2612	ch = NOCHAR;	2669	ch = NOCHAR;
2613	break;	2670	break;
2614	}	2671	}
2615		2672
2616	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2673	// scr_add_lines only works for nlines <= nrow - 1.
2617	if (nlines >= TermWin.nrow - 1)	2674	if (nlines >= nrow - 1)
2618	{	2675	{
2619	scr_add_lines (buf, nlines, str - buf);	2676	scr_add_lines (buf, nlines, str - buf);
2620	nlines = 0;	2677	nlines = 0;
2621	str = buf;	2678	str = buf;
		2679	eol = str + min (ncol, UBUFSIZ);
2622	}	2680	}
2623	}
2624		2681
2625	if (str >= buf + UBUFSIZ)	2682	if (str >= eol)
2626	{	2683	{
		2684	if (eol >= buf + UBUFSIZ)
		2685	{
2627	ch = NOCHAR;	2686	ch = NOCHAR;
2628	break;	2687	break;
		2688	}
		2689	else
		2690	eol = min (eol + ncol, buf + UBUFSIZ);
		2691	}
		2692
2629	}	2693	}
2630		2694
2631	seq_begin = cmdbuf_ptr;	2695	seq_begin = cmdbuf_ptr;
2632	ch = next_char ();	2696	ch = next_char ();
2633	}	2697	}
…		…
3177	{	3241	{
3178	switch (priv)	3242	switch (priv)
3179	{	3243	{
3180	case '>':	3244	case '>':
3181	if (ch == CSI_DA) /* secondary device attributes */	3245	if (ch == CSI_DA) /* secondary device attributes */
3182	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3246	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183	break;	3247	break;
3184	case '?':	3248	case '?':
3185	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3249	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3186	process_terminal_mode (ch, priv, nargs, arg);	3250	process_terminal_mode (ch, priv, nargs, arg);
3187	break;	3251	break;
…		…
3292		3356
3293	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3357	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294	arg[0] = -arg[0];	3358	arg[0] = -arg[0];
3295	/* FALLTHROUGH */	3359	/* FALLTHROUGH */
3296	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3360	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3361	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298	break;	3362	break;
3299		3363
3300	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3364	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301	tt_write ((const unsigned char *)VT100_ANS,	3365	tt_write ((const unsigned char *)VT100_ANS,
3302	(unsigned int) (sizeof (VT100_ANS) - 1));	3366	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3427	{	3491	{
3428	/*	3492	/*
3429	* commands	3493	* commands
3430	*/	3494	*/
3431	case 1: /* deiconify window */	3495	case 1: /* deiconify window */
3432	XMapWindow (disp, TermWin.parent[0]);	3496	XMapWindow (disp, parent[0]);
3433	break;	3497	break;
3434	case 2: /* iconify window */	3498	case 2: /* iconify window */
3435	XIconifyWindow (disp, TermWin.parent[0], display->screen);	3499	XIconifyWindow (disp, parent[0], display->screen);
3436	break;	3500	break;
3437	case 3: /* set position (pixels) */	3501	case 3: /* set position (pixels) */
3438	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);	3502	XMoveWindow (disp, parent[0], args[1], args[2]);
3439	break;	3503	break;
3440	case 4: /* set size (pixels) */	3504	case 4: /* set size (pixels) */
3441	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3505	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442	break;	3506	break;
3443	case 5: /* raise window */	3507	case 5: /* raise window */
3444	XRaiseWindow (disp, TermWin.parent[0]);	3508	XRaiseWindow (disp, parent[0]);
3445	break;	3509	break;
3446	case 6: /* lower window */	3510	case 6: /* lower window */
3447	XLowerWindow (disp, TermWin.parent[0]);	3511	XLowerWindow (disp, parent[0]);
3448	break;	3512	break;
3449	case 7: /* refresh window */	3513	case 7: /* refresh window */
3450	scr_touch (true);	3514	scr_touch (true);
3451	break;	3515	break;
3452	case 8: /* set size (chars) */	3516	case 8: /* set size (chars) */
3453	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3517	set_widthheight ((unsigned int) (args[2] * fwidth),
3454	(unsigned int) (args[1] * TermWin.fheight));	3518	(unsigned int) (args[1] * fheight));
3455	break;	3519	break;
3456		3520
3457	//case 9: NYI, TODO, restore maximized window or maximize window	3521	//case 9: NYI, TODO, restore maximized window or maximize window
3458	default:	3522	default:
3459	if (args[0] >= 24) /* set height (chars) */	3523	if (args[0] >= 24) /* set height (chars) */
3460	set_widthheight ((unsigned int)TermWin.width,	3524	set_widthheight ((unsigned int)width,
3461	(unsigned int) (args[1] * TermWin.fheight));	3525	(unsigned int) (args[1] * fheight));
3462	break;	3526	break;
3463		3527
3464		3528
3465	/*	3529	/*
3466	* reports - some output format copied from XTerm	3530	* reports - some output format copied from XTerm
3467	*/	3531	*/
3468	case 11: /* report window state */	3532	case 11: /* report window state */
3469	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3533	XGetWindowAttributes (disp, parent[0], &wattr);
3470	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3534	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471	break;	3535	break;
3472	case 13: /* report window position */	3536	case 13: /* report window position */
3473	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3537	XGetWindowAttributes (disp, parent[0], &wattr);
3474	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,	3538	XTranslateCoordinates (disp, parent[0], wattr.root,
3475	-wattr.border_width, -wattr.border_width,	3539	-wattr.border_width, -wattr.border_width,
3476	&x, &y, &wdummy);	3540	&x, &y, &wdummy);
3477	tt_printf ("\033[3;%d;%dt", x, y);	3541	tt_printf ("\033[3;%d;%dt", x, y);
3478	break;	3542	break;
3479	case 14: /* report window size (pixels) */	3543	case 14: /* report window size (pixels) */
3480	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3544	XGetWindowAttributes (disp, parent[0], &wattr);
3481	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3545	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482	break;	3546	break;
3483	case 18: /* report text area size (chars) */	3547	case 18: /* report text area size (chars) */
3484	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3548	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485	break;	3549	break;
3486	case 19: /* report window size (chars) */	3550	case 19: /* report window size (chars) */
3487	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3551	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488	break;	3552	break;
3489	case 20: /* report icon label */	3553	case 20: /* report icon label */
3490	{	3554	{
3491	char *s;	3555	char *s;
3492	XGetIconName (disp, TermWin.parent[0], &s);	3556	XGetIconName (disp, parent[0], &s);
3493	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3557	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494	XFree (s);	3558	XFree (s);
3495	}	3559	}
3496	break;	3560	break;
3497	case 21: /* report window title */	3561	case 21: /* report window title */
3498	{	3562	{
3499	char *s;	3563	char *s;
3500	XFetchName (disp, TermWin.parent[0], &s);	3564	XFetchName (disp, parent[0], &s);
3501	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3565	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3502	XFree (s);	3566	XFree (s);
3503	}	3567	}
3504	break;	3568	break;
3505	}	3569	}
…		…
3538	else if (ch < 0x20)	3602	else if (ch < 0x20)
3539	return NULL; /* other control character - exit */	3603	return NULL; /* other control character - exit */
3540		3604
3541	seen_esc = false;	3605	seen_esc = false;
3542		3606
3543	if (n >= sizeof (string) - 1)	3607	if (n >= STRING_MAX - 1)
3544	// stop at some sane length	3608	// stop at some sane length
3545	return NULL;	3609	return NULL;
3546		3610
3547	if (ch == C0_SYN)	3611	if (ch == C0_SYN)
3548	string[n++] = cmd_get8 ();	3612	string[n++] = cmd_get8 ();
…		…
3616	set_window_color (color, str);	3680	set_window_color (color, str);
3617	}	3681	}
3618		3682
3619	/*	3683	/*
3620	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3684	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3621	* 0 = change iconName/title
3622	* 1 = change iconName
3623	* 2 = change title
3624	* 4 = change color
3625	* 10 = change fg color
3626	* 11 = change bg color
3627	* 12 = change text color
3628	* 13 = change mouse foreground color
3629	* 17 = change highlight character colour
3630	* 18 = change bold character color
3631	* 19 = change underlined character color
3632	* 46 = change logfile (not implemented)
3633	* 50 = change font
3634	*
3635	* rxvt extensions:
3636	* 20 = bg pixmap
3637	* 39 = change default fg color
3638	* 49 = change default bg color
3639	* 55 = dump scrollback buffer and all of screen
3640	* 701 = change locale
3641	* 702 = find font
3642	* 703 = menu
3643	*/	3685	*/
3644	void	3686	void
3645	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3687	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3646	{	3688	{
3647	int changed = 0;	3689	int changed = 0;
…		…
3673	unsigned long bytes_after;	3715	unsigned long bytes_after;
3674	unsigned char *value = 0;	3716	unsigned char *value = 0;
3675	const char *str = "";	3717	const char *str = "";
3676		3718
3677	if (prop	3719	if (prop
3678	&& XGetWindowProperty (disp, TermWin.parent[0],	3720	&& XGetWindowProperty (disp, parent[0],
3679	prop, 0, 1<<16, 0, AnyPropertyType,	3721	prop, 0, 1<<16, 0, AnyPropertyType,
3680	&actual_type, &actual_format,	3722	&actual_type, &actual_format,
3681	&nitems, &bytes_after, &value) == Success	3723	&nitems, &bytes_after, &value) == Success
3682	&& actual_type != None	3724	&& actual_type != None
3683	&& actual_format == 8)	3725	&& actual_format == 8)
…		…
3695	{	3737	{
3696	*eq = 0;	3738	*eq = 0;
3697	set_utf8_property (display->atom (str), eq + 1);	3739	set_utf8_property (display->atom (str), eq + 1);
3698	}	3740	}
3699	else	3741	else
3700	XDeleteProperty (disp, TermWin.parent[0],	3742	XDeleteProperty (disp, parent[0],
3701	display->atom (str));	3743	display->atom (str));
3702	}	3744	}
3703	break;	3745	break;
3704		3746
3705	case XTerm_Color:	3747	case XTerm_Color:
…		…
3746	break;	3788	break;
3747	#ifndef NO_BOLD_UNDERLINE_REVERSE	3789	#ifndef NO_BOLD_UNDERLINE_REVERSE
3748	case XTerm_Color_BD:	3790	case XTerm_Color_BD:
3749	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3791	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3750	break;	3792	break;
3751	case XTerm_Color_IT:
3752	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753	break;
3754	case XTerm_Color_UL:	3793	case XTerm_Color_UL:
3755	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3794	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3756	break;	3795	break;
3757	case XTerm_Color_RV:	3796	case XTerm_Color_RV:
3758	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3797	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3759	break;	3798	break;
		3799	case URxvt_Color_IT:
		3800	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3801	break;
3760	#endif	3802	#endif
3761	#if TRANSPARENT && TINTING	3803	#if TRANSPARENT && TINTING
3762	case XTerm_Color_tint:	3804	case URxvt_Color_tint:
3763	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3805	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3764	check_our_parents ();	3806	check_our_parents ();
3765	if (am_transparent)	3807	if (am_transparent)
3766	want_full_refresh = want_refresh = 1;	3808	want_full_refresh = want_refresh = 1;
3767	break;	3809	break;
3768	#endif	3810	#endif
…		…
3802		3844
3803	case XTerm_logfile:	3845	case XTerm_logfile:
3804	// TODO, when secure mode?	3846	// TODO, when secure mode?
3805	break;	3847	break;
3806		3848
		3849	#ifdef MENUBAR
		3850	case URxvt_Menu:
		3851	if (options & Opt_insecure)
		3852	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3853	break;
		3854	#endif
		3855	#if 0
		3856	case XTerm_dumpscreen: /* no error notices */
		3857	{
		3858	int fd;
		3859	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
		3860	{
		3861	scr_dump (fd);
		3862	close (fd);
		3863	}
		3864	}
		3865	break;
		3866	#endif
3807	case XTerm_font:	3867	case XTerm_font:
3808	op = URxvt_font;	3868	op = URxvt_font;
3809	case URxvt_font:	3869	case URxvt_font:
3810	#if ENABLE_STYLES	3870	#if ENABLE_STYLES
3811	case URxvt_boldFont:	3871	case URxvt_boldFont:
3812	case URxvt_italicFont:	3872	case URxvt_italicFont:
3813	case URxvt_boldItalicFont:	3873	case URxvt_boldItalicFont:
3814	#endif	3874	#endif
3815	if (query)	3875	if (query)
3816	tt_printf ("\33]%d;%-.250s%c", saveop,	3876	tt_printf ("\33]%d;%-.250s%c", saveop,
3817	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3877	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3818	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3878	? fontset[op - URxvt_font]->fontdesc : "",
3819	resp);	3879	resp);
3820	else	3880	else
3821	{	3881	{
3822	const char *&res = rs[Rs_font + (op - URxvt_font)];	3882	const char *&res = rs[Rs_font + (op - URxvt_font)];
3823		3883
…		…
3826	set_fonts ();	3886	set_fonts ();
3827	}	3887	}
3828	break;	3888	break;
3829		3889
3830	#if ENABLE_FRILLS	3890	#if ENABLE_FRILLS
3831	case XTerm_locale:	3891	case URxvt_locale:
3832	if (query)	3892	if (query)
3833	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3893	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3834	else	3894	else
3835	{	3895	{
3836	set_locale (str);	3896	set_locale (str);
3837	pty.set_utf8_mode (enc_utf8);	3897	pty.set_utf8_mode (enc_utf8);
3838	# ifdef USE_XIM
3839	im_cb ();	3898	init_xlocale ();
3840	# endif
3841	}	3899	}
3842	break;	3900	break;
3843	#endif
3844		3901
3845	#ifdef MENUBAR	3902	case URxvt_view_up:
3846	case XTerm_Menu:	3903	case URxvt_view_down:
3847	if (options & Opt_insecure)	3904	int lines = atoi (str);
3848	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3905
3849	break;	3906	if (lines)
3850	#endif	3907	scr_page (op == URxvt_view_up ? UP : DN, lines);
3851	#if 0
3852	case XTerm_dumpscreen: /* no error notices */
3853	{	3908	else
3854	int fd;
3855	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3856	{	3909	{
3857	scr_dump (fd);	3910	scr_erase_savelines ();
3858	close (fd);
3859	}	3911	}
3860	}	3912
3861	break;	3913	break;
3862	#endif	3914	#endif
3863	}	3915	}
3864	}	3916	}
3865	/----------------------------------------------------------------------/	3917	/----------------------------------------------------------------------/
…		…
3998	*/	4050	*/
3999	PrivMode (1, PrivMode_vt52);	4051	PrivMode (1, PrivMode_vt52);
4000	break;	4052	break;
4001	case 3: /* 80/132 */	4053	case 3: /* 80/132 */
4002	if (priv_modes & PrivMode_132OK)	4054	if (priv_modes & PrivMode_132OK)
4003	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4055	set_widthheight (((state ? 132 : 80) * fwidth), height);
4004	break;	4056	break;
4005	case 4: /* smooth scrolling */	4057	case 4: /* smooth scrolling */
4006	if (state)	4058	if (state)
4007	options &= ~Opt_jumpScroll;	4059	options &= ~Opt_jumpScroll;
4008	else	4060	else
…		…
4325	}	4377	}
4326		4378
4327	memmove (v_buffer, v_buffer + written, v_buflen);	4379	memmove (v_buffer, v_buffer + written, v_buflen);
4328	}	4380	}
4329	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	4381	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4330	// original code just ignores this...	4382	pty_ev.set (EVENT_READ);
4331	destroy ();
4332	}	4383	}
4333		4384
4334	/----------------------- end-of-file (C source) -----------------------/	4385	/----------------------- end-of-file (C source) -----------------------/
4335		4386

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC vs. Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC