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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.200 by root, Sun Feb 20 19:45:30 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.
…		…
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h" /* NECESSARY */
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h" /* NECESSARY */
50	#include "version.h"	50	#include "version.h"
51	#include "command.h"	51	#include "command.h"
52		52
53	#include <wchar.h>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
54	#include <signal.h>	57	#include <csignal>
55		58
56	/----------------------------------------------------------------------/	59	/----------------------------------------------------------------------/
57		60
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59		62
…		…
114	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
115	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
116	XK_Print, 0x2399,	119	XK_Print, 0x2399,
117		120
118	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,
119	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
120	0,	131	0,
121	};	132	};
122		133
123	void	134	void
124	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	284	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	285	* escape sequence to toggle the Keypad.
275	*	286	*
276	* Always permit `shift' to override the current setting	287	* Always permit `shift' to override the current setting
277	*/	288	*/
278	shft = (ev.state & ShiftMask);	289	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	290	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	291	meta = ev.state & ModMetaMask;
281		292
282	if (numlock_state \|\| (ev.state & ModNumLockMask))	293	if (numlock_state \|\| (ev.state & ModNumLockMask))
283	{	294	{
284	numlock_state = (ev.state & ModNumLockMask);	295	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	296	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
344	valid_keysym = keysym != NoSymbol;	355	valid_keysym = keysym != NoSymbol;
345	}	356	}
346		357
347	if (valid_keysym)	358	if (valid_keysym)
348	{	359	{
		360	#ifdef KEYSYM_RESOURCE
		361	if (keyboard->dispatch (this, keysym, ev.state))
		362	return;
		363	#endif
		364
349	if (TermWin.saveLines)	365	if (TermWin.saveLines)
350	{	366	{
351	#ifdef UNSHIFTED_SCROLLKEYS	367	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	368	if (!ctrl && !meta)
353	#else	369	#else
…		…
487	}	503	}
488	#endif	504	#endif
489		505
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	506	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	507	{
492	#ifdef KEYSYM_RESOURCE
493	if (! (shft \| ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494	{
495	unsigned int l;
496	const unsigned char *kbuf0;
497
498	kbuf0 = (Keysym_map[keysym & 0xFF]);
499	l = (unsigned int)*kbuf0++;
500
501	/* escape prefix */
502	if (meta
503	# ifdef META8_OPTION
504	&& meta_char == C0_ESC
505	# endif
506	)
507	{
508	const unsigned char ch = C0_ESC;
509	tt_write (&ch, 1);
510	}
511
512	tt_write (kbuf0, l);
513	return;
514	}
515	else
516	#endif
517	{	508	{
518	newlen = 1;	509	newlen = 1;
519	switch (keysym)	510	switch (keysym)
520	{	511	{
521	#ifndef NO_BACKSPACE_KEY	512	#ifndef NO_BACKSPACE_KEY
…		…
529	else	520	else
530	strcpy (kbuf, key_backspace);	521	strcpy (kbuf, key_backspace);
531	break;	522	break;
532	#endif	523	#endif
533	#ifndef NO_DELETE_KEY	524	#ifndef NO_DELETE_KEY
		525	# ifdef XK_KP_Prior
		526	case XK_KP_Delete:
		527	/* allow shift to override */
		528	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		529	{
		530	strcpy (kbuf, "\033On");
		531	break;
		532	}
		533	/* FALLTHROUGH */
		534	# endif
534	case XK_Delete:	535	case XK_Delete:
535	strcpy (kbuf, key_delete);	536	strcpy (kbuf, key_delete);
536	break;	537	break;
537	#endif	538	#endif
538	case XK_Tab:	539	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	642	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	643	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	644	strcpy (kbuf, "\033Ou");
644	break;	645	break;
645		646
646	case XK_KP_Insert:
647	strcpy (kbuf, "\033Op");
648	break;
649
650	case XK_KP_Delete:
651	strcpy (kbuf, "\033On");
652	break;
653	#endif	647	#endif
654	case XK_KP_F1: /* "\033OP" */	648	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	649	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	650	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	651	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	683	break;
690		684
691	case XK_Find:	685	case XK_Find:
692	strcpy (kbuf, "\033[1~");	686	strcpy (kbuf, "\033[1~");
693	break;	687	break;
		688
		689	#ifdef XK_KP_End
		690	case XK_KP_Insert:
		691	/* allow shift to override */
		692	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		693	{
		694	strcpy (kbuf, "\033Op");
		695	break;
		696	}
		697	/* FALLTHROUGH */
		698	#endif
694	case XK_Insert:	699	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	700	strcpy (kbuf, "\033[2~");
696	break;	701	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	702	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	703	case DXK_Remove:
…		…
788	#undef FKEY	793	#undef FKEY
789	default:	794	default:
790	newlen = 0;	795	newlen = 0;
791	break;	796	break;
792	}	797	}
		798
793	if (newlen)	799	if (newlen)
794	len = strlen (kbuf);	800	len = strlen (kbuf);
795	}	801	}
796		802
797	/*	803	/*
…		…
805	}	811	}
806	else if (ctrl && keysym == XK_minus)	812	else if (ctrl && keysym == XK_minus)
807	{	813	{
808	len = 1;	814	len = 1;
809	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	815	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		816	}
		817	else if (keysym == XK_ISO_Left_Tab)
		818	{
		819	strcpy (kbuf, "\033[Z");
		820	len = 3;
810	}	821	}
811	else	822	else
812	{	823	{
813	#ifdef META8_OPTION	824	#ifdef META8_OPTION
814	/* set 8-bit on */	825	/* set 8-bit on */
…		…
873	#endif /* DEBUG_CMD */	884	#endif /* DEBUG_CMD */
874	tt_write (kbuf, (unsigned int)len);	885	tt_write (kbuf, (unsigned int)len);
875	}	886	}
876	/}}} /	887	/}}} /
877		888
878	#if (MENUBAR_MAX)	889	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
879	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	890	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
880	/* attempt to `write' count to the input buffer */	891	/* attempt to `write' count to the input buffer */
881	unsigned int	892	unsigned int
882	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	893	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883	{	894	{
…		…
906		917
907	cmd_parse ();	918	cmd_parse ();
908		919
909	return 0;	920	return 0;
910	}	921	}
911	#endif /* MENUBAR_MAX */	922	#endif
912		923
913	void	924	void
914	rxvt_term::flush ()	925	rxvt_term::flush ()
915	{	926	{
916	flush_ev.stop ();	927	flush_ev.stop ();
…		…
1017	{	1028	{
1018	if (mouse_slip_wheel_speed == 0	1029	if (mouse_slip_wheel_speed == 0
1019	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1030	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020	: scr_page (UP, mouse_slip_wheel_speed))	1031	: scr_page (UP, mouse_slip_wheel_speed))
1021	{	1032	{
		1033	if (TermWin.view_start == TermWin.nscrolled \|\|
		1034	TermWin.view_start == 0)
		1035	mouse_slip_wheel_speed = 0;
		1036
1022	refresh_type \|= SMOOTH_REFRESH;	1037	refresh_type \|= SMOOTH_REFRESH;
1023	want_refresh = 1;	1038	want_refresh = 1;
1024	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1039	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025	}	1040	}
1026	}	1041	}
…		…
1058	rxvt_term::pty_cb (io_watcher &w, short revents)	1073	rxvt_term::pty_cb (io_watcher &w, short revents)
1059	{	1074	{
1060	SET_R (this);	1075	SET_R (this);
1061	SET_LOCALE (locale);	1076	SET_LOCALE (locale);
1062		1077
1063	if (revents & EVENT_WRITE)
1064	tt_write (0, 0);
1065	else if (revents & EVENT_READ)	1078	if (revents & EVENT_READ)
1066	// loop, but don't allow a single term to monopolize us	1079	// loop, but don't allow a single term to monopolize us
1067	while (pty_fill ())	1080	while (pty_fill ())
1068	if (cmd_parse ())	1081	if (cmd_parse ())
1069	break;	1082	break;
		1083
		1084	if (revents & EVENT_WRITE)
		1085	pty_write ();
1070	}	1086	}
1071		1087
1072	void	1088	void
1073	rxvt_term::pointer_unblank ()	1089	rxvt_term::pointer_unblank ()
1074	{	1090	{
…		…
1088	rxvt_term::pointer_blank ()	1104	rxvt_term::pointer_blank ()
1089	{	1105	{
1090	if (! (options & Opt_pointerBlank))	1106	if (! (options & Opt_pointerBlank))
1091	return;	1107	return;
1092		1108
1093	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1109	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1094	XFlush (display->display);	1110	XFlush (display->display);
1095		1111
1096	hidden_pointer = 1;	1112	hidden_pointer = 1;
1097	}	1113	}
1098		1114
…		…
1187		1203
1188	/{{{ process an X event /	1204	/{{{ process an X event /
1189	void	1205	void
1190	rxvt_term::x_cb (XEvent &ev)	1206	rxvt_term::x_cb (XEvent &ev)
1191	{	1207	{
		1208	dDisp;
		1209
1192	SET_R (this);	1210	SET_R (this);
1193	SET_LOCALE (locale);	1211	SET_LOCALE (locale);
1194		1212
1195	#if defined(CURSOR_BLINK)	1213	#if defined(CURSOR_BLINK)
1196	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1214	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1217	if (ev.type == KeyPress && hidden_pointer == 0)	1235	if (ev.type == KeyPress && hidden_pointer == 0)
1218	pointer_blank ();	1236	pointer_blank ();
1219	}	1237	}
1220	#endif	1238	#endif
1221		1239
1222	Window unused_root, unused_child;	1240	Window unused_root, unused_child;
1223	int unused_root_x, unused_root_y;	1241	int unused_root_x, unused_root_y;
1224	unsigned int unused_mask;	1242	unsigned int unused_mask;
1225		1243
1226	switch (ev.type)	1244	switch (ev.type)
1227	{	1245	{
1228	case KeyPress:	1246	case KeyPress:
1229	#if ISO_14755	1247	#if ISO_14755
…		…
1312	button_release (ev.xbutton);	1330	button_release (ev.xbutton);
1313	break;	1331	break;
1314		1332
1315	case ClientMessage:	1333	case ClientMessage:
1316	if (ev.xclient.format == 32	1334	if (ev.xclient.format == 32
		1335	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1336	{
1317	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1337	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318	destroy ();	1338	destroy ();
		1339	#if ENABLE_EWMH
		1340	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1341	XSendEvent (disp, ev.xclient.window = display->root,
		1342	False, SubstructureRedirectMask \| SubstructureNotifyMask,
		1343	&ev);
		1344	#endif
		1345	}
		1346	#if ENABLE_XEMBED
		1347	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1348	{
		1349	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1350	focus_in ();
		1351	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1352	focus_out ();
		1353	}
		1354	#endif
1319	#ifdef OFFIX_DND	1355	#ifdef OFFIX_DND
1320	/* OffiX Dnd (drag 'n' drop) protocol */	1356	/* OffiX Dnd (drag 'n' drop) protocol */
1321	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1357	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322	&& (ev.xclient.data.l[0] == DndFile	1358	&& (ev.xclient.data.l[0] == DndFile
1323	\|\| ev.xclient.data.l[0] == DndDir	1359	\|\| ev.xclient.data.l[0] == DndDir
1324	\|\| ev.xclient.data.l[0] == DndLink))	1360	\|\| ev.xclient.data.l[0] == DndLink))
1325	{	1361	{
1326	/* Get Dnd data */	1362	/* Get Dnd data */
1327	Atom ActualType;	1363	Atom ActualType;
1328	int ActualFormat;	1364	int ActualFormat;
1329	unsigned char *data;	1365	unsigned char *data;
1330	unsigned long Size, RemainingBytes;	1366	unsigned long Size, RemainingBytes;
1331		1367
1332	XGetWindowProperty (display->display, display->root,	1368	XGetWindowProperty (disp, display->root,
1333	xa[XA_DNDSELECTION],	1369	xa[XA_DNDSELECTION],
1334	0L, 1000000L,	1370	0L, 1000000L,
1335	False, AnyPropertyType,	1371	False, AnyPropertyType,
1336	&ActualType, &ActualFormat,	1372	&ActualType, &ActualFormat,
1337	&Size, &RemainingBytes,	1373	&Size, &RemainingBytes,
1338	&data);	1374	&data);
1339	XChangeProperty (display->display, display->root,	1375	set_string_property (XA_CUT_BUFFER0, data);
1340	XA_CUT_BUFFER0, XA_STRING,
1341	8, PropModeReplace,
1342	data, strlen (data));
1343	XFree (data);	1376	XFree (data);
1344	selection_paste (display->root, XA_CUT_BUFFER0, True);	1377	selection_paste (display->root, XA_CUT_BUFFER0, true);
1345	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1378	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1346	}	1379	}
1347	#endif /* OFFIX_DND */	1380	#endif /* OFFIX_DND */
1348	break;	1381	break;
1349		1382
1350	case MappingNotify:	1383	case MappingNotify:
…		…
1375	break;	1408	break;
1376	}	1409	}
1377	break;	1410	break;
1378		1411
1379	case FocusIn:	1412	case FocusIn:
1380	if (!TermWin.focus)	1413	focus_in ();
1381	{
1382	TermWin.focus = 1;
1383	want_refresh = 1;
1384	#ifdef USE_XIM
1385	if (Input_Context != NULL)
1386	{
1387	IMSetStatusPosition ();
1388	XSetICFocus (Input_Context);
1389	}
1390	#endif
1391	#ifdef CURSOR_BLINK
1392	if (options & Opt_cursorBlink)
1393	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394	#endif
1395	#ifdef OFF_FOCUS_FADING
1396	if (rs[Rs_fade])
1397	{
1398	pix_colors = pix_colors_focused;
1399	scr_recolour ();
1400	}
1401	#endif
1402
1403	}
1404	break;	1414	break;
1405		1415
1406	case FocusOut:	1416	case FocusOut:
1407	if (TermWin.focus)	1417	focus_out ();
1408	{
1409	TermWin.focus = 0;
1410	want_refresh = 1;
1411
1412	#if ENABLE_FRILLS \|\| ISO_14755
1413	iso14755buf = 0;
1414	#endif
1415	#if ENABLE_OVERLAY
1416	scr_overlay_off ();
1417	#endif
1418	#ifdef USE_XIM
1419	if (Input_Context != NULL)
1420	XUnsetICFocus (Input_Context);
1421	#endif
1422	#ifdef CURSOR_BLINK
1423	if (options & Opt_cursorBlink)
1424	cursor_blink_ev.stop ();
1425	hidden_cursor = 0;
1426	#endif
1427	#ifdef OFF_FOCUS_FADING
1428	if (rs[Rs_fade])
1429	{
1430	pix_colors = pix_colors_unfocused;
1431	scr_recolour ();
1432	}
1433	#endif
1434	}
1435	break;	1418	break;
1436		1419
1437	case ConfigureNotify:	1420	case ConfigureNotify:
1438	if (ev.xconfigure.window == TermWin.parent[0])	1421	if (ev.xconfigure.window == TermWin.parent[0])
1439	{	1422	{
…		…
1443	{ /* Wrap lots of configures into one */	1426	{ /* Wrap lots of configures into one */
1444	width = ev.xconfigure.width;	1427	width = ev.xconfigure.width;
1445	height = ev.xconfigure.height;	1428	height = ev.xconfigure.height;
1446	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1429	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1447	}	1430	}
1448	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1431	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1449		1432
1450	if (szHint.width != width \|\| szHint.height != height)	1433	if (szHint.width != width \|\| szHint.height != height)
1451	{	1434	{
1452	seen_resize = 1;	1435	seen_resize = 1;
1453	resize_all_windows (width, height, 1);	1436	resize_all_windows (width, height, 1);
1454	}	1437	}
1455		1438
1456	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1439	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457	if (options & Opt_transparent)	1440	if (options & Opt_transparent)
1458	{
1459	check_our_parents ();	1441	check_our_parents ();
1460	if (am_transparent)
1461	want_refresh = want_full_refresh = 1;
1462	}
1463	#endif	1442	#endif
1464	}	1443	}
1465	break;	1444	break;
1466		1445
1467	case PropertyNotify:	1446	case PropertyNotify:
…		…
1475	selection_clear ();	1454	selection_clear ();
1476	break;	1455	break;
1477		1456
1478	case SelectionNotify:	1457	case SelectionNotify:
1479	if (selection_wait == Sel_normal)	1458	if (selection_wait == Sel_normal)
1480	selection_paste (ev.xselection.requestor,	1459	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481	ev.xselection.property, True);
1482	break;	1460	break;
1483		1461
1484	case SelectionRequest:	1462	case SelectionRequest:
1485	selection_send (ev.xselectionrequest);	1463	selection_send (ev.xselectionrequest);
1486	break;	1464	break;
…		…
1510	if (ev.xany.window == TermWin.vt)	1488	if (ev.xany.window == TermWin.vt)
1511	{	1489	{
1512	do	1490	do
1513	scr_expose (ev.xexpose.x, ev.xexpose.y,	1491	scr_expose (ev.xexpose.x, ev.xexpose.y,
1514	ev.xexpose.width, ev.xexpose.height, False);	1492	ev.xexpose.width, ev.xexpose.height, False);
1515	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1493	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1516		1494
1517	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1495	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518		1496
1519	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1497	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1520	scr_expose (ev.xexpose.x, ev.xexpose.y,	1498	scr_expose (ev.xexpose.x, ev.xexpose.y,
1521	ev.xexpose.width, ev.xexpose.height, False);	1499	ev.xexpose.width, ev.xexpose.height, False);
1522		1500
1523	scr_refresh (refresh_type);	1501	scr_refresh (refresh_type);
1524	}	1502	}
1525	else	1503	else
1526	{	1504	{
1527	XEvent unused_event;	1505	XEvent unused_event;
1528		1506
1529	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1507	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1530	;	1508	;
1531	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1509	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1532	;	1510	;
1533		1511
1534	if (isScrollbarWindow (ev.xany.window))	1512	if (isScrollbarWindow (ev.xany.window))
1535	{	1513	{
1536	scrollBar.setIdle ();	1514	scrollBar.setIdle ();
…		…
1541	menubar_expose ();	1519	menubar_expose ();
1542	#endif	1520	#endif
1543		1521
1544	#ifdef TRANSPARENT	1522	#ifdef TRANSPARENT
1545	if (am_transparent && ev.xany.window == TermWin.parent[0])	1523	if (am_transparent && ev.xany.window == TermWin.parent[0])
1546	XClearWindow (display->display, ev.xany.window);	1524	XClearWindow (disp, ev.xany.window);
1547	#endif	1525	#endif
1548	}	1526	}
1549	break;	1527	break;
1550		1528
1551	case MotionNotify:	1529	case MotionNotify:
…		…
1565		1543
1566	if (ev.xany.window == TermWin.vt)	1544	if (ev.xany.window == TermWin.vt)
1567	{	1545	{
1568	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1546	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1569	{	1547	{
1570	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1548	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1571	;	1549	;
1572		1550
1573	XQueryPointer (display->display, TermWin.vt,	1551	XQueryPointer (disp, TermWin.vt,
1574	&unused_root, &unused_child,	1552	&unused_root, &unused_child,
1575	&unused_root_x, &unused_root_y,	1553	&unused_root_x, &unused_root_y,
1576	&ev.xbutton.x, &ev.xbutton.y,	1554	&ev.xbutton.x, &ev.xbutton.y,
1577	&ev.xbutton.state);	1555	&ev.xbutton.state);
1578	#ifdef MOUSE_THRESHOLD	1556	#ifdef MOUSE_THRESHOLD
…		…
1642	#endif	1620	#endif
1643	}	1621	}
1644	}	1622	}
1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1623	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646	{	1624	{
1647	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1625	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1648	MotionNotify, &ev))	1626	MotionNotify, &ev))
1649	;	1627	;
1650		1628
1651	XQueryPointer (display->display, scrollBar.win,	1629	XQueryPointer (disp, scrollBar.win,
1652	&unused_root, &unused_child,	1630	&unused_root, &unused_child,
1653	&unused_root_x, &unused_root_y,	1631	&unused_root_x, &unused_root_y,
1654	&ev.xbutton.x, &ev.xbutton.y,	1632	&ev.xbutton.x, &ev.xbutton.y,
1655	&unused_mask);	1633	&unused_mask);
1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1634	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1661	}	1639	}
1662	break;	1640	break;
1663	}	1641	}
1664	}	1642	}
1665		1643
		1644	void
		1645	rxvt_term::focus_in ()
		1646	{
		1647	if (!TermWin.focus)
		1648	{
		1649	TermWin.focus = 1;
		1650	want_refresh = 1;
		1651	#ifdef USE_XIM
		1652	if (Input_Context != NULL)
		1653	{
		1654	IMSetStatusPosition ();
		1655	XSetICFocus (Input_Context);
		1656	}
		1657	#endif
		1658	#ifdef CURSOR_BLINK
		1659	if (options & Opt_cursorBlink)
		1660	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1661	#endif
		1662	#ifdef OFF_FOCUS_FADING
		1663	if (rs[Rs_fade])
		1664	{
		1665	pix_colors = pix_colors_focused;
		1666	scr_recolour ();
		1667	}
		1668	#endif
		1669	}
		1670	}
		1671
		1672	void
		1673	rxvt_term::focus_out ()
		1674	{
		1675	if (TermWin.focus)
		1676	{
		1677	TermWin.focus = 0;
		1678	want_refresh = 1;
		1679
		1680	#if ENABLE_FRILLS \|\| ISO_14755
		1681	iso14755buf = 0;
		1682	#endif
		1683	#if ENABLE_OVERLAY
		1684	scr_overlay_off ();
		1685	#endif
		1686	#ifdef USE_XIM
		1687	if (Input_Context != NULL)
		1688	XUnsetICFocus (Input_Context);
		1689	#endif
		1690	#ifdef CURSOR_BLINK
		1691	if (options & Opt_cursorBlink)
		1692	cursor_blink_ev.stop ();
		1693	hidden_cursor = 0;
		1694	#endif
		1695	#ifdef OFF_FOCUS_FADING
		1696	if (rs[Rs_fade])
		1697	{
		1698	pix_colors = pix_colors_unfocused;
		1699	scr_recolour ();
		1700	}
		1701	#endif
		1702	}
		1703	}
		1704
1666	#if TRANSPARENT	1705	#if TRANSPARENT
1667	void	1706	void
1668	rxvt_term::rootwin_cb (XEvent &ev)	1707	rxvt_term::rootwin_cb (XEvent &ev)
1669	{	1708	{
1670	SET_R (this);	1709	SET_R (this);
…		…
1675	case PropertyNotify:	1714	case PropertyNotify:
1676	/*	1715	/*
1677	* if user used some Esetroot compatible prog to set the root bg,	1716	* if user used some Esetroot compatible prog to set the root bg,
1678	* use the property to determine the pixmap. We use it later on.	1717	* use the property to determine the pixmap. We use it later on.
1679	*/	1718	*/
1680	if (xa[XA_XROOTPMAPID] == 0)
1681	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1682
1683	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1719	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1720	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1684	return;	1721	return;
1685		1722
1686	/* FALLTHROUGH */	1723	/* FALLTHROUGH */
1687	case ReparentNotify:	1724	case ReparentNotify:
1688	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1725	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1760	{	1797	{
1761	case Button1:	1798	case Button1:
1762	/* allow meta + click to select rectangular areas */	1799	/* allow meta + click to select rectangular areas */
1763	/* should be done in screen.C */	1800	/* should be done in screen.C */
1764	#if ENABLE_FRILLS	1801	#if ENABLE_FRILLS
1765	selection.rect = !! (ev.state & ModMetaMask);	1802	selection.rect = !!(ev.state & ModMetaMask);
1766	#else	1803	#else
1767	selection.rect = false;	1804	selection.rect = false;
1768	#endif	1805	#endif
1769		1806
1770	/* allow shift+left click to extend selection */	1807	/* allow shift+left click to extend selection */
…		…
2096	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2133	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2097	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2134	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2135	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099	int i;	2136	int i;
2100		2137
2101	Visual* visual = display->visual;	2138	Visual *visual = display->visual;
2102		2139
2103	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2140	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2104		2141
2105	/* for convenience */	2142	/* for convenience */
2106	mask_r = visual->red_mask;	2143	mask_r = visual->red_mask;
…		…
2327	Atom atype;	2364	Atom atype;
2328	unsigned char *prop = NULL;	2365	unsigned char *prop = NULL;
2329	Window root, oldp, *list;	2366	Window root, oldp, *list;
2330	Pixmap rootpixmap = None;	2367	Pixmap rootpixmap = None;
2331	XWindowAttributes wattr, wrootattr;	2368	XWindowAttributes wattr, wrootattr;
		2369	dDisp;
2332		2370
2333	pchanged = 0;	2371	pchanged = 0;
2334		2372
2335	if (!(options & Opt_transparent))	2373	if (!(options & Opt_transparent))
2336	return pchanged; /* Don't try any more */	2374	return pchanged; /* Don't try any more */
2337		2375
2338	XGetWindowAttributes (display->display, display->root, &wrootattr);	2376	XGetWindowAttributes (disp, display->root, &wrootattr);
2339	rootdepth = wrootattr.depth;	2377	rootdepth = wrootattr.depth;
2340		2378
2341	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2379	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2342		2380
2343	if (rootdepth != wattr.depth)	2381	if (rootdepth != wattr.depth)
2344	{	2382	{
2345	if (am_transparent)	2383	if (am_transparent)
2346	{	2384	{
2347	pchanged = 1;	2385	pchanged = 1;
2348	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2386	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2349	am_transparent = am_pixmap_trans = 0;	2387	am_transparent = am_pixmap_trans = 0;
2350	}	2388	}
2351		2389
2352	return pchanged; /* Don't try any more */	2390	return pchanged; /* Don't try any more */
2353	}	2391	}
2354		2392
2355	/* Get all X ops out of the queue so that our information is up-to-date. */	2393	/* Get all X ops out of the queue so that our information is up-to-date. */
2356	XSync (display->display, False);	2394	XSync (disp, False);
2357		2395
2358	/*	2396	/*
2359	* Make the frame window set by the window manager have	2397	* Make the frame window set by the window manager have
2360	* the root background. Some window managers put multiple nested frame	2398	* the root background. Some window managers put multiple nested frame
2361	* windows for each client, so we have to take care about that.	2399	* windows for each client, so we have to take care about that.
2362	*/	2400	*/
2363	i = (xa[XA_XROOTPMAPID]	2401	i = (xa[XA_XROOTPMAP_ID]
2364	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2402	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2365	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2403	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366	&nitems, &bytes_after, &prop) == Success);	2404	&nitems, &bytes_after, &prop) == Success);
2367		2405
2368	if (!i \|\| prop == NULL)	2406	if (!i \|\| prop == NULL)
2369	i = (xa[XA_XSETROOTID]	2407	i = (xa[XA_ESETROOT_PMAP_ID]
2370	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2408	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2371	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2409	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372	&nitems, &bytes_after, &prop) == Success);	2410	&nitems, &bytes_after, &prop) == Success);
2373		2411
2374	if (!i \|\| prop == NULL	2412	if (!i \|\| prop == NULL
2375	#if TINTING	2413	#if TINTING
…		…
2394	Window cr;	2432	Window cr;
2395	XImage *image;	2433	XImage *image;
2396	GC gc;	2434	GC gc;
2397	XGCValues gcvalue;	2435	XGCValues gcvalue;
2398		2436
2399	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2437	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2400	0, 0, &sx, &sy, &cr);	2438	0, 0, &sx, &sy, &cr);
2401	nw = (unsigned int)szHint.width;	2439	nw = (unsigned int)szHint.width;
2402	nh = (unsigned int)szHint.height;	2440	nh = (unsigned int)szHint.height;
2403	nx = ny = 0;	2441	nx = ny = 0;
2404		2442
…		…
2416	sy = 0;	2454	sy = 0;
2417	}	2455	}
2418		2456
2419	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2457	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2420	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2458	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2459
		2460	XSync (disp, False);
2421	allowedxerror = -1;	2461	allowedxerror = -1;
2422	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2462	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423		2463
2424	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2464	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2425	/* XXX: may need a delay here? */	2465	/* XXX: may need a delay here? */
2426	allowedxerror = 0;	2466	allowedxerror = 0;
2427		2467
…		…
2430	if (am_transparent && am_pixmap_trans)	2470	if (am_transparent && am_pixmap_trans)
2431	{	2471	{
2432	pchanged = 1;	2472	pchanged = 1;
2433	if (TermWin.pixmap != None)	2473	if (TermWin.pixmap != None)
2434	{	2474	{
2435	XFreePixmap (display->display, TermWin.pixmap);	2475	XFreePixmap (disp, TermWin.pixmap);
2436	TermWin.pixmap = None;	2476	TermWin.pixmap = None;
2437	}	2477	}
2438	}	2478	}
2439		2479
2440	am_pixmap_trans = 0;	2480	am_pixmap_trans = 0;
2441	}	2481	}
2442	else	2482	else
2443	{	2483	{
2444	if (TermWin.pixmap != None)	2484	if (TermWin.pixmap != None)
2445	XFreePixmap (display->display, TermWin.pixmap);	2485	XFreePixmap (disp, TermWin.pixmap);
2446		2486
2447	#if TINTING	2487	#if TINTING
2448	if (ISSET_PIXCOLOR (Color_tint))	2488	if (ISSET_PIXCOLOR (Color_tint))
2449	{	2489	{
2450	unsigned short rm, gm, bm;	2490	unsigned short rm, gm, bm;
…		…
2454		2494
2455	ShadeXImage (display, image, shade, rm, gm, bm);	2495	ShadeXImage (display, image, shade, rm, gm, bm);
2456	}	2496	}
2457	#endif	2497	#endif
2458		2498
2459	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2499	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2460	szHint.width, szHint.height, image->depth);	2500	szHint.width, szHint.height, image->depth);
2461	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2501	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2462	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2502	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2463	nx, ny, image->width, image->height);	2503	nx, ny, image->width, image->height);
2464	XFreeGC (display->display, gc);	2504	XFreeGC (disp, gc);
2465	XDestroyImage (image);	2505	XDestroyImage (image);
2466	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2506	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2467	XClearWindow (display->display, TermWin.parent[0]);	2507	XClearWindow (disp, TermWin.parent[0]);
2468		2508
2469	if (!am_transparent \|\| !am_pixmap_trans)	2509	if (!am_transparent \|\| !am_pixmap_trans)
2470	pchanged = 1;	2510	pchanged = 1;
2471		2511
2472	am_transparent = am_pixmap_trans = 1;	2512	am_transparent = am_pixmap_trans = 1;
2473	}	2513	}
2474	}	2514	}
2475		2515
2476	if (!am_pixmap_trans)	2516	if (am_pixmap_trans)
		2517	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2518	else
