ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.131 by root, Fri Aug 13 22:38:57 2004 UTC

…		…
57	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	57	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58		58
59	// exception thrown when the command parser runs out of input data	59	// exception thrown when the command parser runs out of input data
60	class out_of_input { } out_of_input;	60	class out_of_input { } out_of_input;
61		61
		62	#ifndef NO_FRILLS
		63
		64	#define ISO_14755_KEYCODE_VALID 0x80000000UL
		65	#define ISO_14755_ACTIVE 0x40000000UL
		66	#define ISO_14755_ESCAPE_NEXT 0x20000000UL
		67
		68	static unsigned short iso14755_symtab[] = {
		69	// keysym, unicode
		70	XK_Left, 0x2190,
		71	XK_KP_Left, 0x2190,
		72	XK_Up, 0x2191,
		73	XK_KP_Up, 0x2191,
		74	XK_Right, 0x2192,
		75	XK_KP_Right, 0x2192,
		76	XK_Down, 0x2193,
		77	XK_KP_Down, 0x2193,
		78	XK_Linefeed, 0x21b4,
		79	XK_Return, 0x21b5,
		80	XK_KP_Enter, 0x21b5,
		81
		82	XK_Prior, 0x21de,
		83	XK_Next, 0x21df,
		84	XK_Tab, 0x21e5,
		85	XK_ISO_Left_Tab, 0x21e6,
		86	XK_Shift_L, 0x21e7,
		87	XK_Shift_R, 0x21e7,
		88
		89	XK_Shift_Lock, 0x21eb,
		90	XK_ISO_Lock, 0x21eb,
		91	XK_ISO_Lock, 0x21eb,
		92	XK_Caps_Lock, 0x21ec,
		93	XK_Num_Lock, 0x21ed,
		94	XK_ISO_Level3_Shift, 0x21ee,
		95	XK_ISO_Level3_Lock, 0x21ef,
		96	XK_ISO_Group_Lock, 0x21f0,
		97	XK_Home, 0x21f1,
		98	XK_End, 0x21f2,
		99
		100	XK_Execute, 0x2318,
		101	XK_Begin, 0x2320,
		102	XK_Delete, 0x2326,
		103	XK_Clear, 0x2327,
		104	XK_BackSpace, 0x232b,
		105	XK_Insert, 0x2380,
		106	XK_Control_L, 0x2388,
		107	XK_Control_R, 0x2388,
		108	XK_Pause, 0x2389,
		109	XK_Break, 0x238a,
		110	XK_Escape, 0x238b,
		111	XK_Undo, 0x238c,
		112	XK_Print, 0x2399,
		113
		114	XK_space, 0x2423,
		115	XK_KP_Space, 0x2422,
		116	0,
		117	};
		118
		119	void
		120	rxvt_term::commit_iso14755 ()
		121	{
		122	wchar_t ch[2];
		123
		124	ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask
		125	ch[1] = 0;
		126
		127	if (iso14755buf & ISO_14755_KEYCODE_VALID)
		128	{
		129	char mb[16];
		130	int len;
		131
		132	// allow verbatim 0-bytes and control-bytes to be entered
		133	if (ch[0] >= 0x20)
		134	len = wcstombs (mb, ch, 16);
		135	else
		136	{
		137	mb[0] = ch[0];
		138	len = 1;
		139	}
		140
		141	if (len > 0)
		142	tt_write ((unsigned char *)mb, len);
		143	else
		144	scr_bell ();
		145	}
		146
		147	iso14755buf = 0;
		148	}
		149
		150	int
		151	rxvt_term::hex_keyval (XKeyEvent &ev)
		152	{
		153	// check wether this event corresponds to a hex digit
		154	// if the modifiers had not been pressed.
		155	for (int index = 0; index < 8; index++)
		156	{
		157	KeySym k = XLookupKeysym (&ev, index);
		158
		159	if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
		160	else if (k >= XK_0 && k <= XK_9) return k - XK_0;
		161	else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
		162	else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
		163	}
		164
		165	return -1;
		166	}
		167	#endif
		168
62	/*{{{ Convert the keypress event into a string */	169	/*{{{ Convert the keypress event into a string */
63	void	170	void
64	rxvt_term::lookup_key (XKeyEvent &ev)	171	rxvt_term::lookup_key (XKeyEvent &ev)
65	{	172	{
66	int ctrl, meta, shft, len;	173	int ctrl, meta, shft, len;
…		…
151	{	258	{
152	if (TermWin.saveLines)	259	if (TermWin.saveLines)
153	{	260	{
154	#ifdef UNSHIFTED_SCROLLKEYS	261	#ifdef UNSHIFTED_SCROLLKEYS
155	if (!ctrl && !meta)	262	if (!ctrl && !meta)
156	{
157	#else	263	#else
158	if (IS_SCROLL_MOD)	264	if (IS_SCROLL_MOD)
		265	#endif
159	{	266	{
160	#endif
161	int lnsppg;	267	int lnsppg;
162		268
163	#ifdef PAGING_CONTEXT_LINES	269	#ifdef PAGING_CONTEXT_LINES
164	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	270	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165	#else	271	#else
…		…
222	{	328	{
223	/* normal XTerm key bindings */	329	/* normal XTerm key bindings */
224	case XK_Insert: /* Shift+Insert = paste mouse selection */	330	case XK_Insert: /* Shift+Insert = paste mouse selection */
225	selection_request (ev.time, 0, 0);	331	selection_request (ev.time, 0, 0);
226	return;	332	return;
		333	#if TODO // TODO
227	/* rxvt extras */	334	/* rxvt extras */
228	case XK_KP_Add: /* Shift+KP_Add = bigger font */	335	case XK_KP_Add: /* Shift+KP_Add = bigger font */
229	change_font (FONT_UP);	336	change_font (FONT_UP);
230	return;	337	return;
231	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	338	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232	change_font (FONT_DN);	339	change_font (FONT_DN);
233	return;	340	return;
		341	#endif
234	}	342	}
235	}	343	}
236	}	344	}
		345
		346	#ifndef NO_FRILLS
		347	// ISO 14755 support
		348	if (shft && ctrl)
		349	{
		350	int hv;
		351
		352	if (keysym == XK_space || keysym == XK_KP_Space
		353	|| keysym == XK_Return || keysym == XK_KP_Enter)
		354	{
		355	commit_iso14755 ();
		356	return;
		357	}
		358	else if ((hv = hex_keyval (ev)) >= 0)
		359	{
		360	iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID;
		361	return;
		362	}
		363	else
		364	iso14755buf = 0;
		365	}
		366	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
		367	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
		368	iso14755buf |= ISO_14755_ACTIVE;
		369	#endif
		370
237	#ifdef PRINTPIPE	371	#ifdef PRINTPIPE
238	if (keysym == XK_Print)	372	if (keysym == XK_Print)
239	{	373	{
240	scr_printscreen (ctrl | shft);	374	scr_printscreen (ctrl | shft);
241	return;	375	return;
…		…
306	newlen = 0;	440	newlen = 0;
307	}	441	}
308	break;	442	break;
309		443
310	#ifdef XK_KP_Left	444	#ifdef XK_KP_Left
311	case XK_KP_Up: /* \033Ox or standard */	445	case XK_KP_Up: /* \033Ox or standard */
312	case XK_KP_Down: /* \033Or or standard */	446	case XK_KP_Down: /* \033Or or standard */
313	case XK_KP_Right: /* \033Ov or standard */	447	case XK_KP_Right: /* \033Ov or standard */
314	case XK_KP_Left: /* \033Ot or standard */	448	case XK_KP_Left: /* \033Ot or standard */
315	if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)	449	if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
316	{	450	{
…		…
661	if (want_full_refresh)	795	if (want_full_refresh)
662	{	796	{
663	want_full_refresh = 0;	797	want_full_refresh = 0;
664	scr_clear ();	798	scr_clear ();
665	scr_touch (false);	799	scr_touch (false);
666	want_refresh = 1;
667	}	800	}
668	#endif	801	#endif
669		802
670	if (want_refresh)	803	if (want_refresh)
671	{	804	{
…		…
675	IMSendSpot ();	808	IMSendSpot ();
676	#endif	809	#endif
677	}	810	}
678		811
679	display->flush ();	812	display->flush ();
		813
		814	flush_ev.stop ();
680	}	815	}
681		816
682	void	817	void
683	rxvt_term::check_cb (check_watcher &w)	818	rxvt_term::check_cb (check_watcher &w)
684	{	819	{
685	SET_R (this);	820	SET_R (this);
686	SET_LOCALE (locale);	821	SET_LOCALE (locale);
687		822
		823	display->flush ();
		824
		825	if (want_refresh && !flush_ev.active)
		826	flush_ev.start (NOW + 0.01);
		827	}
		828
		829	void
		830	rxvt_term::flush_cb (time_watcher &w)
		831	{
		832	SET_R (this);
		833	SET_LOCALE (locale);
		834
		835	refresh_limit = 1;
		836	refresh_count = 0;
688	flush ();	837	flush ();
689	}	838	}
690		839
691	#ifdef CURSOR_BLINK	840	#ifdef CURSOR_BLINK
692	void	841	void
…		…
706	if (scr_refresh_rend (RS_Blink, RS_Blink))	855	if (scr_refresh_rend (RS_Blink, RS_Blink))
707	{	856	{
708	hidden_text = !hidden_text;	857	hidden_text = !hidden_text;
709	want_refresh = 1;	858	want_refresh = 1;
710	w.start (w.at + TEXT_BLINK_INTERVAL);	859	w.start (w.at + TEXT_BLINK_INTERVAL);
		860	}
		861	}
		862	#endif
		863
		864	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		865	void
		866	rxvt_term::cont_scroll_cb (time_watcher &w)
		867	{
		868	if ((scrollbar_isUp() || scrollbar_isDn()) &&
		869	scr_page (scrollbar_isUp() ? UP : DN, 1))
		870	{
		871	refresh_type |= SMOOTH_REFRESH;
		872	want_refresh = 1;
		873	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
		874	}
		875	}
		876	#endif
		877
		878	#ifdef SELECTION_SCROLLING
		879	void
		880	rxvt_term::sel_scroll_cb (time_watcher &w)
		881	{
		882	if (scr_page (scroll_selection_dir, scroll_selection_lines))
		883	{
		884	selection_extend (selection_save_x, selection_save_y, selection_save_state);
		885	refresh_type |= SMOOTH_REFRESH;
		886	want_refresh = 1;
		887	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
		888	}
		889	}
		890	#endif
		891
		892	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		893	void
		894	rxvt_term::slip_wheel_cb (time_watcher &w)
		895	{
		896	if (mouse_slip_wheel_speed == 0
		897	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
		898	: scr_page (UP, mouse_slip_wheel_speed))
		899	{
		900	refresh_type |= SMOOTH_REFRESH;
		901	want_refresh = 1;
		902	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
711	}	903	}
712	}	904	}
713	#endif	905	#endif
714		906
715	bool	907	bool
…		…
753	while (pty_fill ())	945	while (pty_fill ())
754	if (cmd_parse ())	946	if (cmd_parse ())
755	break;	947	break;
756	}	948	}
757		949
758	#ifdef POINTER_BLANK
759	void	950	void
760	rxvt_term::pointer_unblank ()	951	rxvt_term::pointer_unblank ()
761	{	952	{
762	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	953	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763	recolour_cursor ();	954	recolour_cursor ();
764		955
		956	#ifdef POINTER_BLANK
765	hidden_pointer = 0;	957	hidden_pointer = 0;
766		958
767	if (Options & Opt_pointerBlank)	959	if (Options & Opt_pointerBlank)
768	pointer_ev.start (NOW + pointerBlankDelay);	960	pointer_ev.start (NOW + pointerBlankDelay);
		961	#endif
769	}	962	}
770		963
		964	#ifdef POINTER_BLANK
