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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: command.c	2	* File: command.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
672	scr_refresh (refresh_type);	672	scr_refresh (refresh_type);
673	scrollbar_show (1);	673	scrollbar_show (1);
674	#ifdef USE_XIM	674	#ifdef USE_XIM
675	IMSendSpot ();	675	IMSendSpot ();
676	#endif	676	#endif
677
678	}	677	}
679		678
680	display->flush ();	679	display->flush ();
		680
		681	flush_ev.stop ();
681	}	682	}
682		683
683	void	684	void
684	rxvt_term::check_cb (check_watcher &w)	685	rxvt_term::check_cb (check_watcher &w)
685	{	686	{
686	SET_R (this);	687	SET_R (this);
687	SET_LOCALE (locale);	688	SET_LOCALE (locale);
688		689
		690	display->flush ();
		691
		692	if (!flush_ev.active)
		693	flush_ev.start (NOW + 0.01);
		694	}
		695
		696	void
		697	rxvt_term::flush_cb (time_watcher &w)
		698	{
		699	SET_R (this);
		700	SET_LOCALE (locale);
		701
		702	refresh_limit = 1;
		703	refresh_count = 0;
689	flush ();	704	flush ();
690	}	705	}
691		706
692	#ifdef CURSOR_BLINK	707	#ifdef CURSOR_BLINK
693	void	708	void
…		…
711	w.start (w.at + TEXT_BLINK_INTERVAL);	726	w.start (w.at + TEXT_BLINK_INTERVAL);
712	}	727	}
713	}	728	}
714	#endif	729	#endif
715		730
		731	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		732	void
		733	rxvt_term::cont_scroll_cb (time_watcher &w)
		734	{
		735	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
		736	scr_page (scrollbar_isUp() ? UP : DN, 1))
		737	{
		738	refresh_type \|= SMOOTH_REFRESH;
		739	want_refresh = 1;
		740	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
		741	}
		742	}
		743	#endif
		744
		745	#ifdef SELECTION_SCROLLING
		746	void
		747	rxvt_term::sel_scroll_cb (time_watcher &w)
		748	{
		749	if (scr_page (scroll_selection_dir, scroll_selection_lines))
		750	{
		751	selection_extend (selection_save_x, selection_save_y, selection_save_state);
		752	refresh_type \|= SMOOTH_REFRESH;
		753	want_refresh = 1;
		754	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
		755	}
		756	}
		757	#endif
		758
		759	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		760	void
		761	rxvt_term::slip_wheel_cb (time_watcher &w)
		762	{
		763	if (mouse_slip_wheel_speed == 0
		764	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
		765	: scr_page (UP, mouse_slip_wheel_speed))
		766	{
		767	refresh_type \|= SMOOTH_REFRESH;
		768	want_refresh = 1;
		769	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
		770	}
		771	}
		772	#endif
		773
716	bool	774	bool
717	rxvt_term::pty_fill ()	775	rxvt_term::pty_fill ()
718	{	776	{
719	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	777	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
		778
		779	if (CBUFSIZ == n)
		780	{
		781	rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
		782	n = 0;
		783	}
720		784
721	memmove (cmdbuf_base, cmdbuf_ptr, n);	785	memmove (cmdbuf_base, cmdbuf_ptr, n);
722	cmdbuf_ptr = cmdbuf_base;	786	cmdbuf_ptr = cmdbuf_base;
723	cmdbuf_endp = cmdbuf_ptr + n;	787	cmdbuf_endp = cmdbuf_ptr + n;
724		788
…		…
742	SET_LOCALE (locale);	806	SET_LOCALE (locale);
743		807
744	if (revents & EVENT_WRITE)	808	if (revents & EVENT_WRITE)
745	tt_write (0, 0);	809	tt_write (0, 0);
746	else if (revents & EVENT_READ)	810	else if (revents & EVENT_READ)
747	{
748	// loop, but don't allow a single term to monopolize us	811	// loop, but don't allow a single term to monopolize us
749	// the number of loops is fully arbitrary, and thus wrong
750	while (pty_fill ())	812	while (pty_fill ())
751	{
752	if (!seen_input)
753	{
754	seen_input = 1;
755	/* once we know the shell is running, send the screen size. Again! */
756	// I don't know why, btw.
757	tt_winch ();
758	}
759
760	if (cmd_parse ())	813	if (cmd_parse ())
761	break;	814	break;
762	}
763	}
764	}	815	}
765		816
766	#ifdef POINTER_BLANK
767	void	817	void
768	rxvt_term::pointer_unblank ()	818	rxvt_term::pointer_unblank ()
769	{	819	{
770	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	820	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771	recolour_cursor ();	821	recolour_cursor ();
772		822
		823	#ifdef POINTER_BLANK
773	hidden_pointer = 0;	824	hidden_pointer = 0;
774		825
775	if (Options & Opt_pointerBlank)	826	if (Options & Opt_pointerBlank)
776	pointer_ev.start (NOW + pointerBlankDelay);	827	pointer_ev.start (NOW + pointerBlankDelay);
		828	#endif
777	}	829	}
778		830
		831	#ifdef POINTER_BLANK