2477	{	2519	{
2478	unsigned int n;	2520	unsigned int n;
2479	/*	2521	/*
2480	* InheritPixmap transparency	2522	* InheritPixmap transparency
2481	*/	2523	*/
2482	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2524	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2483	{	2525	{
2484	oldp = TermWin.parent[i];	2526	oldp = TermWin.parent[i];
2485	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2527	XQueryTree (disp, TermWin.parent[i - 1], &root,
2486	&TermWin.parent[i], &list, &n);	2528	&TermWin.parent[i], &list, &n);
2487	XFree (list);	2529	XFree (list);
2488		2530
2489	if (TermWin.parent[i] == display->root)	2531	if (TermWin.parent[i] == display->root)
2490	{	2532	{
…		…
2502		2544
2503	if (pchanged)	2545	if (pchanged)
2504	{	2546	{
2505	for (; n < (unsigned int)i; n++)	2547	for (; n < (unsigned int)i; n++)
2506	{	2548	{
2507	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2549	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2508	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2550	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2509	{	2551	{
2510	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2552	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2511	break;	2553	break;
2512	}	2554	}
2513	}	2555	}
2514	}	2556	}
2515		2557
2516	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2558	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2517	{	2559	{
2518	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2560	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2519	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2561	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2520	am_transparent = 0;	2562	am_transparent = 0;
2521	/* XXX: also turn off Opt_transparent? */	2563	/* XXX: also turn off Opt_transparent? */
2522	}	2564	}
2523	else	2565	else
2524	{	2566	{
…		…
2527	* needed for fvwm2.2.2 (and before?) */	2569	* needed for fvwm2.2.2 (and before?) */
2528	sleep (1);	2570	sleep (1);
2529	#endif	2571	#endif
2530	for (n = 0; n < (unsigned int)i; n++)	2572	for (n = 0; n < (unsigned int)i; n++)
2531	{	2573	{
2532	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2574	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2533	XClearWindow (display->display, TermWin.parent[n]);	2575	XClearWindow (disp, TermWin.parent[n]);
2534	}	2576	}
2535		2577
2536	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2537	am_transparent = 1;	2579	am_transparent = 1;
2538	}	2580	}
2539		2581
2540	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2582	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2541	TermWin.parent[i] = None;	2583	TermWin.parent[i] = None;
2542	}	2584	}
2543		2585
2544	if (scrollBar.win)	2586	if (scrollBar.win)
2545	{	2587	{
2546	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2588	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2547	scrollBar.setIdle ();	2589	scrollBar.setIdle ();
2548	scrollbar_show (0);	2590	scrollbar_show (0);
		2591	}
		2592
		2593	if (am_transparent)
		2594	{
		2595	want_refresh = want_full_refresh = 1;
		2596	if (am_pixmap_trans)
		2597	flush ();
2549	}	2598	}
2550		2599
2551	return pchanged;	2600	return pchanged;
2552	}	2601	}
2553	#endif	2602	#endif
…		…
2582	// some window managers resize the window early, and these programs	2631	// some window managers resize the window early, and these programs
2583	// then sometimes get the size wrong.	2632	// then sometimes get the size wrong.
2584	// unfortunately other programs are even more buggy and dislike	2633	// unfortunately other programs are even more buggy and dislike
2585	// being sent SIGWINCH, so only do it when we were in fact being	2634	// being sent SIGWINCH, so only do it when we were in fact being
2586	// resized.	2635	// resized.
2587	if (seen_resize)	2636	if (seen_resize && cmd_pid)
2588	kill (-cmd_pid, SIGWINCH);	2637	kill (-cmd_pid, SIGWINCH);
2589	}	2638	}
2590		2639
2591	/* Read a text string from the input buffer */	2640	/* Read a text string from the input buffer */
2592	unicode_t buf[UBUFSIZ];	2641	unicode_t buf[UBUFSIZ];
…		…
2705	if (len == (size_t)-1)	2754	if (len == (size_t)-1)
2706	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2755	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707		2756
2708	// assume wchar == unicode	2757	// assume wchar == unicode
2709	cmdbuf_ptr += len;	2758	cmdbuf_ptr += len;
2710	return wc;	2759	return wc & UNICODE_MASK;
2711	}	2760	}
2712		2761
2713	return NOCHAR;	2762	return NOCHAR;
2714	}	2763	}
2715		2764
…		…
3178	{	3227	{
3179	switch (priv)	3228	switch (priv)
3180	{	3229	{
3181	case '>':	3230	case '>':
3182	if (ch == CSI_DA) /* secondary device attributes */	3231	if (ch == CSI_DA) /* secondary device attributes */
3183	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3232	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3184	break;	3233	break;
3185	case '?':	3234	case '?':
3186	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3235	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3187	process_terminal_mode (ch, priv, nargs, arg);	3236	process_terminal_mode (ch, priv, nargs, arg);
3188	break;	3237	break;
…		…
3417	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3466	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3418	{	3467	{
3419	int x, y;	3468	int x, y;
3420	XWindowAttributes wattr;	3469	XWindowAttributes wattr;
3421	Window wdummy;	3470	Window wdummy;
		3471	dDisp;
3422		3472
3423	if (nargs == 0)	3473	if (nargs == 0)
3424	return;	3474	return;
3425		3475
3426	switch (args[0])	3476	switch (args[0])
3427	{	3477	{
3428	/*	3478	/*
3429	* commands	3479	* commands
3430	*/	3480	*/
3431	case 1: /* deiconify window */	3481	case 1: /* deiconify window */
3432	XMapWindow (display->display, TermWin.parent[0]);	3482	XMapWindow (disp, TermWin.parent[0]);
3433	break;	3483	break;
3434	case 2: /* iconify window */	3484	case 2: /* iconify window */
3435	XIconifyWindow (display->display, TermWin.parent[0],	3485	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3436	DefaultScreen (display->display));
3437	break;	3486	break;
3438	case 3: /* set position (pixels) */	3487	case 3: /* set position (pixels) */
3439	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3488	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3440	break;	3489	break;
3441	case 4: /* set size (pixels) */	3490	case 4: /* set size (pixels) */
3442	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3491	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3443	break;	3492	break;
3444	case 5: /* raise window */	3493	case 5: /* raise window */
3445	XRaiseWindow (display->display, TermWin.parent[0]);	3494	XRaiseWindow (disp, TermWin.parent[0]);
3446	break;	3495	break;
3447	case 6: /* lower window */	3496	case 6: /* lower window */
3448	XLowerWindow (display->display, TermWin.parent[0]);	3497	XLowerWindow (disp, TermWin.parent[0]);
3449	break;	3498	break;
3450	case 7: /* refresh window */	3499	case 7: /* refresh window */
3451	scr_touch (true);	3500	scr_touch (true);
3452	break;	3501	break;
3453	case 8: /* set size (chars) */	3502	case 8: /* set size (chars) */
…		…
3465		3514
3466	/*	3515	/*
3467	* reports - some output format copied from XTerm	3516	* reports - some output format copied from XTerm
3468	*/	3517	*/
3469	case 11: /* report window state */	3518	case 11: /* report window state */
3470	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3519	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3471	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3520	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3472	break;	3521	break;
3473	case 13: /* report window position */	3522	case 13: /* report window position */
3474	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3523	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3475	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3524	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3476	-wattr.border_width, -wattr.border_width,	3525	-wattr.border_width, -wattr.border_width,
3477	&x, &y, &wdummy);	3526	&x, &y, &wdummy);
3478	tt_printf ("\033[3;%d;%dt", x, y);	3527	tt_printf ("\033[3;%d;%dt", x, y);
3479	break;	3528	break;
3480	case 14: /* report window size (pixels) */	3529	case 14: /* report window size (pixels) */
3481	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3530	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3482	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3531	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3483	break;	3532	break;
3484	case 18: /* report text area size (chars) */	3533	case 18: /* report text area size (chars) */
3485	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3534	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3486	break;	3535	break;
…		…
3488	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3537	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3489	break;	3538	break;
3490	case 20: /* report icon label */	3539	case 20: /* report icon label */
3491	{	3540	{
3492	char *s;	3541	char *s;
3493	XGetIconName (display->display, TermWin.parent[0], &s);	3542	XGetIconName (disp, TermWin.parent[0], &s);
3494	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3543	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495	XFree (s);	3544	XFree (s);
3496	}	3545	}
3497	break;	3546	break;
3498	case 21: /* report window title */	3547	case 21: /* report window title */
3499	{	3548	{
3500	char *s;	3549	char *s;
3501	XFetchName (display->display, TermWin.parent[0], &s);	3550	XFetchName (disp, TermWin.parent[0], &s);
3502	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3551	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503	XFree (s);	3552	XFree (s);
3504	}	3553	}
3505	break;	3554	break;
3506	}	3555	}
…		…
3513	* ends_how is terminator used. returned input must be free()'d	3562	* ends_how is terminator used. returned input must be free()'d
3514	*/	3563	*/
3515	unsigned char *	3564	unsigned char *
3516	rxvt_term::get_to_st (unicode_t &ends_how)	3565	rxvt_term::get_to_st (unicode_t &ends_how)
3517	{	3566	{
3518	unicode_t seen_esc = 0, ch;	3567	unicode_t ch;
		3568	bool seen_esc = false;
3519	unsigned int n = 0;	3569	unsigned int n = 0;
3520	unsigned char *s;
3521	unsigned char string[STRING_MAX];	3570	wchar_t string[STRING_MAX];
3522		3571
3523	while ((ch = cmd_getc ()) != NOCHAR)	3572	while ((ch = cmd_getc ()) != NOCHAR)
3524	{	3573	{
3525	if (seen_esc)	3574	if (seen_esc)
3526	{	3575	{
…		…
3529	else	3578	else
3530	return NULL;	3579	return NULL;
3531	}	3580	}
3532	else if (ch == C0_ESC)	3581	else if (ch == C0_ESC)
3533	{	3582	{
3534	seen_esc = 1;	3583	seen_esc = true;
3535	continue;	3584	continue;
3536	}	3585	}
3537	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3586	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3538	break;	3587	break;
3539	else if (ch < 0x20)	3588	else if (ch < 0x20)
3540	return NULL; /* other control character - exit */	3589	return NULL; /* other control character - exit */
3541		3590
3542	seen_esc = 0;	3591	seen_esc = false;
3543		3592
3544	if (n >= sizeof (string) - 1)	3593	if (n >= sizeof (string) - 1)
3545	// stop at some sane length	3594	// stop at some sane length
3546	return NULL;	3595	return NULL;
3547		3596
…		…
3551	string[n++] = ch;	3600	string[n++] = ch;
3552	}	3601	}
3553		3602
3554	string[n++] = '\0';	3603	string[n++] = '\0';
3555		3604
3556	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557	return NULL;
3558
3559	ends_how = (ch == 0x5c ? C0_ESC : ch);	3605	ends_how = (ch == 0x5c ? C0_ESC : ch);
3560	strncpy (s, string, n);	3606
3561	return s;	3607	return (unsigned char *)rxvt_wcstombs (string);
3562	}	3608	}
3563		3609
3564	/----------------------------------------------------------------------/	3610	/----------------------------------------------------------------------/
3565	/*	3611	/*
3566	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3612	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
…		…
3651	int changed = 0;	3697	int changed = 0;
3652	int color;	3698	int color;
3653	char buf, name;	3699	char buf, name;
3654	bool query = str[0] == '?' && !str[1];	3700	bool query = str[0] == '?' && !str[1];
3655	int saveop = op;	3701	int saveop = op;
		3702	dDisp;
3656		3703
3657	assert (str != NULL);	3704	assert (str != NULL);
3658	switch (op)	3705	switch (op)
3659	{	3706	{
3660	case XTerm_name:	3707	case XTerm_name:
…		…
3667	set_title (str);	3714	set_title (str);
3668	break;	3715	break;
3669	case XTerm_property:	3716	case XTerm_property:
3670	if (str[0] == '?')	3717	if (str[0] == '?')
3671	{	3718	{
3672	Atom prop = XInternAtom (display->display, str + 1, True);	3719	Atom prop = display->atom (str + 1);
3673	Atom actual_type;	3720	Atom actual_type;
3674	int actual_format;	3721	int actual_format;
3675	unsigned long nitems;	3722	unsigned long nitems;
3676	unsigned long bytes_after;	3723	unsigned long bytes_after;
3677	unsigned char *value = 0;	3724	unsigned char *value = 0;
3678	const char *str = "";	3725	const char *str = "";
3679		3726
3680	if (prop	3727	if (prop
3681	&& XGetWindowProperty (display->display, TermWin.parent[0],	3728	&& XGetWindowProperty (disp, TermWin.parent[0],
3682	prop, 0, 1<<16, 0, AnyPropertyType,	3729	prop, 0, 1<<16, 0, AnyPropertyType,
3683	&actual_type, &actual_format,	3730	&actual_type, &actual_format,
3684	&nitems, &bytes_after, &value) == Success	3731	&nitems, &bytes_after, &value) == Success
3685	&& actual_type != None	3732	&& actual_type != None
3686	&& actual_format == 8)	3733	&& actual_format == 8)
…		…
3695	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3742	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696		3743
3697	if (eq)	3744	if (eq)
3698	{	3745	{
3699	*eq = 0;	3746	*eq = 0;
3700	XChangeProperty (display->display, TermWin.parent[0],	3747	set_utf8_property (display->atom (str), eq + 1);
3701	display->atom (str), XA_STRING, 8,
3702	PropModeReplace, (unsigned char *)eq + 1,
3703	strlen (eq + 1));
3704	}	3748	}
3705	else	3749	else
3706	XDeleteProperty (display->display, TermWin.parent[0],	3750	XDeleteProperty (disp, TermWin.parent[0],
3707	display->atom (str));	3751	display->atom (str));
3708	}	3752	}
3709	break;	3753	break;
3710		3754
3711	case XTerm_Color:	3755	case XTerm_Color:
…		…
3786	{	3830	{
3787	str++;	3831	str++;
3788	#if XPM_BACKGROUND	3832	#if XPM_BACKGROUND
3789	changed += scale_pixmap (str);	3833	changed += scale_pixmap (str);
3790	#endif	3834	#endif
3791
3792	}	3835	}
		3836
3793	if (changed)	3837	if (changed)
3794	{	3838	{
3795	#ifdef XPM_BACKGROUND	3839	#ifdef XPM_BACKGROUND
3796	resize_pixmap ();	3840	resize_pixmap ();
3797	#endif	3841	#endif
…		…
3838	if (query)	3882	if (query)
3839	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3883	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3840	else	3884	else
3841	{	3885	{
3842	set_locale (str);	3886	set_locale (str);
3843	# ifdef USE_XIM	3887	pty.set_utf8_mode (enc_utf8);
3844	im_cb ();	3888	init_xlocale ();
3845	# endif
3846	}	3889	}
3847	break;	3890	break;
3848	#endif	3891	#endif
3849		3892
3850	#ifdef MENUBAR	3893	#ifdef MENUBAR
…		…
4285		4328
4286	/* ---------------------------------------------------------------------- */	4329	/* ---------------------------------------------------------------------- */
4287	/* Write data to the pty as typed by the user, pasted with the mouse,	4330	/* Write data to the pty as typed by the user, pasted with the mouse,
4288	* or generated by us in response to a query ESC sequence.	4331	* or generated by us in response to a query ESC sequence.
4289	*/	4332	*/
		4333	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4334
4290	void	4335	void
4291	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4336	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4292	{	4337	{
4293	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4338	if (v_buflen == 0)
		4339	{
		4340	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4294		4341
4295	if (len)	4342	if ((unsigned int)written == len)
		4343	return;
		4344
		4345	data += written;
		4346	len -= written;
4296	{	4347	}
		4348
		4349	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4350
		4351	memcpy (v_buffer + v_buflen, data, len);
		4352	v_buflen += len;
		4353
		4354	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		4355	}
		4356
		4357	void rxvt_term::pty_write ()
		4358	{
		4359	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4360
		4361	if (written > 0)
		4362	{
		4363	v_buflen -= written;
		4364
4297	if (v_buflen == 0)	4365	if (v_buflen == 0)
4298	{	4366	{
4299	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301	if ((unsigned int)written == len)
4302	return;
4303
4304	data += written;
4305	len -= written;
4306	}
4307
4308
4309	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311	memcpy (v_buffer + v_buflen, data, len);
4312	v_buflen += len;
4313	}
4314
4315	for (;;)
4316	{
4317	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319	if (written > 0)
4320	{
4321	v_buflen -= written;
4322
4323	if (v_buflen == 0)
4324	{
4325	free (v_buffer);	4367	free (v_buffer);
4326	v_buffer = 0;	4368	v_buffer = 0;
4327	v_buflen = 0;	4369	v_buflen = 0;
4328		4370
4329	pty_ev.set (EVENT_READ);	4371	pty_ev.set (EVENT_READ);
4330	return;
4331	}
4332
4333	memmove (v_buffer, v_buffer + written, v_buflen);
4334	}
4335	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4336	// original code just ignores this...
4337	destroy ();
4338	else
4339	{
4340	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4341	return;	4372	return;
4342	}	4373	}
		4374
		4375	memmove (v_buffer, v_buffer + written, v_buflen);
4343	}	4376	}
		4377	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4378	// original code just ignores this...
		4379	destroy ();
4344	}	4380	}
4345		4381
4346	/----------------------- end-of-file (C source) -----------------------/	4382	/----------------------- end-of-file (C source) -----------------------/
4347		4383

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs. Revision 1.200 by root, Sun Feb 20 19:45:30 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.200 by root, Sun Feb 20 19:45:30 2005 UTC