771	void	965	void
772	rxvt_term::pointer_blank ()	966	rxvt_term::pointer_blank ()
773	{	967	{
774	if (! (Options & Opt_pointerBlank))	968	if (! (Options & Opt_pointerBlank))
775	return;	969	return;
…		…
965	#endif	1159	#endif
966		1160
967	switch (ev.type)	1161	switch (ev.type)
968	{	1162	{
969	case KeyPress:	1163	case KeyPress:
		1164	if (!(iso14755buf & ISO_14755_ESCAPE_NEXT))
970	lookup_key (ev.xkey);	1165	lookup_key (ev.xkey);
		1166
		1167	break;
		1168
		1169	case KeyRelease:
		1170	{
		1171	#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS)
		1172	KeySym ks;
		1173
		1174	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		1175	#endif
		1176
		1177	#ifndef NO_FRILLS
		1178	// ISO 14755 support
		1179	if (iso14755buf)
		1180	if (iso14755buf & ISO_14755_ESCAPE_NEXT)
		1181	{
		1182	// iso14755 part 5.2 handling: release time
		1183	// first: controls
		1184	if ((ev.xkey.state & ControlMask)
		1185	&& ((ks >= 0x40 && ks <= 0x5f)
		1186	|| (ks >= 0x61 && ks <= 0x7f)))
		1187	{
		1188	iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f);
		1189	commit_iso14755 ();
		1190	return; // case-break;
		1191	}
		1192
		1193	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		1194	if (i[0] == ks)
		1195	{
		1196	iso14755buf = ISO_14755_KEYCODE_VALID | i[1];
		1197	commit_iso14755 ();
		1198	return; // case-break;
		1199	}
		1200
		1201	iso14755buf = 0;
		1202	scr_bell ();
971	break;	1203	break;
		1204	}
		1205	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
		1206	{
		1207	if (iso14755buf & ISO_14755_KEYCODE_VALID)
		1208	commit_iso14755 ();
		1209	else if (iso14755buf & ISO_14755_ACTIVE)
		1210	iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair
		1211	}
		1212	#endif
972		1213
973	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1214	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974	case KeyRelease:
975	{
976	if (! (ev.xkey.state & ControlMask))	1215	if (!(ev.xkey.state & ControlMask))
		1216	slip_wheel_ev.stop ();
		1217	else if (ks == XK_Control_L || ks == XK_Control_R)
977	mouse_slip_wheel_speed = 0;	1218	mouse_slip_wheel_speed = 0;
978	else	1219	#endif
979	{
980	KeySym ks;
981
982	ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983	if (ks == XK_Control_L || ks == XK_Control_R)
984	mouse_slip_wheel_speed = 0;
985	}
986	break;	1220	break;
987	}	1221	}
988	#endif
989		1222
990	case ButtonPress:	1223	case ButtonPress:
991	button_press (ev.xbutton);	1224	button_press (ev.xbutton);
992	break;	1225	break;
993		1226
…		…
1029	}	1262	}
1030	#endif /* OFFIX_DND */	1263	#endif /* OFFIX_DND */
1031	break;	1264	break;
1032		1265
1033	case MappingNotify:	1266	case MappingNotify:
1034	XRefreshKeyboardMapping (& (ev.xmapping));	1267	XRefreshKeyboardMapping (&ev.xmapping);
1035	break;	1268	break;
1036		1269
1037	/*	1270	/*
1038	* XXX: this is not the _current_ arrangement	1271	* XXX: this is not the _current_ arrangement
1039	* Here's my conclusion:	1272	* Here's my conclusion:
…		…
1070	#endif	1303	#endif
1071	#ifdef CURSOR_BLINK	1304	#ifdef CURSOR_BLINK
1072	if (Options & Opt_cursorBlink)	1305	if (Options & Opt_cursorBlink)
1073	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1306	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074	#endif	1307	#endif
		1308	#ifdef OFF_FOCUS_FADING
		1309	if (rs[Rs_fade])
		1310	{
		1311	PixColors = PixColorsFocused;
		1312	set_colorfgbg ();
		1313	scr_clear ();
		1314	scr_touch (true);
		1315	}
		1316	#endif
1075		1317
1076	}	1318	}
1077	break;	1319	break;
1078		1320
1079	case FocusOut:	1321	case FocusOut:
…		…
1088	#ifdef CURSOR_BLINK	1330	#ifdef CURSOR_BLINK
1089	if (Options & Opt_cursorBlink)	1331	if (Options & Opt_cursorBlink)
1090	cursor_blink_ev.stop ();	1332	cursor_blink_ev.stop ();
1091	hidden_cursor = 0;	1333	hidden_cursor = 0;
1092	#endif	1334	#endif
		1335	#ifdef OFF_FOCUS_FADING
		1336	if (rs[Rs_fade])
		1337	{
		1338	PixColors = PixColorsUnFocused;
		1339	set_colorfgbg ();
		1340	scr_clear ();
		1341	scr_touch (true);
		1342	}
		1343	#endif
1093		1344
1094	}	1345	}
1095	break;	1346	break;
1096		1347
1097	case ConfigureNotify:	1348	case ConfigureNotify:
…		…
1106	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1357	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107	}	1358	}
1108	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1359	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109		1360
1110	if (szHint.width != width || szHint.height != height)	1361	if (szHint.width != width || szHint.height != height)
1111	{
1112	D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1113	resize_all_windows (width, height, 1);	1362	resize_all_windows (width, height, 1);
1114	}	1363
1115	#ifdef DEBUG_SIZE
1116	else
1117	{
1118	D_SIZE ((stderr, "Size: Not resizing"));
1119	}
1120	#endif
1121	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1364	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122	if (Options & Opt_transparent)	1365	if (Options & Opt_transparent)
1123	{	1366	{
1124	check_our_parents ();	1367	check_our_parents ();
1125	if (am_transparent)	1368	if (am_transparent)
1126	want_full_refresh = 1;	1369	want_refresh = want_full_refresh = 1;
1127	}	1370	}
1128	#endif	1371	#endif
1129	}	1372	}
		1373	break;
		1374
		1375	case PropertyNotify:
		1376	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
		1377	&& ev.xproperty.state == PropertyNewValue)
		1378	selection_property (ev.xproperty.window, ev.xproperty.atom);
		1379
1130	break;	1380	break;
1131		1381
1132	case SelectionClear:	1382	case SelectionClear:
1133	selection_clear ();	1383	selection_clear ();
1134	break;	1384	break;
…		…
1165		1415
1166	case GraphicsExpose:	1416	case GraphicsExpose:
1167	case Expose:	1417	case Expose:
1168	if (ev.xany.window == TermWin.vt)	1418	if (ev.xany.window == TermWin.vt)
1169	{	1419	{
1170	#ifdef NO_SLOW_LINK_SUPPORT	1420	do
1171	scr_expose (ev.xexpose.x, ev.xexpose.y,	1421	scr_expose (ev.xexpose.x, ev.xexpose.y,
1172	ev.xexpose.width, ev.xexpose.height, False);	1422	ev.xexpose.width, ev.xexpose.height, False);
1173	#else	1423	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1174	// don't understand this, so commented it out	1424
		1425	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
		1426
		1427	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1175	scr_expose (ev.xexpose.x, ev.xexpose.y,	1428	scr_expose (ev.xexpose.x, ev.xexpose.y,
1176	ev.xexpose.width, ev.xexpose.height, False);	1429	ev.xexpose.width, ev.xexpose.height, False);
1177	//scr_expose (ev.xexpose.x, 0,	1430
1178	// ev.xexpose.width, TermWin.height, False);	1431	scr_refresh (refresh_type);
1179	#endif
1180	want_refresh = 1;
1181	}	1432	}
1182	else	1433	else
1183	{	1434	{
1184	XEvent unused_event;	1435	XEvent unused_event;
1185		1436
1186	while (XCheckTypedWindowEvent (display->display, ev.xany.window,	1437	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1187	Expose,	1438	;
1188	&unused_event)) ;
1189	while (XCheckTypedWindowEvent (display->display, ev.xany.window,	1439	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1190	GraphicsExpose,	1440	;
1191	&unused_event)) ;	1441
1192	if (isScrollbarWindow (ev.xany.window))	1442	if (isScrollbarWindow (ev.xany.window))
1193	{	1443	{
1194	scrollBar.setIdle ();	1444	scrollBar.setIdle ();
1195	scrollbar_show (0);	1445	scrollbar_show (0);
1196	}	1446	}
1197	#ifdef MENUBAR	1447	#ifdef MENUBAR
1198	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1448	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199	menubar_expose ();	1449	menubar_expose ();
		1450	#endif
		1451
		1452	#ifdef TRANSPARENT
		1453	if (am_transparent && ev.xany.window == TermWin.parent[0])
		1454	XClearWindow (display->display, ev.xany.window);
1200	#endif	1455	#endif
1201	}	1456	}
1202	break;	1457	break;
1203		1458
1204	case MotionNotify:	1459	case MotionNotify:
…		…
1239	if (ev.xbutton.y < TermWin.int_bwidth	1494	if (ev.xbutton.y < TermWin.int_bwidth
1240	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1495	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1241	{	1496	{
1242	int dist;	1497	int dist;
1243		1498
1244	pending_scroll_selection=1;
1245
1246	/* don't clobber the current delay if we are	1499	/* don't clobber the current delay if we are
1247	* already in the middle of scrolling.	1500	* already in the middle of scrolling.
1248	*/	1501	*/
1249	if (scroll_selection_delay<=0)	1502	if (!sel_scroll_ev.active)
1250	scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;	1503	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251		1504
1252	/* save the event params so we can highlight	1505	/* save the event params so we can highlight
1253	* the selection in the pending-scroll loop	1506	* the selection in the pending-scroll loop
1254	*/	1507	*/
1255	selection_save_x=ev.xbutton.x;	1508	selection_save_x=ev.xbutton.x;
…		…
1277	else	1530	else
1278	{	1531	{
1279	/* we are within the text window, so we	1532	/* we are within the text window, so we
1280	* shouldn't be scrolling	1533	* shouldn't be scrolling
1281	*/	1534	*/
1282	pending_scroll_selection = 0;	1535	if (sel_scroll_ev.active)
		1536	sel_scroll_ev.stop();
1283	}	1537	}
1284	#endif	1538	#endif
1285	#ifdef MOUSE_THRESHOLD	1539	#ifdef MOUSE_THRESHOLD
1286		1540
1287	}	1541	}
…		…
1306	}	1560	}
1307	break;	1561	break;
1308	}	1562	}
1309	}	1563	}
1310		1564
		1565	#if TRANSPARENT