779	void	832	void
780	rxvt_term::pointer_blank ()	833	rxvt_term::pointer_blank ()
781	{	834	{
782	if (! (Options & Opt_pointerBlank))	835	if (! (Options & Opt_pointerBlank))
783	return;	836	return;
…		…
979	break;	1032	break;
980		1033
981	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1034	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982	case KeyRelease:	1035	case KeyRelease:
983	{	1036	{
984	if (! (ev.xkey.state & ControlMask))	1037	if (!(ev.xkey.state & ControlMask))
985	mouse_slip_wheel_speed = 0;	1038	slip_wheel_ev.stop ();
986	else	1039	else
987	{	1040	{
988	KeySym ks;	1041	KeySym ks;
989		1042
990	ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);	1043	ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991	if (ks == XK_Control_L \|\| ks == XK_Control_R)	1044	if (ks == XK_Control_L \|\| ks == XK_Control_R)
992	mouse_slip_wheel_speed = 0;	1045	mouse_slip_wheel_speed = 0;
993	}	1046	}
…		…
1013	&& (ev.xclient.data.l[0] == DndFile	1066	&& (ev.xclient.data.l[0] == DndFile
1014	\|\| ev.xclient.data.l[0] == DndDir	1067	\|\| ev.xclient.data.l[0] == DndDir
1015	\|\| ev.xclient.data.l[0] == DndLink))	1068	\|\| ev.xclient.data.l[0] == DndLink))
1016	{	1069	{
1017	/* Get Dnd data */	1070	/* Get Dnd data */
1018	Atom ActualType;	1071	Atom ActualType;
1019	int ActualFormat;	1072	int ActualFormat;
1020	unsigned char *data;	1073	unsigned char *data;
1021	unsigned long Size, RemainingBytes;	1074	unsigned long Size, RemainingBytes;
1022		1075
1023	XGetWindowProperty (display->display, display->root,	1076	XGetWindowProperty (display->display, display->root,
1024	xa[XA_DNDSELECTION],	1077	xa[XA_DNDSELECTION],
1025	0L, 1000000L,	1078	0L, 1000000L,
1026	False, AnyPropertyType,	1079	False, AnyPropertyType,
…		…
1029	&data);	1082	&data);
1030	XChangeProperty (display->display, display->root,	1083	XChangeProperty (display->display, display->root,
1031	XA_CUT_BUFFER0, XA_STRING,	1084	XA_CUT_BUFFER0, XA_STRING,
1032	8, PropModeReplace,	1085	8, PropModeReplace,
1033	data, STRLEN (data));	1086	data, STRLEN (data));
		1087	XFree (data);
1034	selection_paste (display->root, XA_CUT_BUFFER0, True);	1088	selection_paste (display->root, XA_CUT_BUFFER0, True);
1035	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1089	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036	}	1090	}
1037	#endif /* OFFIX_DND */	1091	#endif /* OFFIX_DND */
1038	break;	1092	break;
1039		1093
1040	case MappingNotify:	1094	case MappingNotify:
1041	XRefreshKeyboardMapping (& (ev.xmapping));	1095	XRefreshKeyboardMapping (&ev.xmapping);
1042	break;	1096	break;
1043		1097
1044	/*	1098	/*
1045	* XXX: this is not the _current_ arrangement	1099	* XXX: this is not the _current_ arrangement
1046	* Here's my conclusion:	1100	* Here's my conclusion:
…		…
1077	#endif	1131	#endif
1078	#ifdef CURSOR_BLINK	1132	#ifdef CURSOR_BLINK
1079	if (Options & Opt_cursorBlink)	1133	if (Options & Opt_cursorBlink)
1080	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1134	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081	#endif	1135	#endif
		1136	#ifdef OFF_FOCUS_FADING
		1137	if (rs[Rs_fade])
		1138	{
		1139	PixColors = PixColorsFocused;
		1140	set_colorfgbg ();
		1141	scr_clear ();
		1142	scr_touch (true);
		1143	}
		1144	#endif
1082		1145
1083	}	1146	}
1084	break;	1147	break;
1085		1148
1086	case FocusOut:	1149	case FocusOut:
…		…
1095	#ifdef CURSOR_BLINK	1158	#ifdef CURSOR_BLINK
1096	if (Options & Opt_cursorBlink)	1159	if (Options & Opt_cursorBlink)
1097	cursor_blink_ev.stop ();	1160	cursor_blink_ev.stop ();
1098	hidden_cursor = 0;	1161	hidden_cursor = 0;
1099	#endif	1162	#endif
		1163	#ifdef OFF_FOCUS_FADING
		1164	if (rs[Rs_fade])
		1165	{
		1166	PixColors = PixColorsUnFocused;
		1167	set_colorfgbg ();
		1168	scr_clear ();
		1169	scr_touch (true);
		1170	}
		1171	#endif
1100		1172
1101	}	1173	}
1102	break;	1174	break;
1103		1175
1104	case ConfigureNotify:	1176	case ConfigureNotify:
…		…
1113	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1185	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114	}	1186	}
1115	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1187	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116		1188
1117	if (szHint.width != width \|\| szHint.height != height)	1189	if (szHint.width != width \|\| szHint.height != height)
1118	{
1119	D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120	resize_all_windows (width, height, 1);	1190	resize_all_windows (width, height, 1);
1121	}	1191
1122	#ifdef DEBUG_SIZE
1123	else
1124	{
1125	D_SIZE ((stderr, "Size: Not resizing"));
1126	}
1127	#endif
1128	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1192	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129	if (Options & Opt_transparent)	1193	if (Options & Opt_transparent)
1130	{	1194	{
1131	check_our_parents ();	1195	check_our_parents ();
1132	if (am_transparent)	1196	if (am_transparent)
…		…
1172		1236
1173	case GraphicsExpose:	1237	case GraphicsExpose:
1174	case Expose:	1238	case Expose:
1175	if (ev.xany.window == TermWin.vt)	1239	if (ev.xany.window == TermWin.vt)
1176	{	1240	{
1177	#ifdef NO_SLOW_LINK_SUPPORT	1241	do
1178	scr_expose (ev.xexpose.x, ev.xexpose.y,	1242	scr_expose (ev.xexpose.x, ev.xexpose.y,
1179	ev.xexpose.width, ev.xexpose.height, False);	1243	ev.xexpose.width, ev.xexpose.height, False);
1180	#else	1244	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1181	// don't understand this, so commented it out	1245
		1246	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
		1247
		1248	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1182	scr_expose (ev.xexpose.x, ev.xexpose.y,	1249	scr_expose (ev.xexpose.x, ev.xexpose.y,
1183	ev.xexpose.width, ev.xexpose.height, False);	1250	ev.xexpose.width, ev.xexpose.height, False);
1184	//scr_expose (ev.xexpose.x, 0,	1251
1185	// ev.xexpose.width, TermWin.height, False);	1252	scr_refresh (refresh_type);
1186	#endif
1187	want_refresh = 1;
1188	}	1253	}
1189	else	1254	else
1190	{	1255	{
1191	XEvent unused_event;	1256	XEvent unused_event;
1192		1257
1193	while (XCheckTypedWindowEvent (display->display, ev.xany.window,	1258	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1194	Expose,	1259	;
1195	&unused_event)) ;
1196	while (XCheckTypedWindowEvent (display->display, ev.xany.window,	1260	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1197	GraphicsExpose,	1261	;
1198	&unused_event)) ;	1262
1199	if (isScrollbarWindow (ev.xany.window))	1263	if (isScrollbarWindow (ev.xany.window))
1200	{	1264	{
1201	scrollBar.setIdle ();	1265	scrollBar.setIdle ();
1202	scrollbar_show (0);	1266	scrollbar_show (0);
1203	}	1267	}
1204	#ifdef MENUBAR	1268	#ifdef MENUBAR
1205	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1269	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206	menubar_expose ();	1270	menubar_expose ();
		1271	#endif
		1272
		1273	#ifdef TRANSPARENT
		1274	if (am_transparent && ev.xany.window == TermWin.parent[0])
		1275	XClearWindow (display->display, ev.xany.window);
1207	#endif	1276	#endif
1208	}	1277	}
1209	break;	1278	break;
1210		1279
1211	case MotionNotify:	1280	case MotionNotify:
…		…
1246	if (ev.xbutton.y < TermWin.int_bwidth	1315	if (ev.xbutton.y < TermWin.int_bwidth
1247	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1316	\|\| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248	{	1317	{
1249	int dist;	1318	int dist;
1250		1319
1251	pending_scroll_selection=1;
1252
1253	/* don't clobber the current delay if we are	1320	/* don't clobber the current delay if we are
1254	* already in the middle of scrolling.	1321	* already in the middle of scrolling.
1255	*/	1322	*/
1256	if (scroll_selection_delay<=0)	1323	if (!sel_scroll_ev.active)
1257	scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;	1324	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258		1325
1259	/* save the event params so we can highlight	1326	/* save the event params so we can highlight
1260	* the selection in the pending-scroll loop	1327	* the selection in the pending-scroll loop
1261	*/	1328	*/
1262	selection_save_x=ev.xbutton.x;	1329	selection_save_x=ev.xbutton.x;
…		…
1284	else	1351	else
1285	{	1352	{
1286	/* we are within the text window, so we	1353	/* we are within the text window, so we
1287	* shouldn't be scrolling	1354	* shouldn't be scrolling
1288	*/	1355	*/
1289	pending_scroll_selection = 0;	1356	if (sel_scroll_ev.active)
		1357	sel_scroll_ev.stop();
1290	}	1358	}
1291	#endif	1359	#endif
1292	#ifdef MOUSE_THRESHOLD	1360	#ifdef MOUSE_THRESHOLD
1293		1361
1294	}	1362	}
…		…
1511	upordown = 1; /* down */	1579	upordown = 1; /* down */
1512	}	1580	}
1513	if (upordown)	1581	if (upordown)
1514	{	1582	{
1515	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1583	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516	scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;	1584	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517	#endif	1585	#endif
1518	if (scr_page (upordown < 0 ? UP : DN, 1))	1586	if (scr_page (upordown < 0 ? UP : DN, 1))
1519	{	1587	{
1520	if (upordown < 0)	1588	if (upordown < 0)
1521	scrollBar.setUp ();	1589	scrollBar.setUp ();
…		…
1608	refresh_type &= ~SMOOTH_REFRESH;	1676	refresh_type &= ~SMOOTH_REFRESH;
1609	#endif	1677	#endif
1610		1678
1611	}	1679	}
1612	#ifdef SELECTION_SCROLLING	1680	#ifdef SELECTION_SCROLLING
1613	pending_scroll_selection=0;	1681	if (sel_scroll_ev.active)
		1682	sel_scroll_ev.stop();
1614	#endif	1683	#endif
1615	if (ev.window == TermWin.vt)	1684	if (ev.window == TermWin.vt)
1616	{	1685	{
1617	if (reportmode)	1686	if (reportmode)
1618	{	1687	{
…		…
1660	case Button5:	1729	case Button5:
1661	{	1730	{
1662	int i;	1731	int i;
1663	page_dirn v;	1732	page_dirn v;
1664		1733
1665	v = (ev.button == Button4) ? UP : DN;	1734	v = ev.button == Button4 ? UP : DN;
		1735
1666	if (ev.state & ShiftMask)	1736	if (ev.state & ShiftMask)
1667	i = 1;	1737	i = 1;
1668	else if ((Options & Opt_mouseWheelScrollPage))	1738	else if (Options & Opt_mouseWheelScrollPage)
1669	i = TermWin.nrow - 1;	1739	i = TermWin.nrow - 1;
1670	else	1740	else
1671	i = 5;	1741	i = 5;
		1742
1672	# ifdef MOUSE_SLIP_WHEELING	1743	# ifdef MOUSE_SLIP_WHEELING
1673	if (ev.state & ControlMask)	1744	if (ev.state & ControlMask)
1674	{	1745	{
1675	mouse_slip_wheel_speed += (v ? -1 : 1);	1746	mouse_slip_wheel_speed += v ? -1 : 1;
		1747	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
		1748	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
		1749
		1750	if (slip_wheel_ev.at < NOW)
1676	mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;	1751	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
		1752
		1753	slip_wheel_ev.start ();
1677	}	1754	}
		1755	else
		1756	{
1678	# endif	1757	# endif
1679	# ifdef JUMP_MOUSE_WHEEL	1758	# ifdef JUMP_MOUSE_WHEEL
1680	scr_page (v, i);
1681	scr_refresh (SMOOTH_REFRESH);
1682	scrollbar_show (1);
1683	# else
1684	while (i--)
1685	{
1686	scr_page (v, 1);	1759	scr_page (v, i);
1687	scr_refresh (SMOOTH_REFRESH);	1760	scr_refresh (SMOOTH_REFRESH);
1688	scrollbar_show (1);	1761	scrollbar_show (1);
		1762	# else
		1763	while (i--)
		1764	{
		1765	scr_page (v, 1);
		1766	scr_refresh (SMOOTH_REFRESH);
		1767	scrollbar_show (1);
		1768	}
		1769	# endif
		1770	# ifdef MOUSE_SLIP_WHEELING
1689	}	1771	}
1690	# endif	1772	#endif
1691
1692	}	1773	}
1693	break;	1774	break;
1694	#endif	1775	#endif
1695
1696	}	1776	}
1697	}	1777	}
1698	#ifdef MENUBAR	1778	#ifdef MENUBAR
1699	else if (isMenuBarWindow (ev.window))	1779	else if (isMenuBarWindow (ev.window))
1700	menubar_control (ev);	1780	menubar_control (ev);
1701	#endif	1781	#endif
1702	}	1782	}
1703		1783
1704	#ifdef TRANSPARENT	1784	#ifdef TRANSPARENT
1705	#if TINTING	1785	#if TINTING
1706	/* shading taken from eterm-0.9.2 */	1786	/* taken from aterm-0.4.2 */
1707	/* RGB 15 */
1708		1787
1709	static void	1788	typedef uint32_t RUINT32T;
1710	shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711	{
1712	unsigned char *ptr;
1713	int x, y;
1714		1789
1715	ptr = (unsigned char )data + (w sizeof(uint16_t));	1790	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)
1716	if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {	1791	{
1717	/* No saturation */	1792	int sh_r, sh_g, sh_b;
1718	for (y = h; --y >= 0;) {	1793	RUINT32T mask_r, mask_g, mask_b;
1719	for (x = -w; x < 0; x++) {	1794	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
1720	int r, g, b;	1795	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
		1796	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
		1797	int i;
1721		1798
1722	b = ((uint16_t *) ptr)[x];	1799	Visual* visual = display->visual;
1723	r = (b & 0x7c00) * rm;	1800
1724	g = (b & 0x3e0) * gm;	1801	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
1725	b = (b & 0x1f) * bm;	1802
1726	((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)	1803	/* for convenience */
1727	\| ((g >> 8) & 0x3e0)	1804	mask_r = visual->red_mask;
1728	\| ((b >> 8) & 0x1f);	1805	mask_g = visual->green_mask;
1729	}	1806	mask_b = visual->blue_mask;
1730	ptr += bpl;	1807
1731	}	1808	/* boring lookup table pre-initialization */
		1809	switch (srcImage->bits_per_pixel) {
		1810	case 15:
		1811	if ((mask_r != 0x7c00) \|\|
		1812	(mask_g != 0x03e0) \|\|
		1813	(mask_b != 0x001f))
		1814	return;
		1815	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));
		1816	lookup_r = lookup;
		1817	lookup_g = lookup+32;
		1818	lookup_b = lookup+32+32;
		1819	sh_r = 10;
		1820	sh_g = 5;
		1821	sh_b = 0;
		1822	break;
		1823	case 16:
		1824	if ((mask_r != 0xf800) \|\|
		1825	(mask_g != 0x07e0) \|\|
		1826	(mask_b != 0x001f))
		1827	return;
		1828	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));
		1829	lookup_r = lookup;
		1830	lookup_g = lookup+32;
		1831	lookup_b = lookup+32+64;
		1832	sh_r = 11;
		1833	sh_g = 5;
		1834	sh_b = 0;
		1835	break;
		1836	case 24:
		1837	if ((mask_r != 0xff0000) \|\|
		1838	(mask_g != 0x00ff00) \|\|
		1839	(mask_b != 0x0000ff))
		1840	return;
		1841	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));
		1842	lookup_r = lookup;
		1843	lookup_g = lookup+256;
		1844	lookup_b = lookup+256+256;
		1845	sh_r = 16;
		1846	sh_g = 8;
		1847	sh_b = 0;
		1848	break;
		1849	case 32:
		1850	if ((mask_r != 0xff0000) \|\|
		1851	(mask_g != 0x00ff00) \|\|
		1852	(mask_b != 0x0000ff))
		1853	return;
		1854	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));
		1855	lookup_r = lookup;
		1856	lookup_g = lookup+256;
		1857	lookup_b = lookup+256+256;
		1858	sh_r = 16;
		1859	sh_g = 8;
		1860	sh_b = 0;
		1861	break;
		1862	default:
		1863	return; /* we do not support this color depth */
		1864	}
		1865
		1866	/* prepare limits for color transformation (each channel is handled separately) */
		1867	if (shade < 0) {
		1868	shade = -shade;
		1869	if (shade < 0) shade = 0;
		1870	if (shade > 100) shade = 100;
		1871
		1872	lower_lim_r = 65535-rm;
		1873	lower_lim_g = 65535-gm;
		1874	lower_lim_b = 65535-bm;
		1875
		1876	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
		1877	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
		1878	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
		1879
		1880	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732	} else {	1881	} else {
1733	for (y = h; --y >= 0;) {	1882	if (shade < 0) shade = 0;
1734	for (x = -w; x < 0; x++) {	1883	if (shade > 100) shade = 100;
1735	int r, g, b;
1736		1884
1737	b = ((uint16_t *) ptr)[x];	1885	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738	r = (b & 0x7c00) * rm;	1886
1739	g = (b & 0x3e0) * gm;	1887	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740	b = (b & 0x1f) * bm;	1888	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741	r \|= (!(r >> 15) - 1);	1889	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742	g \|= (!(g >> 10) - 1);	1890	}
1743	b \|= (!(b >> 5) - 1);	1891
1744	((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)	1892	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745	\| ((g >> 8) & 0x3e0)	1893	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746	\| ((b >> 8) & 0x1f);	1894	{
1747	}	1895	unsigned int tmp;
1748	ptr += bpl;	1896
		1897	tmp = lower_lim_r;
		1898	lower_lim_r = lower_lim_b;
		1899	lower_lim_b = tmp;
		1900
		1901	tmp = upper_lim_r;
		1902	upper_lim_r = upper_lim_b;
		1903	upper_lim_b = tmp;
		1904	}
		1905
		1906	/* fill our lookup tables */
		1907	for (i = 0; i <= mask_r>>sh_r; i++)
		1908	{
		1909	RUINT32T tmp;
		1910	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
		1911	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
		1912	lookup_r[i] = (tmp/65535)<<sh_r;
		1913	}
		1914	for (i = 0; i <= mask_g>>sh_g; i++)
		1915	{
		1916	RUINT32T tmp;
		1917	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
		1918	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
		1919	lookup_g[i] = (tmp/65535)<<sh_g;
		1920	}
		1921	for (i = 0; i <= mask_b>>sh_b; i++)
		1922	{
		1923	RUINT32T tmp;
		1924	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
		1925	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
		1926	lookup_b[i] = (tmp/65535)<<sh_b;
		1927	}
		1928
		1929	/* apply table to input image (replacing colors by newly calculated ones) */
		1930	switch (srcImage->bits_per_pixel)
		1931	{
		1932	case 15:
		1933	{
		1934	unsigned short p1, pf, p, pl;
		1935	p1 = (unsigned short *) srcImage->data;
		1936	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
		1937	while (p1 < pf)
		1938	{
		1939	p = p1;
		1940	pl = p1 + srcImage->width;
		1941	for (; p < pl; p++)
1749	}	1942	{
		1943	p = lookup_r[(p & 0x7c00)>>10] \|
		1944	lookup_g[(*p & 0x03e0)>> 5] \|
		1945	lookup_b[(*p & 0x001f)];
		1946	}
		1947	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
1750	}	1948	}
1751	}	1949	break;
1752		1950	}
1753	/* RGB 16 */	1951	case 16:
1754	static void	1952	{
1755	shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)	1953	unsigned short p1, pf, p, pl;
1756	{	1954	p1 = (unsigned short *) srcImage->data;
1757	unsigned char *ptr;	1955	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1758	int x, y;	1956	while (p1 < pf)
1759		1957	{
1760	ptr = (unsigned char )data + (w sizeof(uint16_t));	1958	p = p1;
1761	if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {	1959	pl = p1 + srcImage->width;
1762	/* No saturation */	1960	for (; p < pl; p++)
1763	for (y = h; --y >= 0;) {
1764	for (x = -w; x < 0; x++) {
1765	int r, g, b;
1766
1767	b = ((uint16_t *) ptr)[x];
1768	r = (b & 0xf800) * rm;
1769	g = (b & 0x7e0) * gm;
1770	b = (b & 0x1f) * bm;
1771	((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772	\| ((g >> 8) & 0x7e0)
1773	\| ((b >> 8) & 0x1f);
1774	}
1775	ptr += bpl;
1776	}	1961	{
1777	} else {	1962	p = lookup_r[(p & 0xf800)>>11] \|
1778	for (y = h; --y >= 0;) {	1963	lookup_g[(*p & 0x07e0)>> 5] \|
1779	for (x = -w; x < 0; x++) {	1964	lookup_b[(*p & 0x001f)];
1780	int r, g, b;
1781
1782	b = ((uint16_t *) ptr)[x];
1783	r = (b & 0xf800) * rm;
1784	g = (b & 0x7e0) * gm;
1785	b = (b & 0x1f) * bm;
1786	r \|= (!(r >> 16) - 1);
1787	g \|= (!(g >> 11) - 1);
1788	b \|= (!(b >> 5) - 1);
1789	((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790	\| ((g >> 8) & 0x7e0)
1791	\| ((b >> 8) & 0x1f);
1792	}	1965	}
1793	ptr += bpl;	1966	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
		1967	}
		1968	break;
		1969	}
		1970	case 24:
		1971	{
		1972	unsigned char p1, pf, p, pl;
		1973	p1 = (unsigned char *) srcImage->data;
		1974	pf = (unsigned char ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
		1975	while (p1 < pf)
		1976	{
		1977	p = p1;
		1978	pl = p1 + srcImage->width * 3;
		1979	for (; p < pl; p += 3)
1794	}	1980	{
		1981	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
		1982	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
		1983	p[2] = lookup_r[(p[2] & 0x0000ff)];
		1984	}
		1985	p1 = (unsigned char ) ((char ) p1 + srcImage->bytes_per_line);
1795	}	1986	}
1796	}	1987	break;
		1988	}
		1989	case 32:
		1990	{
		1991	RUINT32T p1, pf, p, pl;
		1992	p1 = (RUINT32T *) srcImage->data;
		1993	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1797		1994
1798	/* RGB 24 */	1995	while (p1 < pf)
1799	static void	1996	{
1800	shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)	1997	p = p1;
1801	{	1998	pl = p1 + srcImage->width;
1802	unsigned char *ptr;	1999	for (; p < pl; p++)
1803	int x, y;
1804
1805	ptr = (unsigned char )data + (w 3);
1806	if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807	/* No saturation */
1808	for (y = h; --y >= 0;) {
1809	for (x = -(w * 3); x < 0; x += 3) {
1810	int r, g, b;
1811
1812	if (byteorder.big_endian()) {
1813	r = (ptr[x + 0] * rm) >> 8;
1814	g = (ptr[x + 1] * gm) >> 8;
1815	b = (ptr[x + 2] * bm) >> 8;
1816	ptr[x + 0] = r;
1817	ptr[x + 1] = g;
1818	ptr[x + 2] = b;
1819	} else {
1820	r = (ptr[x + 2] * rm) >> 8;
1821	g = (ptr[x + 1] * gm) >> 8;
1822	b = (ptr[x + 0] * bm) >> 8;
1823	ptr[x + 2] = r;
1824	ptr[x + 1] = g;
1825	ptr[x + 0] = b;
1826	}
1827	}
1828	ptr += bpl;
1829	}	2000	{
1830	} else {	2001	p = lookup_r[(p & 0xff0000)>>16] \|
1831	for (y = h; --y >= 0;) {	2002	lookup_g[(*p & 0x00ff00)>> 8] \|
1832	for (x = -(w * 3); x < 0; x += 3) {	2003	lookup_b[(*p & 0x0000ff)] \|
1833	int r, g, b;	2004	(*p & ~0xffffff);
1834
1835	if (byteorder.big_endian()) {
1836	r = (ptr[x + 0] * rm) >> 8;
1837	g = (ptr[x + 1] * gm) >> 8;
1838	b = (ptr[x + 2] * bm) >> 8;
1839
1840	r \|= (!(r >> 8) - 1);
1841	g \|= (!(g >> 8) - 1);
1842	b \|= (!(b >> 8) - 1);
1843
1844	ptr[x + 0] = r;
1845	ptr[x + 1] = g;
1846	ptr[x + 2] = b;
1847	} else {
1848	r = (ptr[x + 2] * rm) >> 8;
1849	g = (ptr[x + 1] * gm) >> 8;
1850	b = (ptr[x + 0] * bm) >> 8;
1851
1852	r \|= (!(r >> 8) - 1);
1853	g \|= (!(g >> 8) - 1);
1854	b \|= (!(b >> 8) - 1);
1855
1856	ptr[x + 2] = r;
1857	ptr[x + 1] = g;
1858	ptr[x + 0] = b;
1859	}
1860	}	2005	}
1861	ptr += bpl;	2006	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);
1862	}	2007	}
		2008	break;
		2009	}
1863	}	2010	}
1864	}
1865		2011
1866	/* RGB 32 */	2012	free (lookup);
1867	static void
1868	shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869	{
1870	unsigned char *ptr;
1871	int x, y;
1872
1873	ptr = (unsigned char )data + (w 4);
1874	if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875	/* No saturation */
1876	for (y = h; --y >= 0;) {
1877	if (byteorder.big_endian()) {
1878	for (x = -(w * 4); x < 0; x += 4) {
1879	int r, g, b;
1880
1881	r = (ptr[x + 1] * rm) >> 8;
1882	g = (ptr[x + 2] * gm) >> 8;
1883	b = (ptr[x + 3] * bm) >> 8;
1884	ptr[x + 1] = r;
1885	ptr[x + 2] = g;
1886	ptr[x + 3] = b;
1887	}
1888	} else {
1889	for (x = -(w * 4); x < 0; x += 4) {
1890	int r, g, b;
1891
1892	r = (ptr[x + 2] * rm) >> 8;
1893	g = (ptr[x + 1] * gm) >> 8;
1894	b = (ptr[x + 0] * bm) >> 8;
1895	ptr[x + 2] = r;
1896	ptr[x + 1] = g;
1897	ptr[x + 0] = b;
1898	}
1899	}
1900	ptr += bpl;
1901	}
1902	} else {
1903	for (y = h; --y >= 0;) {
1904	for (x = -(w * 4); x < 0; x += 4) {
1905	int r, g, b;
1906
1907	if (byteorder.big_endian()) {
1908	r = (ptr[x + 1] * rm) >> 8;
1909	g = (ptr[x + 2] * gm) >> 8;
1910	b = (ptr[x + 3] * bm) >> 8;
1911
1912	r \|= (!(r >> 8) - 1);
1913	g \|= (!(g >> 8) - 1);
1914	b \|= (!(b >> 8) - 1);
1915
1916	ptr[x + 1] = r;
1917	ptr[x + 2] = g;
1918	ptr[x + 3] = b;
1919	} else {
1920	r = (ptr[x + 2] * rm) >> 8;
1921	g = (ptr[x + 1] * gm) >> 8;
1922	b = (ptr[x + 0] * bm) >> 8;
1923
1924	r \|= (!(r >> 8) - 1);
1925	g \|= (!(g >> 8) - 1);
1926	b \|= (!(b >> 8) - 1);
1927
1928	ptr[x + 2] = r;
1929	ptr[x + 1] = g;
1930	ptr[x + 0] = b;
1931	}
1932	}
1933	ptr += bpl;
1934	}
1935	}
1936	}	2013	}
1937
1938	#endif	2014	#endif
1939		2015
1940	/*	2016	/*
1941	* Check our parents are still who we think they are.	2017	* Check our parents are still who we think they are.
1942	* Do transparency updates if required	2018	* Do transparency updates if required
…		…
1965	if (rootdepth != wattr.depth)	2041	if (rootdepth != wattr.depth)
1966	{	2042	{
1967	if (am_transparent)	2043	if (am_transparent)
1968	{	2044	{
1969	pchanged = 1;	2045	pchanged = 1;
1970	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);	2046	XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1971	am_transparent = am_pixmap_trans = 0;	2047	am_transparent = am_pixmap_trans = 0;
1972	}	2048	}
1973		2049
1974	return pchanged; /* Don't try any more */	2050	return pchanged; /* Don't try any more */
1975	}	2051	}
…		…
1991	i = (xa[XA_XSETROOTID]	2067	i = (xa[XA_XSETROOTID]
1992	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2068	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2069	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994	&nitems, &bytes_after, &prop) == Success);	2070	&nitems, &bytes_after, &prop) == Success);
1995		2071
1996	if (!i \|\| prop == NULL)	2072	if (!i \|\| prop == NULL
		2073	#if TINTING
		2074	\|\| !rs[Rs_color + Color_tint]
		2075	#endif
		2076	)
