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

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

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.193 by root, Sun Feb 13 08:56:27 2005 UTC vs. Revision 1.213 by root, Thu Dec 22 16:44:10 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.193 by root, Sun Feb 13 08:56:27 2005 UTC vs.
Revision 1.213 by root, Thu Dec 22 16:44:10 2005 UTC