1311	void	1566	void
1312	rxvt_term::rootwin_cb (XEvent &ev)	1567	rxvt_term::rootwin_cb (XEvent &ev)
1313	{	1568	{
1314	SET_R (this);	1569	SET_R (this);
1315	SET_LOCALE (locale);	1570	SET_LOCALE (locale);
1316		1571
1317	switch (ev.type)	1572	switch (ev.type)
1318	{	1573	{
1319	case PropertyNotify:	1574	case PropertyNotify:
1320	if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321	{
1322	if (ev.xproperty.state == PropertyNewValue)
1323	selection_property (ev.xproperty.window, ev.xproperty.atom);
1324	break;
1325	}
1326	#ifdef TRANSPARENT
1327	else
1328	{
1329	/*	1575	/*
1330	* if user used some Esetroot compatible prog to set the root bg,	1576	* if user used some Esetroot compatible prog to set the root bg,
1331	* use the property to determine the pixmap. We use it later on.	1577	* use the property to determine the pixmap. We use it later on.
1332	*/	1578	*/
1333	if (xa[XA_XROOTPMAPID] == 0)	1579	if (xa[XA_XROOTPMAPID] == 0)
1334	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);	1580	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335		1581
1336	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1582	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1337	return;	1583	return;
1338	}
1339		1584
1340	/* FALLTHROUGH */	1585	/* FALLTHROUGH */
1341	case ReparentNotify:	1586	case ReparentNotify:
1342	if ((Options & Opt_transparent) && check_our_parents () && am_transparent)	1587	if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1343	want_full_refresh = 1;	1588	want_refresh = want_full_refresh = 1;
1344	break;	1589	break;
1345	#endif
1346	}	1590	}
1347	}	1591	}
		1592	#endif