1997	have_pixmap = 0;	2077	have_pixmap = 0;
1998	else	2078	else
1999	{	2079	{
2000	have_pixmap = 1;	2080	have_pixmap = 1;
2001	rootpixmap = * ((Pixmap *)prop);	2081	rootpixmap = (Pixmap )prop;
2002	XFree (prop);	2082	XFree (prop);
2003	}	2083	}
2004		2084
2005	if (have_pixmap)	2085	if (have_pixmap)
2006	{	2086	{
…		…
2063	XFreePixmap (display->display, TermWin.pixmap);	2143	XFreePixmap (display->display, TermWin.pixmap);
2064		2144
2065	#if TINTING	2145	#if TINTING
2066	if (ISSET_PIXCOLOR (Color_tint))	2146	if (ISSET_PIXCOLOR (Color_tint))
2067	{	2147	{
2068	unsigned short shade, rm, gm, bm;	2148	unsigned short rm, gm, bm;
		2149	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069		2150
2070	PixColors[Color_tint].get (display, rm, gm, bm);	2151	PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2071		2152
2072	rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...	2153	ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074	/* Determine bitshift and bitmask values */
2075	switch (image->bits_per_pixel)
2076	{
2077	case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078	case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079	case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080	case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081	}
2082	}	2154	}
2083	#endif	2155	#endif
2084		2156
2085	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2157	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086	szHint.width, szHint.height, image->depth);	2158	szHint.width, szHint.height, image->depth);
2087	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2159	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2160	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089	nx, ny, image->width, image->height);	2161	nx, ny, image->width, image->height);
2090	XFreeGC (display->display, gc);	2162	XFreeGC (display->display, gc);
2091	XDestroyImage (image);	2163	XDestroyImage (image);
2092	XSetWindowBackgroundPixmap (display->display, TermWin.vt,	2164	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2093	TermWin.pixmap);	2165	XClearWindow (display->display, TermWin.parent[0]);
2094		2166
2095	if (!am_transparent \|\| !am_pixmap_trans)	2167	if (!am_transparent \|\| !am_pixmap_trans)
2096	pchanged = 1;	2168	pchanged = 1;
2097		2169
2098	am_transparent = am_pixmap_trans = 1;	2170	am_transparent = am_pixmap_trans = 1;
…		…
2143	}	2215	}
2144		2216
2145	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2217	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146	{	2218	{
2147	D_X ((stderr, "InheritPixmap Turning off"));	2219	D_X ((stderr, "InheritPixmap Turning off"));
2148	XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);	2220	XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2149	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);	2221	XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2150	am_transparent = 0;	2222	am_transparent = 0;
2151	/* XXX: also turn off Opt_transparent? */	2223	/* XXX: also turn off Opt_transparent? */
2152	}	2224	}
2153	else	2225	else
2154	{	2226	{
…		…
2157	* needed for fvwm2.2.2 (and before?) */	2229	* needed for fvwm2.2.2 (and before?) */
2158	sleep (1);	2230	sleep (1);
2159	#endif	2231	#endif
2160	D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));	2232	D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161	for (n = 0; n < (unsigned int)i; n++)	2233	for (n = 0; n < (unsigned int)i; n++)
		2234	{
2162	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2235	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
		2236	XClearWindow (display->display, TermWin.parent[n]);
		2237	}
