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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.199 by root, Sun Feb 20 02:00:43 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
		57	#include <csignal>
54		58
55	/----------------------------------------------------------------------/	59	/----------------------------------------------------------------------/
56		60
57	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58		62
…		…
113	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
114	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
115	XK_Print, 0x2399,	119	XK_Print, 0x2399,
116		120
117	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,
118	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
119	0,	131	0,
120	};	132	};
121		133
122	void	134	void
123	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
…		…
272	* 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
273	* escape sequence to toggle the Keypad.	285	* escape sequence to toggle the Keypad.
274	*	286	*
275	* Always permit `shift' to override the current setting	287	* Always permit `shift' to override the current setting
276	*/	288	*/
277	shft = (ev.state & ShiftMask);	289	shft = ev.state & ShiftMask;
278	ctrl = (ev.state & ControlMask);	290	ctrl = ev.state & ControlMask;
279	meta = (ev.state & ModMetaMask);	291	meta = ev.state & ModMetaMask;
280		292
281	if (numlock_state \|\| (ev.state & ModNumLockMask))	293	if (numlock_state \|\| (ev.state & ModNumLockMask))
282	{	294	{
283	numlock_state = (ev.state & ModNumLockMask);	295	numlock_state = (ev.state & ModNumLockMask);
284	PrivMode ((!numlock_state), PrivMode_aplKP);	296	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
343	valid_keysym = keysym != NoSymbol;	355	valid_keysym = keysym != NoSymbol;
344	}	356	}
345		357
346	if (valid_keysym)	358	if (valid_keysym)
347	{	359	{
		360	#ifdef KEYSYM_RESOURCE
		361	if (keyboard->dispatch (this, keysym, ev.state))
		362	return;
		363	#endif
		364
348	if (TermWin.saveLines)	365	if (TermWin.saveLines)
349	{	366	{
350	#ifdef UNSHIFTED_SCROLLKEYS	367	#ifdef UNSHIFTED_SCROLLKEYS
351	if (!ctrl && !meta)	368	if (!ctrl && !meta)
352	#else	369	#else
…		…
417	{	434	{
418	/* normal XTerm key bindings */	435	/* normal XTerm key bindings */
419	case XK_Insert: /* Shift+Insert = paste mouse selection */	436	case XK_Insert: /* Shift+Insert = paste mouse selection */
420	selection_request (ev.time, 0, 0);	437	selection_request (ev.time, 0, 0);
421	return;	438	return;
422	#if TODO // TODO	439	#if TODO
423	/* rxvt extras */	440	/* rxvt extras */
424	case XK_KP_Add: /* Shift+KP_Add = bigger font */	441	case XK_KP_Add: /* Shift+KP_Add = bigger font */
425	change_font (FONT_UP);	442	change_font (FONT_UP);
426	return;	443	return;
427	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	444	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
…		…
486	}	503	}
487	#endif	504	#endif
488		505
489	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	506	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490	{	507	{
491	#ifdef KEYSYM_RESOURCE
492	if (! (shft \| ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493	{
494	unsigned int l;
495	const unsigned char *kbuf0;
496
497	kbuf0 = (Keysym_map[keysym & 0xFF]);
498	l = (unsigned int)*kbuf0++;
499
500	/* escape prefix */
501	if (meta
502	# ifdef META8_OPTION
503	&& meta_char == C0_ESC
504	# endif
505	)
506	{
507	const unsigned char ch = C0_ESC;
508	tt_write (&ch, 1);
509	}
510
511	tt_write (kbuf0, l);
512	return;
513	}
514	else
515	#endif
516	{	508	{
517	newlen = 1;	509	newlen = 1;
518	switch (keysym)	510	switch (keysym)
519	{	511	{
520	#ifndef NO_BACKSPACE_KEY	512	#ifndef NO_BACKSPACE_KEY
…		…
528	else	520	else
529	strcpy (kbuf, key_backspace);	521	strcpy (kbuf, key_backspace);
530	break;	522	break;
531	#endif	523	#endif
532	#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
533	case XK_Delete:	535	case XK_Delete:
534	strcpy (kbuf, key_delete);	536	strcpy (kbuf, key_delete);
535	break;	537	break;
536	#endif	538	#endif
537	case XK_Tab:	539	case XK_Tab:
…		…
640	#ifdef XK_KP_Begin	642	#ifdef XK_KP_Begin
641	case XK_KP_Begin:	643	case XK_KP_Begin:
642	strcpy (kbuf, "\033Ou");	644	strcpy (kbuf, "\033Ou");
643	break;	645	break;
644		646
645	case XK_KP_Insert:
646	strcpy (kbuf, "\033Op");
647	break;
648
649	case XK_KP_Delete:
650	strcpy (kbuf, "\033On");
651	break;
652	#endif	647	#endif
653	case XK_KP_F1: /* "\033OP" */	648	case XK_KP_F1: /* "\033OP" */
654	case XK_KP_F2: /* "\033OQ" */	649	case XK_KP_F2: /* "\033OQ" */
655	case XK_KP_F3: /* "\033OR" */	650	case XK_KP_F3: /* "\033OR" */
656	case XK_KP_F4: /* "\033OS" */	651	case XK_KP_F4: /* "\033OS" */
…		…
688	break;	683	break;
689		684
690	case XK_Find:	685	case XK_Find:
691	strcpy (kbuf, "\033[1~");	686	strcpy (kbuf, "\033[1~");
692	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
693	case XK_Insert:	699	case XK_Insert:
694	strcpy (kbuf, "\033[2~");	700	strcpy (kbuf, "\033[2~");
695	break;	701	break;
696	#ifdef DXK_Remove /* support for DEC remove like key */	702	#ifdef DXK_Remove /* support for DEC remove like key */
697	case DXK_Remove:	703	case DXK_Remove:
…		…
787	#undef FKEY	793	#undef FKEY
788	default:	794	default:
789	newlen = 0;	795	newlen = 0;
790	break;	796	break;
791	}	797	}
		798
792	if (newlen)	799	if (newlen)
793	len = strlen (kbuf);	800	len = strlen (kbuf);
794	}	801	}
795		802
796	/*	803	/*
…		…
804	}	811	}
805	else if (ctrl && keysym == XK_minus)	812	else if (ctrl && keysym == XK_minus)
806	{	813	{
807	len = 1;	814	len = 1;
808	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;
809	}	821	}
810	else	822	else
811	{	823	{
812	#ifdef META8_OPTION	824	#ifdef META8_OPTION
813	/* set 8-bit on */	825	/* set 8-bit on */
…		…
872	#endif /* DEBUG_CMD */	884	#endif /* DEBUG_CMD */
873	tt_write (kbuf, (unsigned int)len);	885	tt_write (kbuf, (unsigned int)len);
874	}	886	}
875	/}}} /	887	/}}} /
876		888
877	#if (MENUBAR_MAX)	889	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
878	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	890	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
879	/* attempt to `write' count to the input buffer */	891	/* attempt to `write' count to the input buffer */
880	unsigned int	892	unsigned int
881	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	893	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882	{	894	{
…		…
905		917
906	cmd_parse ();	918	cmd_parse ();
907		919
908	return 0;	920	return 0;
909	}	921	}
910	#endif /* MENUBAR_MAX */	922	#endif
911		923
912	void	924	void
913	rxvt_term::flush ()	925	rxvt_term::flush ()
914	{	926	{
		927	flush_ev.stop ();
		928
915	#ifdef TRANSPARENT	929	#ifdef TRANSPARENT
916	if (want_full_refresh)	930	if (want_full_refresh)
917	{	931	{
918	want_full_refresh = 0;	932	want_full_refresh = 0;
919	scr_clear ();	933	scr_clear ();
…		…
929	IMSendSpot ();	943	IMSendSpot ();
930	#endif	944	#endif
931	}	945	}
932		946
933	display->flush ();	947	display->flush ();
934
935	flush_ev.stop ();
936	}	948	}
937		949
938	void	950	void
939	rxvt_term::check_cb (check_watcher &w)	951	rxvt_term::check_cb (check_watcher &w)
940	{	952	{
…		…
1016	{	1028	{
1017	if (mouse_slip_wheel_speed == 0	1029	if (mouse_slip_wheel_speed == 0
1018	\|\| 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)
1019	: scr_page (UP, mouse_slip_wheel_speed))	1031	: scr_page (UP, mouse_slip_wheel_speed))
1020	{	1032	{
		1033	if (TermWin.view_start == TermWin.nscrolled \|\|
		1034	TermWin.view_start == 0)
		1035	mouse_slip_wheel_speed = 0;
		1036
1021	refresh_type \|= SMOOTH_REFRESH;	1037	refresh_type \|= SMOOTH_REFRESH;
1022	want_refresh = 1;	1038	want_refresh = 1;
1023	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1039	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024	}	1040	}
1025	}	1041	}
…		…
1057	rxvt_term::pty_cb (io_watcher &w, short revents)	1073	rxvt_term::pty_cb (io_watcher &w, short revents)
1058	{	1074	{
1059	SET_R (this);	1075	SET_R (this);
1060	SET_LOCALE (locale);	1076	SET_LOCALE (locale);
1061		1077
1062	if (revents & EVENT_WRITE)
1063	tt_write (0, 0);
1064	else if (revents & EVENT_READ)	1078	if (revents & EVENT_READ)
1065	// loop, but don't allow a single term to monopolize us	1079	// loop, but don't allow a single term to monopolize us
1066	while (pty_fill ())	1080	while (pty_fill ())
1067	if (cmd_parse ())	1081	if (cmd_parse ())
1068	break;	1082	break;
		1083
		1084	if (revents & EVENT_WRITE)
		1085	pty_write ();
1069	}	1086	}
1070		1087
1071	void	1088	void
1072	rxvt_term::pointer_unblank ()	1089	rxvt_term::pointer_unblank ()
1073	{	1090	{
…		…
1087	rxvt_term::pointer_blank ()	1104	rxvt_term::pointer_blank ()
1088	{	1105	{
1089	if (! (options & Opt_pointerBlank))	1106	if (! (options & Opt_pointerBlank))
1090	return;	1107	return;
1091		1108
1092	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1109	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1093	XFlush (display->display);	1110	XFlush (display->display);
1094		1111
1095	hidden_pointer = 1;	1112	hidden_pointer = 1;
1096	}	1113	}
1097		1114
…		…
1186		1203
1187	/{{{ process an X event /	1204	/{{{ process an X event /
1188	void	1205	void
1189	rxvt_term::x_cb (XEvent &ev)	1206	rxvt_term::x_cb (XEvent &ev)
1190	{	1207	{
		1208	dDisp;
		1209
1191	SET_R (this);	1210	SET_R (this);
1192	SET_LOCALE (locale);	1211	SET_LOCALE (locale);
1193		1212
1194	#if defined(CURSOR_BLINK)	1213	#if defined(CURSOR_BLINK)
1195	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1214	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1216	if (ev.type == KeyPress && hidden_pointer == 0)	1235	if (ev.type == KeyPress && hidden_pointer == 0)
1217	pointer_blank ();	1236	pointer_blank ();
1218	}	1237	}
1219	#endif	1238	#endif
1220		1239
1221	#ifdef USE_XIM
1222	if (XFilterEvent (&ev, None))
1223	return;
1224	#endif
1225
1226	Window unused_root, unused_child;	1240	Window unused_root, unused_child;
1227	int unused_root_x, unused_root_y;	1241	int unused_root_x, unused_root_y;
1228	unsigned int unused_mask;	1242	unsigned int unused_mask;
1229		1243
1230	switch (ev.type)	1244	switch (ev.type)
1231	{	1245	{
1232	case KeyPress:	1246	case KeyPress:
1233	#if ISO_14755	1247	#if ISO_14755
…		…
1316	button_release (ev.xbutton);	1330	button_release (ev.xbutton);
1317	break;	1331	break;
1318		1332
1319	case ClientMessage:	1333	case ClientMessage:
1320	if (ev.xclient.format == 32	1334	if (ev.xclient.format == 32
		1335	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
1321	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1336	&& ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1322	destroy ();	1337	destroy ();
		1338	#if ENABLE_XEMBED
		1339	else if (ev.xclient.format == 32
		1340	&& ev.xclient.message_type == xa[XA_XEMBED])
		1341	{
		1342	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1343	focus_in ();
		1344	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1345	focus_out ();
		1346	}
		1347	#endif
1323	#ifdef OFFIX_DND	1348	#ifdef OFFIX_DND
1324	/* OffiX Dnd (drag 'n' drop) protocol */	1349	/* OffiX Dnd (drag 'n' drop) protocol */
1325	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1350	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1326	&& (ev.xclient.data.l[0] == DndFile	1351	&& (ev.xclient.data.l[0] == DndFile
1327	\|\| ev.xclient.data.l[0] == DndDir	1352	\|\| ev.xclient.data.l[0] == DndDir
1328	\|\| ev.xclient.data.l[0] == DndLink))	1353	\|\| ev.xclient.data.l[0] == DndLink))
1329	{	1354	{
1330	/* Get Dnd data */	1355	/* Get Dnd data */
1331	Atom ActualType;	1356	Atom ActualType;
1332	int ActualFormat;	1357	int ActualFormat;
1333	unsigned char *data;	1358	unsigned char *data;
1334	unsigned long Size, RemainingBytes;	1359	unsigned long Size, RemainingBytes;
1335		1360
1336	XGetWindowProperty (display->display, display->root,	1361	XGetWindowProperty (disp, display->root,
1337	xa[XA_DNDSELECTION],	1362	xa[XA_DNDSELECTION],
1338	0L, 1000000L,	1363	0L, 1000000L,
1339	False, AnyPropertyType,	1364	False, AnyPropertyType,
1340	&ActualType, &ActualFormat,	1365	&ActualType, &ActualFormat,
1341	&Size, &RemainingBytes,	1366	&Size, &RemainingBytes,
1342	&data);	1367	&data);
1343	XChangeProperty (display->display, display->root,	1368	set_string_property (XA_CUT_BUFFER0, data);
1344	XA_CUT_BUFFER0, XA_STRING,
1345	8, PropModeReplace,
1346	data, strlen (data));
1347	XFree (data);	1369	XFree (data);
1348	selection_paste (display->root, XA_CUT_BUFFER0, True);	1370	selection_paste (display->root, XA_CUT_BUFFER0, true);
1349	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1371	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1350	}	1372	}
1351	#endif /* OFFIX_DND */	1373	#endif /* OFFIX_DND */
1352	break;	1374	break;
1353		1375
1354	case MappingNotify:	1376	case MappingNotify:
…		…
1379	break;	1401	break;
1380	}	1402	}
1381	break;	1403	break;
1382		1404
1383	case FocusIn:	1405	case FocusIn:
1384	if (!TermWin.focus)	1406	focus_in ();
1385	{
1386	TermWin.focus = 1;
1387	want_refresh = 1;
1388	#ifdef USE_XIM
1389	if (Input_Context != NULL)
1390	{
1391	IMSetStatusPosition ();
1392	XSetICFocus (Input_Context);
1393	}
1394	#endif
1395	#ifdef CURSOR_BLINK
1396	if (options & Opt_cursorBlink)
1397	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1398	#endif
1399	#ifdef OFF_FOCUS_FADING
1400	if (rs[Rs_fade])
1401	{
1402	pix_colors = pix_colors_focused;
1403	scr_recolour ();
1404	}
1405	#endif
1406
1407	}
1408	break;	1407	break;
1409		1408
1410	case FocusOut:	1409	case FocusOut:
1411	if (TermWin.focus)	1410	focus_out ();
1412	{
1413	TermWin.focus = 0;
1414	want_refresh = 1;
1415
1416	#if ENABLE_FRILLS \|\| ISO_14755
1417	iso14755buf = 0;
1418	#endif
1419	#if ENABLE_OVERLAY
1420	scr_overlay_off ();
1421	#endif
1422	#ifdef USE_XIM
1423	if (Input_Context != NULL)
1424	XUnsetICFocus (Input_Context);
1425	#endif
1426	#ifdef CURSOR_BLINK
1427	if (options & Opt_cursorBlink)
1428	cursor_blink_ev.stop ();
1429	hidden_cursor = 0;
1430	#endif
1431	#ifdef OFF_FOCUS_FADING
1432	if (rs[Rs_fade])
1433	{
1434	pix_colors = pix_colors_unfocused;
1435	scr_recolour ();
1436	}
1437	#endif
1438	}
1439	break;	1411	break;
1440		1412
1441	case ConfigureNotify:	1413	case ConfigureNotify:
1442	if (ev.xconfigure.window == TermWin.parent[0])	1414	if (ev.xconfigure.window == TermWin.parent[0])
1443	{	1415	{
…		…
1447	{ /* Wrap lots of configures into one */	1419	{ /* Wrap lots of configures into one */
1448	width = ev.xconfigure.width;	1420	width = ev.xconfigure.width;
1449	height = ev.xconfigure.height;	1421	height = ev.xconfigure.height;
1450	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1422	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451	}	1423	}
1452	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1424	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1453		1425
1454	if (szHint.width != width \|\| szHint.height != height)	1426	if (szHint.width != width \|\| szHint.height != height)
1455	{	1427	{
1456	seen_resize = 1;	1428	seen_resize = 1;
1457	resize_all_windows (width, height, 1);	1429	resize_all_windows (width, height, 1);
1458	}	1430	}
1459		1431
1460	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1432	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1461	if (options & Opt_transparent)	1433	if (options & Opt_transparent)
1462	{
1463	check_our_parents ();	1434	check_our_parents ();
1464	if (am_transparent)
1465	want_refresh = want_full_refresh = 1;
1466	}
1467	#endif	1435	#endif
1468	}	1436	}
1469	break;	1437	break;
1470		1438
1471	case PropertyNotify:	1439	case PropertyNotify:
…		…
1479	selection_clear ();	1447	selection_clear ();
1480	break;	1448	break;
1481		1449
1482	case SelectionNotify:	1450	case SelectionNotify:
1483	if (selection_wait == Sel_normal)	1451	if (selection_wait == Sel_normal)
1484	selection_paste (ev.xselection.requestor,	1452	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485	ev.xselection.property, True);
1486	break;	1453	break;
1487		1454
1488	case SelectionRequest:	1455	case SelectionRequest:
1489	selection_send (ev.xselectionrequest);	1456	selection_send (ev.xselectionrequest);
1490	break;	1457	break;
…		…
1514	if (ev.xany.window == TermWin.vt)	1481	if (ev.xany.window == TermWin.vt)
1515	{	1482	{
1516	do	1483	do
1517	scr_expose (ev.xexpose.x, ev.xexpose.y,	1484	scr_expose (ev.xexpose.x, ev.xexpose.y,
1518	ev.xexpose.width, ev.xexpose.height, False);	1485	ev.xexpose.width, ev.xexpose.height, False);
1519	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1486	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1520		1487
1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1488	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522		1489
1523	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1490	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1524	scr_expose (ev.xexpose.x, ev.xexpose.y,	1491	scr_expose (ev.xexpose.x, ev.xexpose.y,
1525	ev.xexpose.width, ev.xexpose.height, False);	1492	ev.xexpose.width, ev.xexpose.height, False);
1526		1493
1527	scr_refresh (refresh_type);	1494	scr_refresh (refresh_type);
1528	}	1495	}
1529	else	1496	else
1530	{	1497	{
1531	XEvent unused_event;	1498	XEvent unused_event;
1532		1499
1533	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1500	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1534	;	1501	;
1535	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1502	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1536	;	1503	;
1537		1504
1538	if (isScrollbarWindow (ev.xany.window))	1505	if (isScrollbarWindow (ev.xany.window))
1539	{	1506	{
1540	scrollBar.setIdle ();	1507	scrollBar.setIdle ();
…		…
1545	menubar_expose ();	1512	menubar_expose ();
1546	#endif	1513	#endif
1547		1514
1548	#ifdef TRANSPARENT	1515	#ifdef TRANSPARENT
1549	if (am_transparent && ev.xany.window == TermWin.parent[0])	1516	if (am_transparent && ev.xany.window == TermWin.parent[0])
1550	XClearWindow (display->display, ev.xany.window);	1517	XClearWindow (disp, ev.xany.window);
1551	#endif	1518	#endif
1552	}	1519	}
1553	break;	1520	break;
1554		1521
1555	case MotionNotify:	1522	case MotionNotify:
…		…
1562	{	1529	{
1563	menubar_control (ev.xbutton);	1530	menubar_control (ev.xbutton);
1564	break;	1531	break;
1565	}	1532	}
1566	#endif	1533	#endif
1567	if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))	1534	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568	break;	1535	break;
1569		1536
1570	if (ev.xany.window == TermWin.vt)	1537	if (ev.xany.window == TermWin.vt)
1571	{	1538	{
1572	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1539	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1573	{	1540	{
1574	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1541	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1575	;	1542	;
1576		1543
1577	XQueryPointer (display->display, TermWin.vt,	1544	XQueryPointer (disp, TermWin.vt,
1578	&unused_root, &unused_child,	1545	&unused_root, &unused_child,
1579	&unused_root_x, &unused_root_y,	1546	&unused_root_x, &unused_root_y,
1580	& (ev.xbutton.x), & (ev.xbutton.y),	1547	&ev.xbutton.x, &ev.xbutton.y,
1581	&unused_mask);	1548	&ev.xbutton.state);
1582	#ifdef MOUSE_THRESHOLD	1549	#ifdef MOUSE_THRESHOLD
1583	/* deal with a `jumpy' mouse */	1550	/* deal with a `jumpy' mouse */
1584	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)	1551	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1585	{	1552	{
1586	#endif	1553	#endif
…		…
1591	iso14755_54 (ev.xbutton.x, ev.xbutton.y);	1558	iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592	break;	1559	break;
1593	}	1560	}
1594	#endif	1561	#endif
1595	selection_extend (ev.xbutton.x, ev.xbutton.y,	1562	selection_extend (ev.xbutton.x, ev.xbutton.y,
1596	(ev.xbutton.state & Button3Mask) ? 2 : 0);	1563	ev.xbutton.state & Button3Mask ? 2 : 0);
		1564
1597	#ifdef SELECTION_SCROLLING	1565	#ifdef SELECTION_SCROLLING
1598	if (ev.xbutton.y < TermWin.int_bwidth	1566	if (ev.xbutton.y < TermWin.int_bwidth
1599	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1567	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1600	{	1568	{
1601	int dist;	1569	int dist;
…		…
1612	selection_save_x = ev.xbutton.x;	1580	selection_save_x = ev.xbutton.x;
1613	selection_save_y = ev.xbutton.y;	1581	selection_save_y = ev.xbutton.y;
1614	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1582	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1615		1583
1616	/* calc number of lines to scroll */	1584	/* calc number of lines to scroll */
1617	if (ev.xbutton.y<TermWin.int_bwidth)	1585	if (ev.xbutton.y < TermWin.int_bwidth)
1618	{	1586	{
1619	scroll_selection_dir = UP;	1587	scroll_selection_dir = UP;
1620	dist = TermWin.int_bwidth - ev.xbutton.y;	1588	dist = TermWin.int_bwidth - ev.xbutton.y;
1621	}	1589	}
1622	else	1590	else
…		…
1645	#endif	1613	#endif
1646	}	1614	}
1647	}	1615	}
1648	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1616	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1649	{	1617	{
1650	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1618	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1651	MotionNotify, &ev)) ;	1619	MotionNotify, &ev))
		1620	;
		1621
1652	XQueryPointer (display->display, scrollBar.win,	1622	XQueryPointer (disp, scrollBar.win,
1653	&unused_root, &unused_child,	1623	&unused_root, &unused_child,
1654	&unused_root_x, &unused_root_y,	1624	&unused_root_x, &unused_root_y,
1655	& (ev.xbutton.x), & (ev.xbutton.y),	1625	&ev.xbutton.x, &ev.xbutton.y,
1656	&unused_mask);	1626	&unused_mask);
1657	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1627	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1658	scrollbar_size ());	1628	scrollbar_size ());
1659	scr_refresh (refresh_type);	1629	scr_refresh (refresh_type);
1660	refresh_limit = 0;	1630	refresh_limit = 0;
…		…
1662	}	1632	}
1663	break;	1633	break;
1664	}	1634	}
1665	}	1635	}
1666		1636
		1637	void
		1638	rxvt_term::focus_in ()
		1639	{
		1640	if (!TermWin.focus)
		1641	{
		1642	TermWin.focus = 1;
		1643	want_refresh = 1;
		1644	#ifdef USE_XIM
		1645	if (Input_Context != NULL)
		1646	{
		1647	IMSetStatusPosition ();
		1648	XSetICFocus (Input_Context);
		1649	}
		1650	#endif
		1651	#ifdef CURSOR_BLINK
		1652	if (options & Opt_cursorBlink)
		1653	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1654	#endif
		1655	#ifdef OFF_FOCUS_FADING
		1656	if (rs[Rs_fade])
		1657	{
		1658	pix_colors = pix_colors_focused;
		1659	scr_recolour ();
		1660	}
		1661	#endif
		1662	}
		1663	}
		1664
		1665	void
		1666	rxvt_term::focus_out ()
		1667	{
		1668	if (TermWin.focus)
		1669	{
		1670	TermWin.focus = 0;
		1671	want_refresh = 1;
		1672
		1673	#if ENABLE_FRILLS \|\| ISO_14755
		1674	iso14755buf = 0;
		1675	#endif
		1676	#if ENABLE_OVERLAY
		1677	scr_overlay_off ();
		1678	#endif
		1679	#ifdef USE_XIM
		1680	if (Input_Context != NULL)
		1681	XUnsetICFocus (Input_Context);
		1682	#endif
		1683	#ifdef CURSOR_BLINK
		1684	if (options & Opt_cursorBlink)
		1685	cursor_blink_ev.stop ();
		1686	hidden_cursor = 0;
		1687	#endif
		1688	#ifdef OFF_FOCUS_FADING
		1689	if (rs[Rs_fade])
		1690	{
		1691	pix_colors = pix_colors_unfocused;
		1692	scr_recolour ();
		1693	}
		1694	#endif
		1695	}
		1696	}
		1697
1667	#if TRANSPARENT	1698	#if TRANSPARENT
1668	void	1699	void
1669	rxvt_term::rootwin_cb (XEvent &ev)	1700	rxvt_term::rootwin_cb (XEvent &ev)
1670	{	1701	{
1671	SET_R (this);	1702	SET_R (this);
…		…
1676	case PropertyNotify:	1707	case PropertyNotify:
1677	/*	1708	/*
1678	* if user used some Esetroot compatible prog to set the root bg,	1709	* if user used some Esetroot compatible prog to set the root bg,
1679	* use the property to determine the pixmap. We use it later on.	1710	* use the property to determine the pixmap. We use it later on.
1680	*/	1711	*/
1681	if (xa[XA_XROOTPMAPID] == 0)
1682	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1683
1684	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1712	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1713	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1685	return;	1714	return;
1686		1715
1687	/* FALLTHROUGH */	1716	/* FALLTHROUGH */
1688	case ReparentNotify:	1717	case ReparentNotify:
1689	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1718	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1715	return;	1744	return;
1716	}	1745	}
1717	#endif	1746	#endif
1718		1747
1719	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;	1748	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
		1749
1720	if (reportmode)	1750	if (reportmode)
1721	{	1751	{
1722	/* mouse report from vt window */	1752	/* mouse report from vt window */
1723	/* save the xbutton state (for ButtonRelease) */	1753	/* save the xbutton state (for ButtonRelease) */
1724	MEvent.state = ev.state;	1754	MEvent.state = ev.state;
…		…
1753	}	1783	}
1754	else	1784	else
1755	{	1785	{
1756	if (ev.button != MEvent.button)	1786	if (ev.button != MEvent.button)
1757	MEvent.clicks = 0;	1787	MEvent.clicks = 0;
		1788
1758	switch (ev.button)	1789	switch (ev.button)
1759	{	1790	{
1760	case Button1:	1791	case Button1:
		1792	/* allow meta + click to select rectangular areas */
		1793	/* should be done in screen.C */
		1794	#if ENABLE_FRILLS
		1795	selection.rect = !!(ev.state & ModMetaMask);
		1796	#else
		1797	selection.rect = false;
		1798	#endif
		1799
1761	/* allow shift+left click to extend selection */	1800	/* allow shift+left click to extend selection */
1762	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1801	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1763	{	1802	{
1764	if (MEvent.button == Button1 && clickintime)	1803	if (MEvent.button == Button1 && clickintime)
1765	selection_rotate (ev.x, ev.y);	1804	selection_rotate (ev.x, ev.y);
…		…
2087	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2126	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2088	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2127	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2128	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090	int i;	2129	int i;
2091		2130
2092	Visual* visual = display->visual;	2131	Visual *visual = display->visual;
2093		2132
2094	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2133	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2095		2134
2096	/* for convenience */	2135	/* for convenience */
2097	mask_r = visual->red_mask;	2136	mask_r = visual->red_mask;
…		…
2318	Atom atype;	2357	Atom atype;
2319	unsigned char *prop = NULL;	2358	unsigned char *prop = NULL;
2320	Window root, oldp, *list;	2359	Window root, oldp, *list;
2321	Pixmap rootpixmap = None;	2360	Pixmap rootpixmap = None;
2322	XWindowAttributes wattr, wrootattr;	2361	XWindowAttributes wattr, wrootattr;
		2362	dDisp;
2323		2363
2324	pchanged = 0;	2364	pchanged = 0;
2325		2365
2326	if (!(options & Opt_transparent))	2366	if (!(options & Opt_transparent))
2327	return pchanged; /* Don't try any more */	2367	return pchanged; /* Don't try any more */
2328		2368
2329	XGetWindowAttributes (display->display, display->root, &wrootattr);	2369	XGetWindowAttributes (disp, display->root, &wrootattr);
2330	rootdepth = wrootattr.depth;	2370	rootdepth = wrootattr.depth;
2331		2371
2332	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2372	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2333		2373
2334	if (rootdepth != wattr.depth)	2374	if (rootdepth != wattr.depth)
2335	{	2375	{
2336	if (am_transparent)	2376	if (am_transparent)
2337	{	2377	{
2338	pchanged = 1;	2378	pchanged = 1;
2339	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2379	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2340	am_transparent = am_pixmap_trans = 0;	2380	am_transparent = am_pixmap_trans = 0;
2341	}	2381	}
2342		2382
2343	return pchanged; /* Don't try any more */	2383	return pchanged; /* Don't try any more */
2344	}	2384	}
2345		2385
2346	/* Get all X ops out of the queue so that our information is up-to-date. */	2386	/* Get all X ops out of the queue so that our information is up-to-date. */
2347	XSync (display->display, False);	2387	XSync (disp, False);
2348		2388
2349	/*	2389	/*
2350	* Make the frame window set by the window manager have	2390	* Make the frame window set by the window manager have
2351	* the root background. Some window managers put multiple nested frame	2391	* the root background. Some window managers put multiple nested frame
2352	* windows for each client, so we have to take care about that.	2392	* windows for each client, so we have to take care about that.
2353	*/	2393	*/
2354	i = (xa[XA_XROOTPMAPID]	2394	i = (xa[XA_XROOTPMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2395	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2396	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2397	&nitems, &bytes_after, &prop) == Success);
2358		2398
2359	if (!i \|\| prop == NULL)	2399	if (!i \|\| prop == NULL)
2360	i = (xa[XA_XSETROOTID]	2400	i = (xa[XA_ESETROOT_PMAP_ID]
2361	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2401	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2402	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363	&nitems, &bytes_after, &prop) == Success);	2403	&nitems, &bytes_after, &prop) == Success);
2364		2404
2365	if (!i \|\| prop == NULL	2405	if (!i \|\| prop == NULL
2366	#if TINTING	2406	#if TINTING
…		…
2385	Window cr;	2425	Window cr;
2386	XImage *image;	2426	XImage *image;
2387	GC gc;	2427	GC gc;
2388	XGCValues gcvalue;	2428	XGCValues gcvalue;
2389		2429
2390	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2430	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2391	0, 0, &sx, &sy, &cr);	2431	0, 0, &sx, &sy, &cr);
2392	nw = (unsigned int)szHint.width;	2432	nw = (unsigned int)szHint.width;
2393	nh = (unsigned int)szHint.height;	2433	nh = (unsigned int)szHint.height;
2394	nx = ny = 0;	2434	nx = ny = 0;
2395		2435
…		…
2407	sy = 0;	2447	sy = 0;
2408	}	2448	}
2409		2449
2410	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2450	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2411	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2451	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2452
		2453	XSync (disp, False);
2412	allowedxerror = -1;	2454	allowedxerror = -1;
2413	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2455	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2414		2456
2415	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2457	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2416	/* XXX: may need a delay here? */	2458	/* XXX: may need a delay here? */
2417	allowedxerror = 0;	2459	allowedxerror = 0;
2418		2460
…		…
2421	if (am_transparent && am_pixmap_trans)	2463	if (am_transparent && am_pixmap_trans)
2422	{	2464	{
2423	pchanged = 1;	2465	pchanged = 1;
2424	if (TermWin.pixmap != None)	2466	if (TermWin.pixmap != None)
2425	{	2467	{
2426	XFreePixmap (display->display, TermWin.pixmap);	2468	XFreePixmap (disp, TermWin.pixmap);
2427	TermWin.pixmap = None;	2469	TermWin.pixmap = None;
2428	}	2470	}
2429	}	2471	}
2430		2472
2431	am_pixmap_trans = 0;	2473	am_pixmap_trans = 0;
2432	}	2474	}
2433	else	2475	else
2434	{	2476	{
2435	if (TermWin.pixmap != None)	2477	if (TermWin.pixmap != None)
2436	XFreePixmap (display->display, TermWin.pixmap);	2478	XFreePixmap (disp, TermWin.pixmap);
2437		2479
2438	#if TINTING	2480	#if TINTING
2439	if (ISSET_PIXCOLOR (Color_tint))	2481	if (ISSET_PIXCOLOR (Color_tint))
2440	{	2482	{
2441	unsigned short rm, gm, bm;	2483	unsigned short rm, gm, bm;
…		…
2445		2487
2446	ShadeXImage (display, image, shade, rm, gm, bm);	2488	ShadeXImage (display, image, shade, rm, gm, bm);
2447	}	2489	}
2448	#endif	2490	#endif
2449		2491
2450	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2492	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2451	szHint.width, szHint.height, image->depth);	2493	szHint.width, szHint.height, image->depth);
2452	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2494	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2453	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2495	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2454	nx, ny, image->width, image->height);	2496	nx, ny, image->width, image->height);
2455	XFreeGC (display->display, gc);	2497	XFreeGC (disp, gc);
2456	XDestroyImage (image);	2498	XDestroyImage (image);
2457	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2499	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2458	XClearWindow (display->display, TermWin.parent[0]);	2500	XClearWindow (disp, TermWin.parent[0]);
2459		2501
2460	if (!am_transparent \|\| !am_pixmap_trans)	2502	if (!am_transparent \|\| !am_pixmap_trans)
2461	pchanged = 1;	2503	pchanged = 1;
2462		2504
2463	am_transparent = am_pixmap_trans = 1;	2505	am_transparent = am_pixmap_trans = 1;
2464	}	2506	}
2465	}	2507	}
2466		2508
2467	if (!am_pixmap_trans)	2509	if (am_pixmap_trans)
		2510	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2511	else