1348		1593
1349	void	1594	void
1350	rxvt_term::button_press (XButtonEvent &ev)	1595	rxvt_term::button_press (XButtonEvent &ev)
1351	{	1596	{
1352	int reportmode = 0, clickintime;	1597	int reportmode = 0, clickintime;
…		…
1504	upordown = 1; /* down */	1749	upordown = 1; /* down */
1505	}	1750	}
1506	if (upordown)	1751	if (upordown)
1507	{	1752	{
1508	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1753	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509	scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;	1754	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510	#endif	1755	#endif
1511	if (scr_page (upordown < 0 ? UP : DN, 1))	1756	if (scr_page (upordown < 0 ? UP : DN, 1))
1512	{	1757	{
1513	if (upordown < 0)	1758	if (upordown < 0)
1514	scrollBar.setUp ();	1759	scrollBar.setUp ();
…		…
1530	break;	1775	break;
1531	case R_SB_ALIGN_BOTTOM:	1776	case R_SB_ALIGN_BOTTOM:
1532	csrO = scrollBar.bot - scrollBar.top;	1777	csrO = scrollBar.bot - scrollBar.top;
1533	break;	1778	break;
1534	}	1779	}
		1780
1535	if (scrollBar.style == R_SB_XTERM	1781	if (scrollBar.style == R_SB_XTERM
1536	|| scrollbar_above_slider (ev.y)	1782	|| scrollbar_above_slider (ev.y)
1537	|| scrollbar_below_slider (ev.y))	1783	|| scrollbar_below_slider (ev.y))
1538	scr_move_to ( scrollbar_position (ev.y) - csrO,	1784	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539	scrollbar_size ());	1785
1540	scrollBar.setMotion ();	1786	scrollBar.setMotion ();
1541	break;	1787	break;
1542		1788
1543	case Button1:	1789	case Button1:
1544	if (scrollbar_align == R_SB_ALIGN_CENTRE)	1790	if (scrollbar_align == R_SB_ALIGN_CENTRE)
…		…
1568	scr_page ((ev.button == Button1 ? DN : UP),	1814	scr_page ((ev.button == Button1 ? DN : UP),
1569	(TermWin.nrow	1815	(TermWin.nrow
1570	* scrollbar_position (ev.y)	1816	* scrollbar_position (ev.y)
1571	/ scrollbar_size ()));	1817	/ scrollbar_size ()));
1572	}	1818	}
		1819
1573	break;	1820	break;
1574	}	1821	}
1575	}	1822	}
1576	return;	1823	return;
1577	}	1824	}
…		…
1601	refresh_type &= ~SMOOTH_REFRESH;	1848	refresh_type &= ~SMOOTH_REFRESH;
1602	#endif	1849	#endif
1603		1850
1604	}	1851	}
1605	#ifdef SELECTION_SCROLLING	1852	#ifdef SELECTION_SCROLLING
1606	pending_scroll_selection=0;	1853	if (sel_scroll_ev.active)
		1854	sel_scroll_ev.stop();
1607	#endif	1855	#endif
1608	if (ev.window == TermWin.vt)	1856	if (ev.window == TermWin.vt)
1609	{	1857	{
1610	if (reportmode)	1858	if (reportmode)
1611	{	1859	{
…		…
1653	case Button5:	1901	case Button5:
1654	{	1902	{
1655	int i;	1903	int i;
1656	page_dirn v;	1904	page_dirn v;
1657		1905
1658	v = (ev.button == Button4) ? UP : DN;	1906	v = ev.button == Button4 ? UP : DN;
		1907
1659	if (ev.state & ShiftMask)	1908	if (ev.state & ShiftMask)
1660	i = 1;	1909	i = 1;
1661	else if ((Options & Opt_mouseWheelScrollPage))	1910	else if (Options & Opt_mouseWheelScrollPage)
1662	i = TermWin.nrow - 1;	1911	i = TermWin.nrow - 1;
1663	else	1912	else
1664	i = 5;	1913	i = 5;
		1914
1665	# ifdef MOUSE_SLIP_WHEELING	1915	# ifdef MOUSE_SLIP_WHEELING
1666	if (ev.state & ControlMask)	1916	if (ev.state & ControlMask)
1667	{	1917	{
1668	mouse_slip_wheel_speed += (v ? -1 : 1);	1918	mouse_slip_wheel_speed += v ? -1 : 1;
		1919	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
		1920	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
		1921
		1922	if (slip_wheel_ev.at < NOW)
1669	mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;	1923	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
		1924
		1925	slip_wheel_ev.start ();
1670	}	1926	}
		1927	else
		1928	{
1671	# endif	1929	# endif
1672	# ifdef JUMP_MOUSE_WHEEL	1930	# ifdef JUMP_MOUSE_WHEEL
1673	scr_page (v, i);
1674	scr_refresh (SMOOTH_REFRESH);
1675	scrollbar_show (1);
1676	# else
1677	while (i--)
1678	{
1679	scr_page (v, 1);	1931	scr_page (v, i);
1680	scr_refresh (SMOOTH_REFRESH);	1932	scr_refresh (SMOOTH_REFRESH);
1681	scrollbar_show (1);	1933	scrollbar_show (1);
		1934	# else
		1935	while (i--)
		1936	{
		1937	scr_page (v, 1);
		1938	scr_refresh (SMOOTH_REFRESH);
		1939	scrollbar_show (1);
		1940	}
		1941	# endif
		1942	# ifdef MOUSE_SLIP_WHEELING
1682	}	1943	}
1683	# endif	1944	#endif
1684
1685	}	1945	}
1686	break;	1946	break;
1687	#endif	1947	#endif
1688
1689	}	1948	}
1690	}	1949	}
1691	#ifdef MENUBAR	1950	#ifdef MENUBAR
1692	else if (isMenuBarWindow (ev.window))	1951	else if (isMenuBarWindow (ev.window))
1693	menubar_control (ev);	1952	menubar_control (ev);
1694	#endif	1953	#endif
1695	}	1954	}
1696		1955
1697	#ifdef TRANSPARENT	1956	#ifdef TRANSPARENT
1698	#if TINTING	1957	#if TINTING
1699	/* shading taken from eterm-0.9.2 */	1958	/* taken from aterm-0.4.2 */
1700	/* RGB 15 */
1701		1959
1702	static void	1960	typedef uint32_t RUINT32T;
1703	shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704	{
1705	unsigned char *ptr;
1706	int x, y;
1707		1961
1708	ptr = (unsigned char *)data + (w * sizeof(uint16_t));	1962	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709	if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {	1963	{
1710	/* No saturation */	1964	int sh_r, sh_g, sh_b;
1711	for (y = h; --y >= 0;) {	1965	RUINT32T mask_r, mask_g, mask_b;
1712	for (x = -w; x < 0; x++) {	1966	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713	int r, g, b;	1967	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
		1968	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
		1969	int i;
1714		1970
1715	b = ((uint16_t *) ptr)[x];	1971	Visual* visual = display->visual;
1716	r = (b & 0x7c00) * rm;	1972
1717	g = (b & 0x3e0) * gm;	1973	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718	b = (b & 0x1f) * bm;	1974
1719	((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)	1975	/* for convenience */
1720	| ((g >> 8) & 0x3e0)	1976	mask_r = visual->red_mask;
1721	| ((b >> 8) & 0x1f);	1977	mask_g = visual->green_mask;
1722	}	1978	mask_b = visual->blue_mask;
1723	ptr += bpl;	1979
1724	}	1980	/* boring lookup table pre-initialization */
		1981	switch (srcImage->bits_per_pixel) {
		1982	case 15:
		1983	if ((mask_r != 0x7c00) ||
		1984	(mask_g != 0x03e0) ||
		1985	(mask_b != 0x001f))
		1986	return;
		1987	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
		1988	lookup_r = lookup;
		1989	lookup_g = lookup+32;
		1990	lookup_b = lookup+32+32;
		1991	sh_r = 10;
		1992	sh_g = 5;
		1993	sh_b = 0;
		1994	break;
		1995	case 16:
		1996	if ((mask_r != 0xf800) ||
		1997	(mask_g != 0x07e0) ||
		1998	(mask_b != 0x001f))
		1999	return;
		2000	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
		2001	lookup_r = lookup;
		2002	lookup_g = lookup+32;
		2003	lookup_b = lookup+32+64;
		2004	sh_r = 11;
		2005	sh_g = 5;
		2006	sh_b = 0;
		2007	break;
		2008	case 24:
		2009	if ((mask_r != 0xff0000) ||
		2010	(mask_g != 0x00ff00) ||
		2011	(mask_b != 0x0000ff))
		2012	return;
		2013	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
		2014	lookup_r = lookup;
		2015	lookup_g = lookup+256;
		2016	lookup_b = lookup+256+256;
		2017	sh_r = 16;
		2018	sh_g = 8;
		2019	sh_b = 0;
		2020	break;
		2021	case 32:
		2022	if ((mask_r != 0xff0000) ||
		2023	(mask_g != 0x00ff00) ||
		2024	(mask_b != 0x0000ff))
		2025	return;
		2026	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
		2027	lookup_r = lookup;
		2028	lookup_g = lookup+256;
		2029	lookup_b = lookup+256+256;
		2030	sh_r = 16;
		2031	sh_g = 8;
		2032	sh_b = 0;
		2033	break;
		2034	default:
		2035	return; /* we do not support this color depth */
		2036	}
		2037
		2038	/* prepare limits for color transformation (each channel is handled separately) */
		2039	if (shade < 0) {
		2040	shade = -shade;
		2041	if (shade < 0) shade = 0;
		2042	if (shade > 100) shade = 100;
		2043
		2044	lower_lim_r = 65535-rm;
		2045	lower_lim_g = 65535-gm;
		2046	lower_lim_b = 65535-bm;
		2047
		2048	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
		2049	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
		2050	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
		2051
		2052	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1725	} else {	2053	} else {
1726	for (y = h; --y >= 0;) {	2054	if (shade < 0) shade = 0;
1727	for (x = -w; x < 0; x++) {	2055	if (shade > 100) shade = 100;
1728	int r, g, b;
1729		2056
1730	b = ((uint16_t *) ptr)[x];	2057	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731	r = (b & 0x7c00) * rm;	2058
1732	g = (b & 0x3e0) * gm;	2059	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733	b = (b & 0x1f) * bm;	2060	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734	r |= (!(r >> 15) - 1);	2061	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735	g |= (!(g >> 10) - 1);	2062	}
1736	b |= (!(b >> 5) - 1);	2063
1737	((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)	2064	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1738	| ((g >> 8) & 0x3e0)	2065	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739	| ((b >> 8) & 0x1f);	2066	{
1740	}	2067	unsigned int tmp;
1741	ptr += bpl;	2068
		2069	tmp = lower_lim_r;
		2070	lower_lim_r = lower_lim_b;
		2071	lower_lim_b = tmp;
		2072
		2073	tmp = upper_lim_r;
		2074	upper_lim_r = upper_lim_b;
		2075	upper_lim_b = tmp;
		2076	}
		2077
		2078	/* fill our lookup tables */
		2079	for (i = 0; i <= mask_r>>sh_r; i++)
		2080	{
		2081	RUINT32T tmp;
		2082	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
		2083	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
		2084	lookup_r[i] = (tmp/65535)<<sh_r;
		2085	}
		2086	for (i = 0; i <= mask_g>>sh_g; i++)
		2087	{
		2088	RUINT32T tmp;
		2089	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
		2090	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
		2091	lookup_g[i] = (tmp/65535)<<sh_g;
		2092	}
		2093	for (i = 0; i <= mask_b>>sh_b; i++)
		2094	{
		2095	RUINT32T tmp;
		2096	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
		2097	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
		2098	lookup_b[i] = (tmp/65535)<<sh_b;
		2099	}
		2100
		2101	/* apply table to input image (replacing colors by newly calculated ones) */
		2102	switch (srcImage->bits_per_pixel)
		2103	{
		2104	case 15:
		2105	{
		2106	unsigned short *p1, *pf, *p, *pl;
		2107	p1 = (unsigned short *) srcImage->data;
		2108	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
		2109	while (p1 < pf)
		2110	{
		2111	p = p1;
		2112	pl = p1 + srcImage->width;
		2113	for (; p < pl; p++)
1742	}	2114	{
		2115	*p = lookup_r[(*p & 0x7c00)>>10] |
		2116	lookup_g[(*p & 0x03e0)>> 5] |
		2117	lookup_b[(*p & 0x001f)];
		2118	}
		2119	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743	}	2120	}
1744	}	2121	break;
1745		2122	}
1746	/* RGB 16 */	2123	case 16:
1747	static void	2124	{
1748	shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)	2125	unsigned short *p1, *pf, *p, *pl;
1749	{	2126	p1 = (unsigned short *) srcImage->data;
1750	unsigned char *ptr;	2127	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751	int x, y;	2128	while (p1 < pf)
1752		2129	{
1753	ptr = (unsigned char *)data + (w * sizeof(uint16_t));	2130	p = p1;
1754	if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {	2131	pl = p1 + srcImage->width;
1755	/* No saturation */	2132	for (; p < pl; p++)
1756	for (y = h; --y >= 0;) {
1757	for (x = -w; x < 0; x++) {
1758	int r, g, b;
1759
1760	b = ((uint16_t *) ptr)[x];
1761	r = (b & 0xf800) * rm;
1762	g = (b & 0x7e0) * gm;
1763	b = (b & 0x1f) * bm;
1764	((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765	| ((g >> 8) & 0x7e0)
1766	| ((b >> 8) & 0x1f);
1767	}
1768	ptr += bpl;
1769	}	2133	{
1770	} else {	2134	*p = lookup_r[(*p & 0xf800)>>11] |
1771	for (y = h; --y >= 0;) {	2135	lookup_g[(*p & 0x07e0)>> 5] |
1772	for (x = -w; x < 0; x++) {	2136	lookup_b[(*p & 0x001f)];
1773	int r, g, b;
1774
1775	b = ((uint16_t *) ptr)[x];
1776	r = (b & 0xf800) * rm;
1777	g = (b & 0x7e0) * gm;
1778	b = (b & 0x1f) * bm;
1779	r |= (!(r >> 16) - 1);
1780	g |= (!(g >> 11) - 1);
1781	b |= (!(b >> 5) - 1);
1782	((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783	| ((g >> 8) & 0x7e0)
1784	| ((b >> 8) & 0x1f);
1785	}	2137	}
1786	ptr += bpl;	2138	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
		2139	}
		2140	break;
		2141	}
		2142	case 24:
		2143	{
		2144	unsigned char *p1, *pf, *p, *pl;
		2145	p1 = (unsigned char *) srcImage->data;
		2146	pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
		2147	while (p1 < pf)
		2148	{
		2149	p = p1;
		2150	pl = p1 + srcImage->width * 3;
		2151	for (; p < pl; p += 3)
1787	}	2152	{
		2153	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
		2154	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
		2155	p[2] = lookup_r[(p[2] & 0x0000ff)];
		2156	}
		2157	p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1788	}	2158	}
1789	}	2159	break;
		2160	}
		2161	case 32:
		2162	{
		2163	RUINT32T *p1, *pf, *p, *pl;
		2164	p1 = (RUINT32T *) srcImage->data;
		2165	pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1790		2166
1791	/* RGB 24 */	2167	while (p1 < pf)
1792	static void	2168	{
1793	shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)	2169	p = p1;
1794	{	2170	pl = p1 + srcImage->width;
1795	unsigned char *ptr;	2171	for (; p < pl; p++)
1796	int x, y;
1797
1798	ptr = (unsigned char *)data + (w * 3);
1799	if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800	/* No saturation */
1801	for (y = h; --y >= 0;) {
1802	for (x = -(w * 3); x < 0; x += 3) {
1803	int r, g, b;
1804
1805	if (byteorder.big_endian()) {
1806	r = (ptr[x + 0] * rm) >> 8;
1807	g = (ptr[x + 1] * gm) >> 8;
1808	b = (ptr[x + 2] * bm) >> 8;
1809	ptr[x + 0] = r;
1810	ptr[x + 1] = g;
1811	ptr[x + 2] = b;
1812	} else {
1813	r = (ptr[x + 2] * rm) >> 8;
1814	g = (ptr[x + 1] * gm) >> 8;
1815	b = (ptr[x + 0] * bm) >> 8;
1816	ptr[x + 2] = r;
1817	ptr[x + 1] = g;
1818	ptr[x + 0] = b;
1819	}
1820	}
1821	ptr += bpl;
1822	}	2172	{
1823	} else {	2173	*p = lookup_r[(*p & 0xff0000)>>16] |
1824	for (y = h; --y >= 0;) {	2174	lookup_g[(*p & 0x00ff00)>> 8] |
1825	for (x = -(w * 3); x < 0; x += 3) {	2175	lookup_b[(*p & 0x0000ff)] |
1826	int r, g, b;	2176	(*p & ~0xffffff);
1827
1828	if (byteorder.big_endian()) {
1829	r = (ptr[x + 0] * rm) >> 8;
1830	g = (ptr[x + 1] * gm) >> 8;
1831	b = (ptr[x + 2] * bm) >> 8;
1832
1833	r |= (!(r >> 8) - 1);
1834	g |= (!(g >> 8) - 1);
1835	b |= (!(b >> 8) - 1);
1836
1837	ptr[x + 0] = r;
1838	ptr[x + 1] = g;
1839	ptr[x + 2] = b;
1840	} else {
1841	r = (ptr[x + 2] * rm) >> 8;
1842	g = (ptr[x + 1] * gm) >> 8;
1843	b = (ptr[x + 0] * bm) >> 8;
1844
1845	r |= (!(r >> 8) - 1);
1846	g |= (!(g >> 8) - 1);
1847	b |= (!(b >> 8) - 1);
1848
1849	ptr[x + 2] = r;
1850	ptr[x + 1] = g;
1851	ptr[x + 0] = b;
1852	}
1853	}	2177	}
1854	ptr += bpl;	2178	p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855	}	2179	}
		2180	break;
		2181	}
1856	}	2182	}
1857	}
1858		2183
1859	/* RGB 32 */	2184	free (lookup);
1860	static void
1861	shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862	{
1863	unsigned char *ptr;
1864	int x, y;
1865
1866	ptr = (unsigned char *)data + (w * 4);
1867	if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868	/* No saturation */
1869	for (y = h; --y >= 0;) {
1870	if (byteorder.big_endian()) {
1871	for (x = -(w * 4); x < 0; x += 4) {
1872	int r, g, b;
1873
1874	r = (ptr[x + 1] * rm) >> 8;
1875	g = (ptr[x + 2] * gm) >> 8;
1876	b = (ptr[x + 3] * bm) >> 8;
1877	ptr[x + 1] = r;
1878	ptr[x + 2] = g;
1879	ptr[x + 3] = b;
1880	}
1881	} else {
1882	for (x = -(w * 4); x < 0; x += 4) {
1883	int r, g, b;
1884
1885	r = (ptr[x + 2] * rm) >> 8;
1886	g = (ptr[x + 1] * gm) >> 8;
1887	b = (ptr[x + 0] * bm) >> 8;
1888	ptr[x + 2] = r;
1889	ptr[x + 1] = g;
1890	ptr[x + 0] = b;
1891	}
1892	}
1893	ptr += bpl;
1894	}
1895	} else {
1896	for (y = h; --y >= 0;) {
1897	for (x = -(w * 4); x < 0; x += 4) {
1898	int r, g, b;
1899
1900	if (byteorder.big_endian()) {
1901	r = (ptr[x + 1] * rm) >> 8;
1902	g = (ptr[x + 2] * gm) >> 8;
1903	b = (ptr[x + 3] * bm) >> 8;
1904
1905	r |= (!(r >> 8) - 1);
1906	g |= (!(g >> 8) - 1);
1907	b |= (!(b >> 8) - 1);
1908
1909	ptr[x + 1] = r;
1910	ptr[x + 2] = g;
1911	ptr[x + 3] = b;
1912	} else {
1913	r = (ptr[x + 2] * rm) >> 8;
1914	g = (ptr[x + 1] * gm) >> 8;
1915	b = (ptr[x + 0] * bm) >> 8;
1916
1917	r |= (!(r >> 8) - 1);
1918	g |= (!(g >> 8) - 1);
1919	b |= (!(b >> 8) - 1);
1920
1921	ptr[x + 2] = r;
1922	ptr[x + 1] = g;
1923	ptr[x + 0] = b;
1924	}
1925	}
1926	ptr += bpl;
1927	}
1928	}
1929	}	2185	}
1930
1931	#endif	2186	#endif
1932		2187
1933	/*	2188	/*
1934	* Check our parents are still who we think they are.	2189	* Check our parents are still who we think they are.
1935	* Do transparency updates if required	2190	* Do transparency updates if required
…		…
1958	if (rootdepth != wattr.depth)	2213	if (rootdepth != wattr.depth)
1959	{	2214	{
1960	if (am_transparent)	2215	if (am_transparent)
1961	{	2216	{
1962	pchanged = 1;	2217	pchanged = 1;
1963	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);	2218	XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1964	am_transparent = am_pixmap_trans = 0;	2219	am_transparent = am_pixmap_trans = 0;
1965	}	2220	}
1966		2221
1967	return pchanged; /* Don't try any more */	2222	return pchanged; /* Don't try any more */
1968	}	2223	}
…		…
1984	i = (xa[XA_XSETROOTID]	2239	i = (xa[XA_XSETROOTID]
1985	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2240	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1986	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2241	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987	&nitems, &bytes_after, &prop) == Success);	2242	&nitems, &bytes_after, &prop) == Success);
1988		2243
1989	if (!i || prop == NULL)	2244	if (!i || prop == NULL
		2245	#if TINTING
		2246	|| !rs[Rs_color + Color_tint]
		2247	#endif
		2248	)
1990	have_pixmap = 0;	2249	have_pixmap = 0;
1991	else	2250	else
1992	{	2251	{
1993	have_pixmap = 1;	2252	have_pixmap = 1;
1994	rootpixmap = *(Pixmap *)prop;	2253	rootpixmap = *(Pixmap *)prop;
…		…
2056	XFreePixmap (display->display, TermWin.pixmap);	2315	XFreePixmap (display->display, TermWin.pixmap);
2057		2316
2058	#if TINTING	2317	#if TINTING
2059	if (ISSET_PIXCOLOR (Color_tint))	2318	if (ISSET_PIXCOLOR (Color_tint))
2060	{	2319	{
2061	unsigned short shade, rm, gm, bm;	2320	unsigned short rm, gm, bm;
		2321	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062		2322
2063	PixColors[Color_tint].get (display, rm, gm, bm);	2323	PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2064		2324
2065	rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...	2325	ShadeXImage (display, image, shade, rm, gm, bm);
2066
2067	/* Determine bitshift and bitmask values */
2068	switch (image->bits_per_pixel)
2069	{
2070	case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071	case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072	case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073	case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074	}
2075	}	2326	}
2076	#endif	2327	#endif
2077		2328
2078	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2329	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2079	szHint.width, szHint.height, image->depth);	2330	szHint.width, szHint.height, image->depth);
2080	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2331	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2081	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2332	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2082	nx, ny, image->width, image->height);	2333	nx, ny, image->width, image->height);
2083	XFreeGC (display->display, gc);	2334	XFreeGC (display->display, gc);
2084	XDestroyImage (image);	2335	XDestroyImage (image);
2085	XSetWindowBackgroundPixmap (display->display, TermWin.vt,	2336	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2086	TermWin.pixmap);	2337	XClearWindow (display->display, TermWin.parent[0]);
2087		2338
2088	if (!am_transparent || !am_pixmap_trans)	2339	if (!am_transparent || !am_pixmap_trans)
2089	pchanged = 1;	2340	pchanged = 1;
2090		2341
2091	am_transparent = am_pixmap_trans = 1;	2342	am_transparent = am_pixmap_trans = 1;
…		…
2136	}	2387	}
2137		2388
2138	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2389	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139	{	2390	{
2140	D_X ((stderr, "InheritPixmap Turning off"));	2391	D_X ((stderr, "InheritPixmap Turning off"));
2141	XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);	2392	XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2142	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);	2393	XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2143	am_transparent = 0;	2394	am_transparent = 0;
2144	/* XXX: also turn off Opt_transparent? */	2395	/* XXX: also turn off Opt_transparent? */
2145	}	2396	}
2146	else	2397	else
2147	{	2398	{
…		…
2150	* needed for fvwm2.2.2 (and before?) */	2401	* needed for fvwm2.2.2 (and before?) */
2151	sleep (1);	2402	sleep (1);
2152	#endif	2403	#endif
2153	D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));	2404	D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154	for (n = 0; n < (unsigned int)i; n++)	2405	for (n = 0; n < (unsigned int)i; n++)
		2406	{
2155	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2407	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
		2408	XClearWindow (display->display, TermWin.parent[n]);
		2409	}
2156		2410
2157	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2411	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2158	am_transparent = 1;	2412	am_transparent = 1;
2159	}	2413	}
2160		2414
2161	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2415	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162	TermWin.parent[i] = None;	2416	TermWin.parent[i] = None;
		2417	}
		2418
		2419	// this is experimental
		2420	if (scrollBar.win)
		2421	{
		2422	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
		2423	XClearWindow (display->display, scrollBar.win);
		2424	scrollBar.setIdle ();
		2425	scrollbar_show (0);
2163	}	2426	}
2164		2427
2165	return pchanged;	2428	return pchanged;
2166	}	2429	}
2167	#endif	2430	#endif
…		…
2192	unicode_t buf[UBUFSIZ];	2455	unicode_t buf[UBUFSIZ];
2193	bool refreshnow = false;	2456	bool refreshnow = false;
2194	int nlines = 0;	2457	int nlines = 0;
2195	unicode_t *str = buf;	2458	unicode_t *str = buf;
2196		2459
2197	*str++ = ch;
2198
2199	for (;;)	2460	for (;;)
2200	{	2461	{
2201	seq_begin = cmdbuf_ptr;
2202	ch = next_char ();
2203
2204	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2462	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205	break;	2463	break;
2206		2464
2207	*str++ = ch;	2465	*str++ = ch;
2208		2466
2209	if (ch == C0_LF)	2467	if (ch == C0_LF)
2210	{	2468	{
2211	nlines++;	2469	nlines++;
2212	refresh_count++;	2470	refresh_count++;
2213		2471
2214	if (! (Options & Opt_jumpScroll)	2472	if (!(Options & Opt_jumpScroll)
2215	|| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))	2473	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2216	{	2474	{
2217	refreshnow = true;	2475	refreshnow = true;
2218	flag = true;
2219	ch = NOCHAR;	2476	ch = NOCHAR;
2220	break;	2477	break;
2221	}	2478	}
2222		2479
2223	// scr_add_lines only works for nlines < TermWin.nrow - 1.	2480	// scr_add_lines only works for nlines <= TermWin.nrow - 1.
2224	if (nlines >= TermWin.nrow - 1)	2481	if (nlines >= TermWin.nrow - 1)
2225	{	2482	{
2226	scr_add_lines (buf, nlines, str - buf);	2483	scr_add_lines (buf, nlines, str - buf);
2227	nlines = 0;	2484	nlines = 0;
2228	str = buf;	2485	str = buf;
…		…
2232	if (str >= buf + UBUFSIZ)	2489	if (str >= buf + UBUFSIZ)
2233	{	2490	{
2234	ch = NOCHAR;	2491	ch = NOCHAR;
2235	break;	2492	break;
2236	}	2493	}
		2494
		2495	seq_begin = cmdbuf_ptr;
		2496	ch = next_char ();
2237	}	2497	}
2238		2498
2239	scr_add_lines (buf, nlines, str - buf);	2499	scr_add_lines (buf, nlines, str - buf);
2240		2500
2241	/*	2501	/*
2242	* If there have been a lot of new lines, then update the screen	2502	* If there have been a lot of new lines, then update the screen
2243	* What the heck I'll cheat and only refresh less than every page-full.	2503	* What the heck I'll cheat and only refresh less than every page-full.
2244	* the number of pages between refreshes is refresh_limit, which	2504	* the number of pages between refreshes is refresh_limit, which
2245	* is incremented here because we must be doing flat-out scrolling.	2505	* is incremented here because we must be doing flat-out scrolling.
2246	*
2247	* refreshing should be correct for small scrolls, because of the
2248	* time-out
2249	*/	2506	*/
2250	if (refreshnow)	2507	if (refreshnow)
2251	{	2508	{
2252	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2509	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253	refresh_limit++;	2510	refresh_limit++;
2254	else	2511	else
		2512	{
		2513	flag = true;
2255	scr_refresh (refresh_type);	2514	scr_refresh (refresh_type);
		2515	}
2256	}	2516	}
2257		2517
2258	}	2518	}
2259	else	2519	else
2260	{	2520	{
…		…
2274	}	2534	}
2275		2535
2276	return flag;	2536	return flag;
2277	}	2537	}
2278		2538
		2539	// read the next octet
		2540	unicode_t
		2541	rxvt_term::next_octet ()
		2542	{
		2543	return cmdbuf_ptr < cmdbuf_endp
		2544	? *cmdbuf_ptr++
		2545	: NOCHAR;
		2546	}
		2547