2163		2238
2164	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2239	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165	am_transparent = 1;	2240	am_transparent = 1;
2166	}	2241	}
2167		2242
2168	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2243	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169	TermWin.parent[i] = None;	2244	TermWin.parent[i] = None;
		2245	}
		2246
		2247	// this is experimental
		2248	if (scrollBar.win)
		2249	{
		2250	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
		2251	XClearWindow (display->display, scrollBar.win);
		2252	scrollBar.setIdle ();
		2253	scrollbar_show (0);
2170	}	2254	}
2171		2255
2172	return pchanged;	2256	return pchanged;
2173	}	2257	}
2174	#endif	2258	#endif
…		…
2191	}	2275	}
2192		2276
2193	if (ch == NOCHAR) // TODO: improve	2277	if (ch == NOCHAR) // TODO: improve
2194	break;	2278	break;
2195		2279
2196	if (!IS_CONTROL (ch) \|\| ch == '\t' \|\| ch == '\n' \|\| ch == '\r')	2280	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)
2197	{	2281	{
2198	/* Read a text string from the input buffer */	2282	/* Read a text string from the input buffer */
2199	unicode_t buf[UBUFSIZ];	2283	unicode_t buf[UBUFSIZ];
2200	bool refreshnow = false;	2284	bool refreshnow = false;
2201	int nlines = 0;	2285	int nlines = 0;
…		…
2206	for (;;)	2290	for (;;)
2207	{	2291	{
2208	seq_begin = cmdbuf_ptr;	2292	seq_begin = cmdbuf_ptr;
2209	ch = next_char ();	2293	ch = next_char ();
2210		2294
2211	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))	2295	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212	break;	2296	break;
2213		2297
2214	*str++ = ch;	2298	*str++ = ch;
2215		2299
2216	if (ch == '\n')	2300	if (ch == C0_LF)
2217	{	2301	{
2218	nlines++;	2302	nlines++;
2219	refresh_count++;	2303	refresh_count++;
2220		2304
2221	if (! (Options & Opt_jumpScroll)	2305	if (! (Options & Opt_jumpScroll)
2222	\|\| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))	2306	\|\| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223	{	2307	{
2224	refreshnow = true;	2308	refreshnow = true;
2225	flag = true;
2226	ch = NOCHAR;	2309	ch = NOCHAR;
2227	break;	2310	break;
2228	}	2311	}
2229		2312
2230	// scr_add_lines only works for nlines < TermWin.nrow - 1.	2313	// scr_add_lines only works for nlines < TermWin.nrow - 1.
…		…
2248	/*	2331	/*
2249	* If there have been a lot of new lines, then update the screen	2332	* If there have been a lot of new lines, then update the screen
2250	* What the heck I'll cheat and only refresh less than every page-full.	2333	* What the heck I'll cheat and only refresh less than every page-full.
2251	* the number of pages between refreshes is refresh_limit, which	2334	* the number of pages between refreshes is refresh_limit, which
2252	* is incremented here because we must be doing flat-out scrolling.	2335	* is incremented here because we must be doing flat-out scrolling.
2253	*
2254	* refreshing should be correct for small scrolls, because of the
2255	* time-out
2256	*/	2336	*/
2257	if (refreshnow)	2337	if (refreshnow)
2258	{	2338	{
2259	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2339	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260	refresh_limit++;	2340	refresh_limit++;
2261		2341	else
		2342	{
		2343	flag = true;
2262	scr_refresh (refresh_type);	2344	scr_refresh (refresh_type);
		2345	}
2263	}	2346	}
2264		2347
2265	}	2348	}
2266	else	2349	else
2267	{	2350	{
…		…
2281	}	2364	}
2282		2365
2283	return flag;	2366	return flag;
2284	}	2367	}
2285		2368
		2369	// read the next octet
		2370	unicode_t
		2371	rxvt_term::next_octet ()
		2372	{
		2373	return cmdbuf_ptr < cmdbuf_endp
		2374	? *cmdbuf_ptr++
		2375	: NOCHAR;
		2376	}
		2377