2468	{	2512	{
2469	unsigned int n;	2513	unsigned int n;
2470	/*	2514	/*
2471	* InheritPixmap transparency	2515	* InheritPixmap transparency
2472	*/	2516	*/
2473	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2517	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2474	{	2518	{
2475	oldp = TermWin.parent[i];	2519	oldp = TermWin.parent[i];
2476	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2520	XQueryTree (disp, TermWin.parent[i - 1], &root,
2477	&TermWin.parent[i], &list, &n);	2521	&TermWin.parent[i], &list, &n);
2478	XFree (list);	2522	XFree (list);
2479		2523
2480	if (TermWin.parent[i] == display->root)	2524	if (TermWin.parent[i] == display->root)
2481	{	2525	{
…		…
2493		2537
2494	if (pchanged)	2538	if (pchanged)
2495	{	2539	{
2496	for (; n < (unsigned int)i; n++)	2540	for (; n < (unsigned int)i; n++)
2497	{	2541	{
2498	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2542	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2499	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2543	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2500	{	2544	{
2501	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2545	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2502	break;	2546	break;
2503	}	2547	}
2504	}	2548	}
2505	}	2549	}
2506		2550
2507	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2551	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2508	{	2552	{
2509	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2553	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2510	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2554	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2511	am_transparent = 0;	2555	am_transparent = 0;
2512	/* XXX: also turn off Opt_transparent? */	2556	/* XXX: also turn off Opt_transparent? */
2513	}	2557	}
2514	else	2558	else
2515	{	2559	{
…		…
2518	* needed for fvwm2.2.2 (and before?) */	2562	* needed for fvwm2.2.2 (and before?) */
2519	sleep (1);	2563	sleep (1);
2520	#endif	2564	#endif
2521	for (n = 0; n < (unsigned int)i; n++)	2565	for (n = 0; n < (unsigned int)i; n++)
2522	{	2566	{
2523	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2567	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2524	XClearWindow (display->display, TermWin.parent[n]);	2568	XClearWindow (disp, TermWin.parent[n]);
2525	}	2569	}
2526		2570
2527	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2571	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2528	am_transparent = 1;	2572	am_transparent = 1;
2529	}	2573	}
2530		2574
2531	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2575	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2532	TermWin.parent[i] = None;	2576	TermWin.parent[i] = None;
2533	}	2577	}
2534		2578
2535	if (scrollBar.win)	2579	if (scrollBar.win)
2536	{	2580	{
2537	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2581	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538	scrollBar.setIdle ();	2582	scrollBar.setIdle ();
2539	scrollbar_show (0);	2583	scrollbar_show (0);
		2584	}
		2585
		2586	if (am_transparent)
		2587	{
		2588	want_refresh = want_full_refresh = 1;
		2589	if (am_pixmap_trans)
		2590	flush ();
2540	}	2591	}
2541		2592
2542	return pchanged;	2593	return pchanged;
2543	}	2594	}
2544	#endif	2595	#endif
…		…
2573	// some window managers resize the window early, and these programs	2624	// some window managers resize the window early, and these programs
2574	// then sometimes get the size wrong.	2625	// then sometimes get the size wrong.
2575	// unfortunately other programs are even more buggy and dislike	2626	// unfortunately other programs are even more buggy and dislike
2576	// being sent SIGWINCH, so only do it when we were in fact being	2627	// being sent SIGWINCH, so only do it when we were in fact being
2577	// resized.	2628	// resized.
2578	if (seen_resize)	2629	if (seen_resize && cmd_pid)
2579	kill (-cmd_pid, SIGWINCH);	2630	kill (-cmd_pid, SIGWINCH);
2580	}	2631	}
2581		2632
2582	/* Read a text string from the input buffer */	2633	/* Read a text string from the input buffer */
2583	unicode_t buf[UBUFSIZ];	2634	unicode_t buf[UBUFSIZ];
…		…
2696	if (len == (size_t)-1)	2747	if (len == (size_t)-1)
2697	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2748	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2698		2749
2699	// assume wchar == unicode	2750	// assume wchar == unicode
2700	cmdbuf_ptr += len;	2751	cmdbuf_ptr += len;
2701	return wc;	2752	return wc & UNICODE_MASK;
2702	}	2753	}
2703		2754
2704	return NOCHAR;	2755	return NOCHAR;
2705	}	2756	}
2706		2757
…		…
3169	{	3220	{
3170	switch (priv)	3221	switch (priv)
3171	{	3222	{
3172	case '>':	3223	case '>':
3173	if (ch == CSI_DA) /* secondary device attributes */	3224	if (ch == CSI_DA) /* secondary device attributes */
3174	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3225	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3175	break;	3226	break;
3176	case '?':	3227	case '?':
3177	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3228	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3178	process_terminal_mode (ch, priv, nargs, arg);	3229	process_terminal_mode (ch, priv, nargs, arg);
3179	break;	3230	break;
…		…
3408	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3459	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3409	{	3460	{
3410	int x, y;	3461	int x, y;
3411	XWindowAttributes wattr;	3462	XWindowAttributes wattr;
3412	Window wdummy;	3463	Window wdummy;
		3464	dDisp;
3413		3465
3414	if (nargs == 0)	3466	if (nargs == 0)
3415	return;	3467	return;
3416		3468
3417	switch (args[0])	3469	switch (args[0])
3418	{	3470	{
3419	/*	3471	/*
3420	* commands	3472	* commands
3421	*/	3473	*/
3422	case 1: /* deiconify window */	3474	case 1: /* deiconify window */
3423	XMapWindow (display->display, TermWin.parent[0]);	3475	XMapWindow (disp, TermWin.parent[0]);
3424	break;	3476	break;
3425	case 2: /* iconify window */	3477	case 2: /* iconify window */
3426	XIconifyWindow (display->display, TermWin.parent[0],	3478	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3427	DefaultScreen (display->display));
3428	break;	3479	break;
3429	case 3: /* set position (pixels) */	3480	case 3: /* set position (pixels) */
3430	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3481	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3431	break;	3482	break;
3432	case 4: /* set size (pixels) */	3483	case 4: /* set size (pixels) */
3433	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3484	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3434	break;	3485	break;
3435	case 5: /* raise window */	3486	case 5: /* raise window */
3436	XRaiseWindow (display->display, TermWin.parent[0]);	3487	XRaiseWindow (disp, TermWin.parent[0]);
3437	break;	3488	break;
3438	case 6: /* lower window */	3489	case 6: /* lower window */
3439	XLowerWindow (display->display, TermWin.parent[0]);	3490	XLowerWindow (disp, TermWin.parent[0]);
3440	break;	3491	break;
3441	case 7: /* refresh window */	3492	case 7: /* refresh window */
3442	scr_touch (true);	3493	scr_touch (true);
3443	break;	3494	break;
3444	case 8: /* set size (chars) */	3495	case 8: /* set size (chars) */
…		…
3456		3507
3457	/*	3508	/*
3458	* reports - some output format copied from XTerm	3509	* reports - some output format copied from XTerm
3459	*/	3510	*/
3460	case 11: /* report window state */	3511	case 11: /* report window state */
3461	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3512	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3462	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3513	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3463	break;	3514	break;
3464	case 13: /* report window position */	3515	case 13: /* report window position */
3465	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3516	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3466	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3517	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3467	-wattr.border_width, -wattr.border_width,	3518	-wattr.border_width, -wattr.border_width,
3468	&x, &y, &wdummy);	3519	&x, &y, &wdummy);
3469	tt_printf ("\033[3;%d;%dt", x, y);	3520	tt_printf ("\033[3;%d;%dt", x, y);
3470	break;	3521	break;
3471	case 14: /* report window size (pixels) */	3522	case 14: /* report window size (pixels) */
3472	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3523	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3473	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3524	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3474	break;	3525	break;
3475	case 18: /* report text area size (chars) */	3526	case 18: /* report text area size (chars) */
3476	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3527	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3477	break;	3528	break;
…		…
3479	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3530	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3480	break;	3531	break;
3481	case 20: /* report icon label */	3532	case 20: /* report icon label */
3482	{	3533	{
3483	char *s;	3534	char *s;
3484	XGetIconName (display->display, TermWin.parent[0], &s);	3535	XGetIconName (disp, TermWin.parent[0], &s);
3485	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3536	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3486	XFree (s);	3537	XFree (s);
3487	}	3538	}
3488	break;	3539	break;
3489	case 21: /* report window title */	3540	case 21: /* report window title */
3490	{	3541	{
3491	char *s;	3542	char *s;
3492	XFetchName (display->display, TermWin.parent[0], &s);	3543	XFetchName (disp, TermWin.parent[0], &s);
3493	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3544	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494	XFree (s);	3545	XFree (s);
3495	}	3546	}
3496	break;	3547	break;
3497	}	3548	}
…		…
3504	* ends_how is terminator used. returned input must be free()'d	3555	* ends_how is terminator used. returned input must be free()'d
3505	*/	3556	*/
3506	unsigned char *	3557	unsigned char *
3507	rxvt_term::get_to_st (unicode_t &ends_how)	3558	rxvt_term::get_to_st (unicode_t &ends_how)
3508	{	3559	{
3509	unicode_t seen_esc = 0, ch;	3560	unicode_t ch;
		3561	bool seen_esc = false;
3510	unsigned int n = 0;	3562	unsigned int n = 0;
3511	unsigned char *s;
3512	unsigned char string[STRING_MAX];	3563	wchar_t string[STRING_MAX];
3513		3564
3514	while ((ch = cmd_getc ()) != NOCHAR)	3565	while ((ch = cmd_getc ()) != NOCHAR)
3515	{	3566	{
3516	if (seen_esc)	3567	if (seen_esc)
3517	{	3568	{
…		…
3520	else	3571	else
3521	return NULL;	3572	return NULL;
3522	}	3573	}
3523	else if (ch == C0_ESC)	3574	else if (ch == C0_ESC)
3524	{	3575	{
3525	seen_esc = 1;	3576	seen_esc = true;
3526	continue;	3577	continue;
3527	}	3578	}
3528	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3579	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3529	break;	3580	break;
3530	else if (ch < 0x20)	3581	else if (ch < 0x20)
3531	return NULL; /* other control character - exit */	3582	return NULL; /* other control character - exit */
3532		3583
3533	seen_esc = 0;	3584	seen_esc = false;
3534		3585
3535	if (n >= sizeof (string) - 1)	3586	if (n >= sizeof (string) - 1)
3536	// stop at some sane length	3587	// stop at some sane length
3537	return NULL;	3588	return NULL;
3538		3589
…		…
3542	string[n++] = ch;	3593	string[n++] = ch;
3543	}	3594	}
3544		3595
3545	string[n++] = '\0';	3596	string[n++] = '\0';
3546		3597
3547	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3548	return NULL;
3549
3550	ends_how = (ch == 0x5c ? C0_ESC : ch);	3598	ends_how = (ch == 0x5c ? C0_ESC : ch);
3551	strncpy (s, string, n);	3599
3552	return s;	3600	return (unsigned char *)rxvt_wcstombs (string);
3553	}	3601	}
3554		3602
3555	/----------------------------------------------------------------------/	3603	/----------------------------------------------------------------------/
3556	/*	3604	/*
3557	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3605	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
…		…
3642	int changed = 0;	3690	int changed = 0;
3643	int color;	3691	int color;
3644	char buf, name;	3692	char buf, name;
3645	bool query = str[0] == '?' && !str[1];	3693	bool query = str[0] == '?' && !str[1];
3646	int saveop = op;	3694	int saveop = op;
		3695	dDisp;
3647		3696
3648	assert (str != NULL);	3697	assert (str != NULL);
3649	switch (op)	3698	switch (op)
3650	{	3699	{
3651	case XTerm_name:	3700	case XTerm_name:
…		…
3658	set_title (str);	3707	set_title (str);
3659	break;	3708	break;
3660	case XTerm_property:	3709	case XTerm_property:
3661	if (str[0] == '?')	3710	if (str[0] == '?')
3662	{	3711	{
3663	Atom prop = XInternAtom (display->display, str + 1, True);	3712	Atom prop = display->atom (str + 1);
3664	Atom actual_type;	3713	Atom actual_type;
3665	int actual_format;	3714	int actual_format;
3666	unsigned long nitems;	3715	unsigned long nitems;
3667	unsigned long bytes_after;	3716	unsigned long bytes_after;
3668	unsigned char *value = 0;	3717	unsigned char *value = 0;
3669	const char *str = "";	3718	const char *str = "";
3670		3719
3671	if (prop	3720	if (prop
3672	&& XGetWindowProperty (display->display, TermWin.parent[0],	3721	&& XGetWindowProperty (disp, TermWin.parent[0],
3673	prop, 0, 1<<16, 0, AnyPropertyType,	3722	prop, 0, 1<<16, 0, AnyPropertyType,
3674	&actual_type, &actual_format,	3723	&actual_type, &actual_format,
3675	&nitems, &bytes_after, &value) == Success	3724	&nitems, &bytes_after, &value) == Success
3676	&& actual_type != None	3725	&& actual_type != None
3677	&& actual_format == 8)	3726	&& actual_format == 8)
…		…
3686	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3735	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687		3736
3688	if (eq)	3737	if (eq)
3689	{	3738	{
3690	*eq = 0;	3739	*eq = 0;
3691	XChangeProperty (display->display, TermWin.parent[0],	3740	set_utf8_property (display->atom (str), eq + 1);
3692	display->atom (str), XA_STRING, 8,
3693	PropModeReplace, (unsigned char *)eq + 1,
3694	strlen (eq + 1));
3695	}	3741	}
3696	else	3742	else
3697	XDeleteProperty (display->display, TermWin.parent[0],	3743	XDeleteProperty (disp, TermWin.parent[0],
3698	display->atom (str));	3744	display->atom (str));
3699	}	3745	}
3700	break;	3746	break;
3701		3747
3702	case XTerm_Color:	3748	case XTerm_Color:
…		…
3753	break;	3799	break;
3754	case XTerm_Color_RV:	3800	case XTerm_Color_RV:
3755	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3801	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756	break;	3802	break;
3757	#endif	3803	#endif
3758	#if TRANSPARENT \|\| TINTING	3804	#if TRANSPARENT && TINTING
3759	case XTerm_Color_tint:	3805	case XTerm_Color_tint:
3760	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3806	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3761	check_our_parents ();	3807	check_our_parents ();
3762	if (am_transparent)	3808	if (am_transparent)
3763	want_full_refresh = want_refresh = 1;	3809	want_full_refresh = want_refresh = 1;
…		…
3777	{	3823	{
3778	str++;	3824	str++;
3779	#if XPM_BACKGROUND	3825	#if XPM_BACKGROUND
3780	changed += scale_pixmap (str);	3826	changed += scale_pixmap (str);
3781	#endif	3827	#endif
3782
3783	}	3828	}
		3829
3784	if (changed)	3830	if (changed)
3785	{	3831	{
3786	#ifdef XPM_BACKGROUND	3832	#ifdef XPM_BACKGROUND
3787	resize_pixmap ();	3833	resize_pixmap ();
3788	#endif	3834	#endif
…		…
3829	if (query)	3875	if (query)
3830	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3876	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3831	else	3877	else
3832	{	3878	{
3833	set_locale (str);	3879	set_locale (str);
3834	# ifdef USE_XIM	3880	pty.set_utf8_mode (enc_utf8);
3835	im_cb ();	3881	init_xlocale ();
3836	# endif
3837	}	3882	}
3838	break;	3883	break;
3839	#endif	3884	#endif
3840		3885
3841	#ifdef MENUBAR	3886	#ifdef MENUBAR
…		…
4276		4321
4277	/* ---------------------------------------------------------------------- */	4322	/* ---------------------------------------------------------------------- */
4278	/* Write data to the pty as typed by the user, pasted with the mouse,	4323	/* Write data to the pty as typed by the user, pasted with the mouse,
4279	* or generated by us in response to a query ESC sequence.	4324	* or generated by us in response to a query ESC sequence.
4280	*/	4325	*/
		4326	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4327
4281	void	4328	void
4282	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4329	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4283	{	4330	{
4284	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4331	if (v_buflen == 0)
		4332	{
		4333	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4285		4334
4286	if (len)	4335	if ((unsigned int)written == len)
		4336	return;
		4337
		4338	data += written;
		4339	len -= written;
4287	{	4340	}
		4341
		4342	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4343
		4344	memcpy (v_buffer + v_buflen, data, len);
		4345	v_buflen += len;
		4346
		4347	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		4348	}
		4349
		4350	void rxvt_term::pty_write ()
		4351	{
		4352	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4353
		4354	if (written > 0)
		4355	{
		4356	v_buflen -= written;
		4357
4288	if (v_buflen == 0)	4358	if (v_buflen == 0)
4289	{	4359	{
4290	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291
4292	if ((unsigned int)written == len)
4293	return;
4294
4295	data += written;
4296	len -= written;
4297	}
4298
4299
4300	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302	memcpy (v_buffer + v_buflen, data, len);
4303	v_buflen += len;
4304	}
4305
4306	for (;;)
4307	{
4308	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4309
4310	if (written > 0)
4311	{
4312	v_buflen -= written;
4313
4314	if (v_buflen == 0)
4315	{
4316	free (v_buffer);	4360	free (v_buffer);
4317	v_buffer = 0;	4361	v_buffer = 0;
4318	v_buflen = 0;	4362	v_buflen = 0;
4319		4363
4320	pty_ev.set (EVENT_READ);	4364	pty_ev.set (EVENT_READ);
4321	return;
4322	}
4323
4324	memmove (v_buffer, v_buffer + written, v_buflen);
4325	}
4326	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4327	// original code just ignores this...
4328	destroy ();
4329	else
4330	{
4331	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4332	return;	4365	return;
4333	}	4366	}
		4367
		4368	memmove (v_buffer, v_buffer + written, v_buflen);
4334	}	4369	}
		4370	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4371	// original code just ignores this...
		4372	destroy ();
4335	}	4373	}
4336		4374
4337	/----------------------- end-of-file (C source) -----------------------/	4375	/----------------------- end-of-file (C source) -----------------------/
4338		4376

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC vs. Revision 1.199 by root, Sun Feb 20 02:00:43 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.199 by root, Sun Feb 20 02:00:43 2005 UTC