2279	// read the next character	2548	// read the next character
2280	unicode_t	2549	unicode_t
2281	rxvt_term::next_char ()	2550	rxvt_term::next_char ()
2282	{	2551	{
2283	while (cmdbuf_ptr < cmdbuf_endp)	2552	while (cmdbuf_ptr < cmdbuf_endp)
…		…
2314	*/	2583	*/
2315	unicode_t	2584	unicode_t
2316	rxvt_term::cmd_getc ()	2585	rxvt_term::cmd_getc ()
2317	{	2586	{
2318	unicode_t c = next_char ();	2587	unicode_t c = next_char ();
		2588
		2589	if (c == NOCHAR)
		2590	throw out_of_input;
		2591
		2592	return c;
		2593	}
		2594
		2595	unicode_t
		2596	rxvt_term::cmd_get8 ()
		2597	{
		2598	unicode_t c = next_octet ();
2319		2599
2320	if (c == NOCHAR)	2600	if (c == NOCHAR)
2321	throw out_of_input;	2601	throw out_of_input;
2322		2602
2323	return c;	2603	return c;
…		…
2453	break;	2733	break;
2454	case C0_SI: /* shift in - acs */	2734	case C0_SI: /* shift in - acs */
2455	scr_charset_choose (0);	2735	scr_charset_choose (0);
2456	break;	2736	break;
2457		2737
		2738	#ifdef EIGHT_BIT_CONTROLS
2458	// 8-bit controls	2739	// 8-bit controls
2459	case 0x90: /* DCS */	2740	case 0x90: /* DCS */
2460	process_dcs_seq ();	2741	process_dcs_seq ();
2461	break;	2742	break;
2462	case 0x9b: /* CSI */	2743	case 0x9b: /* CSI */
2463	process_csi_seq ();	2744	process_csi_seq ();
2464	break;	2745	break;
2465	case 0x9d: /* CSI */	2746	case 0x9d: /* CSI */
2466	process_osc_seq ();	2747	process_osc_seq ();
2467	break;	2748	break;
		2749	#endif
2468	}	2750	}
2469	}	2751	}
2470	/*}}} */	2752	/*}}} */
2471		2753
2472		2754
…		…
2661		2943
2662	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */	2944	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663	/* *INDENT-OFF* */	2945	/* *INDENT-OFF* */
2664	enum {	2946	enum {
2665	CSI_ICH = 0x40,	2947	CSI_ICH = 0x40,
2666	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2948	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2949	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2950	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669	CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,	2951	CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670	CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,	2952	CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2953	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
…		…
3063	break;	3345	break;
3064	case 19: /* report window size (chars) */	3346	case 19: /* report window size (chars) */
3065	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3347	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3066	break;	3348	break;
3067	case 20: /* report icon label */	3349	case 20: /* report icon label */
3068	if (Options & Opt_insecure)
3069	{	3350	{
3070	char *s;	3351	char *s;
3071	XGetIconName (display->display, TermWin.parent[0], &s);	3352	XGetIconName (display->display, TermWin.parent[0], &s);
3072	tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */	3353	tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */
		3354	XFree (s);
3073	}	3355	}
3074	break;	3356	break;
3075	case 21: /* report window title */	3357	case 21: /* report window title */
3076	if (Options & Opt_insecure)
3077	{	3358	{
3078	char *s;	3359	char *s;
3079	XFetchName (display->display, TermWin.parent[0], &s);	3360	XFetchName (display->display, TermWin.parent[0], &s);
3080	tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */	3361	tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */
		3362	XFree (s);
3081	}	3363	}
3082	break;	3364	break;
3083	}	3365	}
3084	}	3366	}
3085	#endif	3367	#endif
3086		3368
…		…
3090	* ends_how is terminator used. returned input must be free()'d	3372	* ends_how is terminator used. returned input must be free()'d
3091	*/	3373	*/
3092	unsigned char *	3374	unsigned char *
3093	rxvt_term::get_to_st (unicode_t &ends_how)	3375	rxvt_term::get_to_st (unicode_t &ends_how)
3094	{	3376	{
3095	int seen_esc = 0; /* seen escape? */	3377	unicode_t prev = 0, ch;
3096	unsigned int n = 0;	3378	unsigned int n = 0;
3097	unsigned char *s;	3379	unsigned char *s;
3098	unicode_t ch;
3099	unsigned char string[STRING_MAX];	3380	unsigned char string[STRING_MAX];
3100		3381
3101	while ((ch = cmd_getc ()))	3382	while ((ch = cmd_getc ()) != NOCHAR)
3102	{	3383	{
3103	if (ch == C0_BEL || ch == CHAR_ST)	3384	if (prev == C0_ESC)
3104	break;	3385	{
3105
3106	if (seen_esc)
3107	if (ch == 0x5c) /* 7bit ST */	3386	if (ch == 0x5c) /* 7bit ST */
3108	break;	3387	break;
3109	else	3388	else
3110	return NULL;	3389	return NULL;
3111
3112	if (ch == C0_ESC)
3113	{	3390	}
3114	seen_esc = 1;	3391	else if (ch == C0_BEL || ch == CHAR_ST)
3115	continue;	3392	break;
3116	}
3117	else if (ch == C0_HT)	3393	else if (ch < 0x20)
3118	ch = ' '; /* translate '\t' to space */
3119	else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120	return NULL; /* other control character - exit */	3394	return NULL; /* other control character - exit */
3121		3395
3122	if (n >= sizeof (string) - 1)	3396	if (n >= sizeof (string) - 1)
3123	// stop at some sane length	3397	// stop at some sane length
3124	return NULL;	3398	return NULL;
3125		3399
		3400	if (ch == C0_SYN)
		3401	{
		3402	string[n++] = cmd_get8 ();
		3403	prev = 0;
		3404	}
		3405	else
3126	string[n++] = ch;	3406	string[n++] = prev = ch;
3127	seen_esc = 0;
3128	}	3407	}
3129		3408
3130	string[n++] = '\0';	3409	string[n++] = '\0';
3131		3410
3132	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)	3411	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
…		…
3186	void	3465	void
3187	rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)	3466	rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3188	{	3467	{
3189	if (str[0] == '?' && !str[1])	3468	if (str[0] == '?' && !str[1])
3190	{	3469	{
3191	if (Options & Opt_insecure)
3192	{
3193	unsigned short r, g, b;	3470	unsigned short r, g, b;
3194	PixColors[color].get (display, r, g, b);	3471	PixColorsFocused[color].get (display, r, g, b);
3195	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3472	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196	}
3197	}	3473	}
3198	else	3474	else
3199	set_window_color (color, str);	3475	set_window_color (color, str);
3200	}	3476	}
3201		3477
…		…
3301	if ((buf = STRCHR (name, ';')) != NULL)	3577	if ((buf = STRCHR (name, ';')) != NULL)
3302	*buf++ = '\0';	3578	*buf++ = '\0';
3303		3579
3304	if (name[0] == '?' && !name[1])	3580	if (name[0] == '?' && !name[1])
3305	{	3581	{
3306	if (Options & Opt_insecure)
3307	{
3308	unsigned short r, g, b;	3582	unsigned short r, g, b;
3309	PixColors[color + minCOLOR].get (display, r, g, b);	3583	PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3310	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3584	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311	}
3312	}	3585	}
3313	else	3586	else
3314	set_window_color (color + minCOLOR, name);	3587	set_window_color (color + minCOLOR, name);
3315	}	3588	}
3316	break;	3589	break;
…		…
3380	// TODO, when secure mode?	3653	// TODO, when secure mode?
3381	break;	3654	break;
3382		3655
3383	case XTerm_font:	3656	case XTerm_font:
3384	if (query)	3657	if (query)
3385	{
3386	if (Options & Opt_insecure)
3387	tt_printf ("\33]%d;%-.250s%c", XTerm_font,	3658	tt_printf ("\33]%d;%-.250s%c", XTerm_font,
		3659	(Options & Opt_insecure) && TermWin.fontset->fontdesc
3388	TermWin.fontset->fontdesc	3660	? TermWin.fontset->fontdesc : "",
3389	? TermWin.fontset->fontdesc
3390	: "",
3391	resp);	3661	resp);
3392	}
3393	else	3662	else
3394	change_font (str);	3663	change_font (str);
3395	break;	3664	break;
3396		3665
3397	#ifndef NO_FRILLS	3666	#ifndef NO_FRILLS
3398	case XTerm_locale:	3667	case XTerm_locale:
3399	if (query)	3668	if (query)
3400	{
3401	if (Options & Opt_insecure)
3402	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);	3669	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3403	}
3404	else	3670	else
3405	{	3671	{
3406	set_locale (str);	3672	set_locale (str);
3407	# ifdef USE_XIM	3673	# ifdef USE_XIM
3408	im_cb ();	3674	im_cb ();
3409	# endif	3675	# endif
3410	}	3676	}
3411	break;	3677	break;
3412		3678
3413	case XTerm_findfont:	3679	case XTerm_findfont:
3414	if (Options & Opt_insecure)
3415	{	3680	{
3416	int fid = TermWin.fontset->find_font (atoi (str));	3681	int fid = TermWin.fontset->find_font (atoi (str));
3417	tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,	3682	tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418	fid, (*TermWin.fontset)[fid]->name, resp);	3683	fid,
		3684	(Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
		3685	resp);
3419	}	3686	}
3420	break;	3687	break;
3421	#endif	3688	#endif
3422		3689
3423	#ifdef MENUBAR	3690	#ifdef MENUBAR
3424	case XTerm_Menu:	3691	case XTerm_Menu:
…		…
3687	rendset = 0, rendstyle = ~RS_None;	3954	rendset = 0, rendstyle = ~RS_None;
3688	break;	3955	break;
3689	case 1:	3956	case 1:
3690	rendset = 1, rendstyle = RS_Bold;	3957	rendset = 1, rendstyle = RS_Bold;
3691	break;	3958	break;
		3959	//case 2: // faint or second colour
3692	case 4:	3960	case 4:
3693	rendset = 1, rendstyle = RS_Uline;	3961	rendset = 1, rendstyle = RS_Uline;
3694	break;	3962	break;
3695	case 5:	3963	case 5: // slowly blinking
		3964	case 6: // rapidly blinking
3696	rendset = 1, rendstyle = RS_Blink;	3965	rendset = 1, rendstyle = RS_Blink;
3697	break;	3966	break;
3698	//case 6: // scoansi light background	3967	//case 6: // scoansi light background
3699	case 7:	3968	case 7:
3700	rendset = 1, rendstyle = RS_RVid;	3969	rendset = 1, rendstyle = RS_RVid;
3701	break;	3970	break;
3702	case 8:	3971	case 8:
3703	// invisible. NYI	3972	// invisible. NYI
3704	break;	3973	break;
		3974	//case 9: // crossed out
3705	//case 10: // scoansi acs off	3975	//case 10: // scoansi acs off, primary font
3706	//case 11: // scoansi acs on	3976	//case 11: // scoansi acs on, first alt font
3707	//case 12: // scoansi acs on, |0x80	3977	//case 12: // scoansi acs on, |0x80, second alt font
3708	case 21: // disable bold, blink and invis (some terminals use this)	3978	//...
		3979	//case 19: // ninth alt font
		3980	//case 20: // gothic
		3981	case 21: // disable bold, faint
3709	rendset = 0, rendstyle = RS_Bold | RS_Blink;	3982	rendset = 0, rendstyle = RS_Bold;
3710	break;	3983	break;
3711	case 22:	3984	case 22:
3712	rendset = 0, rendstyle = RS_Bold;	3985	rendset = 0, rendstyle = RS_Bold;
3713	break;	3986	break;
		3987	//case 23: disable italic
3714	case 24:	3988	case 24:
3715	rendset = 0, rendstyle = RS_Uline;	3989	rendset = 0, rendstyle = RS_Uline;
3716	break;	3990	break;
3717	case 25:	3991	case 25:
3718	rendset = 0, rendstyle = RS_Blink;	3992	rendset = 0, rendstyle = RS_Blink;
3719	break;	3993	break;
3720	case 27:	3994	case 27:
3721	rendset = 0, rendstyle = RS_RVid;	3995	rendset = 0, rendstyle = RS_RVid;
3722	break;	3996	break;
3723	case 28:
3724	// visible. NYI	3997	//case 28: // visible. NYI
3725	break;	3998	//case 29: // not crossed-out
3726	}	3999	}
3727		4000
3728	if (rendset != -1)	4001	if (rendset != -1)
3729	{	4002	{
3730	scr_rendition (rendset, rendstyle);	4003	scr_rendition (rendset, rendstyle);

Diff Legend

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