2286	// read the next character	2378	// read the next character
2287	unicode_t	2379	unicode_t
2288	rxvt_term::next_char ()	2380	rxvt_term::next_char ()
2289	{	2381	{
2290	while (cmdbuf_ptr < cmdbuf_endp)	2382	while (cmdbuf_ptr < cmdbuf_endp)
…		…
2321	*/	2413	*/
2322	unicode_t	2414	unicode_t
2323	rxvt_term::cmd_getc ()	2415	rxvt_term::cmd_getc ()
2324	{	2416	{
2325	unicode_t c = next_char ();	2417	unicode_t c = next_char ();
		2418
		2419	if (c == NOCHAR)
		2420	throw out_of_input;
		2421
		2422	return c;
		2423	}
		2424
		2425	unicode_t
		2426	rxvt_term::cmd_get8 ()
		2427	{
		2428	unicode_t c = next_octet ();
2326		2429
2327	if (c == NOCHAR)	2430	if (c == NOCHAR)
2328	throw out_of_input;	2431	throw out_of_input;
2329		2432
2330	return c;	2433	return c;
…		…
2460	break;	2563	break;
2461	case C0_SI: /* shift in - acs */	2564	case C0_SI: /* shift in - acs */
2462	scr_charset_choose (0);	2565	scr_charset_choose (0);
2463	break;	2566	break;
2464		2567
		2568	#ifdef EIGHT_BIT_CONTROLS
2465	// 8-bit controls	2569	// 8-bit controls
2466	case 0x90: /* DCS */	2570	case 0x90: /* DCS */
2467	process_dcs_seq ();	2571	process_dcs_seq ();
2468	break;	2572	break;
2469	case 0x9b: /* CSI */	2573	case 0x9b: /* CSI */
2470	process_csi_seq ();	2574	process_csi_seq ();
2471	break;	2575	break;
2472	case 0x9d: /* CSI */	2576	case 0x9d: /* CSI */
2473	process_osc_seq ();	2577	process_osc_seq ();
2474	break;	2578	break;
		2579	#endif
2475	}	2580	}
2476	}	2581	}
2477	/}}} /	2582	/}}} /
2478		2583
2479		2584
…		…
2597	break;	2702	break;
2598		2703
2599	/* 8.3.87: NEXT LINE */	2704	/* 8.3.87: NEXT LINE */
2600	case C1_NEL: /* ESC E */	2705	case C1_NEL: /* ESC E */
2601	{	2706	{
2602	unicode_t nlcr[] = { L'\n', L'\r' };	2707	unicode_t nlcr[] = { C0_LF, C0_CR };
2603	scr_add_lines (nlcr, 1, 2);	2708	scr_add_lines (nlcr, 1, 2);
2604	}	2709	}
2605	break;	2710	break;
2606		2711
2607	/* kidnapped escape sequence: Should be 8.3.48 */	2712	/* kidnapped escape sequence: Should be 8.3.48 */
…		…
2668		2773
2669	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2774	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2670	/* INDENT-OFF */	2775	/* INDENT-OFF */
2671	enum {	2776	enum {
2672	CSI_ICH = 0x40,	2777	CSI_ICH = 0x40,
2673	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2778	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2779	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2780	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676	CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,	2781	CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677	CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,	2782	CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2783	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
…		…
3092	#endif	3197	#endif
3093		3198
3094	/----------------------------------------------------------------------/	3199	/----------------------------------------------------------------------/
3095	/*	3200	/*
3096	* get input up until STRING TERMINATOR (or BEL)	3201	* get input up until STRING TERMINATOR (or BEL)
3097	* ends_how is terminator used. returned input must be free ()d	3202	* ends_how is terminator used. returned input must be free()'d
3098	*/	3203	*/
3099	unsigned char *	3204	unsigned char *
3100	rxvt_term::get_to_st (unicode_t &ends_how)	3205	rxvt_term::get_to_st (unicode_t &ends_how)
3101	{	3206	{
3102	int seen_esc = 0; /* seen escape? */	3207	unicode_t prev = 0, ch;
3103	unsigned int n = 0;	3208	unsigned int n = 0;
3104	unsigned char *s;	3209	unsigned char *s;
3105	unicode_t ch;
3106	unsigned char string[STRING_MAX];	3210	unsigned char string[STRING_MAX];
3107		3211
3108	while ((ch = cmd_getc ()))	3212	while ((ch = cmd_getc ()) != NOCHAR)
3109	{	3213	{
3110	if (ch == C0_BEL \|\| ch == CHAR_ST)	3214	if (prev == C0_ESC)
3111	break;	3215	{
3112
3113	if (seen_esc)
3114	if (ch == 0x5c) /* 7bit ST */	3216	if (ch == 0x5c) /* 7bit ST */
3115	break;	3217	break;
3116	else	3218	else
3117	return NULL;	3219	return NULL;
3118
3119	if (ch == C0_ESC)
3120	{	3220	}
3121	seen_esc = 1;	3221	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3122	continue;	3222	break;
3123	}	3223	else if (ch < 0x20)
3124	else if (ch == '\t')
3125	ch = ' '; /* translate '\t' to space */
3126	else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d))
3127	return NULL; /* other control character - exit */	3224	return NULL; /* other control character - exit */
3128		3225
3129	if (n >= sizeof (string) - 1)	3226	if (n >= sizeof (string) - 1)
3130	// stop at some sane length	3227	// stop at some sane length
3131	return NULL;	3228	return NULL;
3132		3229
		3230	if (ch == C0_SYN)
		3231	{
		3232	string[n++] = cmd_get8 ();
		3233	prev = 0;
		3234	}
		3235	else
3133	string[n++] = ch;	3236	string[n++] = prev = ch;
3134	seen_esc = 0;
3135	}	3237	}
3136		3238
3137	string[n++] = '\0';	3239	string[n++] = '\0';
3138		3240
3139	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)	3241	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
…		…
3196	if (str[0] == '?' && !str[1])	3298	if (str[0] == '?' && !str[1])
3197	{	3299	{
3198	if (Options & Opt_insecure)	3300	if (Options & Opt_insecure)
3199	{	3301	{
3200	unsigned short r, g, b;	3302	unsigned short r, g, b;
3201	PixColors[color].get (display, r, g, b);	3303	PixColorsFocused[color].get (display, r, g, b);
3202	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3304	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203	}	3305	}
3204	}	3306	}
3205	else	3307	else
3206	set_window_color (color, str);	3308	set_window_color (color, str);
…		…
3311	if (name[0] == '?' && !name[1])	3413	if (name[0] == '?' && !name[1])
3312	{	3414	{
3313	if (Options & Opt_insecure)	3415	if (Options & Opt_insecure)
3314	{	3416	{
3315	unsigned short r, g, b;	3417	unsigned short r, g, b;
3316	PixColors[color + minCOLOR].get (display, r, g, b);	3418	PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3317	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3419	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318	}	3420	}
3319	}	3421	}
3320	else	3422	else
3321	set_window_color (color + minCOLOR, name);	3423	set_window_color (color + minCOLOR, name);
…		…
3694	rendset = 0, rendstyle = ~RS_None;	3796	rendset = 0, rendstyle = ~RS_None;
3695	break;	3797	break;
3696	case 1:	3798	case 1:
3697	rendset = 1, rendstyle = RS_Bold;	3799	rendset = 1, rendstyle = RS_Bold;
3698	break;	3800	break;
		3801	//case 2: // faint or second colour
3699	case 4:	3802	case 4:
3700	rendset = 1, rendstyle = RS_Uline;	3803	rendset = 1, rendstyle = RS_Uline;
3701	break;	3804	break;
3702	case 5:	3805	case 5: // slowly blinking
		3806	case 6: // rapidly blinking
3703	rendset = 1, rendstyle = RS_Blink;	3807	rendset = 1, rendstyle = RS_Blink;
3704	break;	3808	break;
		3809	//case 6: // scoansi light background
3705	case 7:	3810	case 7:
3706	rendset = 1, rendstyle = RS_RVid;	3811	rendset = 1, rendstyle = RS_RVid;
3707	break;	3812	break;
3708	case 8:	3813	case 8:
3709	// invisible. NYI	3814	// invisible. NYI
3710	break;	3815	break;
		3816	//case 9: // crossed out
		3817	//case 10: // scoansi acs off, primary font
		3818	//case 11: // scoansi acs on, first alt font
		3819	//case 12: // scoansi acs on, \|0x80, second alt font
		3820	//...
		3821	//case 19: // ninth alt font
		3822	//case 20: // gothic
		3823	case 21: // disable bold, faint
		3824	rendset = 0, rendstyle = RS_Bold;
		3825	break;
3711	case 22:	3826	case 22:
3712	rendset = 0, rendstyle = RS_Bold;	3827	rendset = 0, rendstyle = RS_Bold;
3713	break;	3828	break;
		3829	//case 23: disable italic
3714	case 24:	3830	case 24:
3715	rendset = 0, rendstyle = RS_Uline;	3831	rendset = 0, rendstyle = RS_Uline;
3716	break;	3832	break;
3717	case 25:	3833	case 25:
3718	rendset = 0, rendstyle = RS_Blink;	3834	rendset = 0, rendstyle = RS_Blink;
3719	break;	3835	break;
3720	case 27:	3836	case 27:
3721	rendset = 0, rendstyle = RS_RVid;	3837	rendset = 0, rendstyle = RS_RVid;
3722	break;	3838	break;
3723	case 28:
3724	// visible. NYI	3839	//case 28: // visible. NYI
3725	break;	3840	//case 29: // not crossed-out
3726	}	3841	}
3727		3842
3728	if (rendset != -1)	3843	if (rendset != -1)
3729	{	3844	{
3730	scr_rendition (rendset, rendstyle);	3845	scr_rendition (rendset, rendstyle);
…		…
3807	}	3922	}
3808	}	3923	}
3809	}	3924	}
3810	/}}} /	3925	/}}} /
3811		3926
3812	/{{{ process Rob Nation's own graphics mode sequences /	3927	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3813	void	3928	void
3814	rxvt_term::process_graphics ()	3929	rxvt_term::process_graphics ()
3815	{	3930	{
3816	unicode_t ch, cmd = cmd_getc ();	3931	unicode_t ch, cmd = cmd_getc ();
3817		3932

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs. Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC