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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.317 by root, Sat Jan 13 15:06:54 2007 UTC vs.
Revision 1.330 by root, Mon Jun 18 12:53:25 2007 UTC

…		…
500	# if ISO_14755	500	# if ISO_14755
501	iso14755_51 (0);	501	iso14755_51 (0);
502	# endif	502	# endif
503	return;	503	return;
504	}	504	}
		505	else if (keysym == XK_BackSpace)
		506	{
		507	iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) \| ISO_14755_51;
		508	# if ISO_14755
		509	iso14755_51 (iso14755buf & ISO_14755_MASK);
		510	# endif
		511	return;
		512	}
505	else if ((hv = hex_keyval (ev)) >= 0)	513	else if ((hv = hex_keyval (ev)) >= 0)
506	{	514	{
507	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)	515	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508	\| hv \| ISO_14755_51;	516	\| hv \| ISO_14755_51;
509	# if ISO_14755	517	# if ISO_14755
…		…
528	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	536	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529	scr_overlay_set (0, 0, "ISO 14755 mode");	537	scr_overlay_set (0, 0, "ISO 14755 mode");
530	# endif	538	# endif
531	}	539	}
532	#endif	540	#endif
533		541
534	#ifdef PRINTPIPE	542	#ifdef PRINTPIPE
535	if (keysym == XK_Print)	543	if (keysym == XK_Print)
536	{	544	{
537	scr_printscreen (ctrl \| shft);	545	scr_printscreen (ctrl \| shft);
538	return;	546	return;
…		…
877	return;	885	return;
878		886
879	if (len <= 0)	887	if (len <= 0)
880	return; /* not mapped */	888	return; /* not mapped */
881		889
882	if (OPTION (Opt_scrollTtyKeypress))	890	if (option (Opt_scrollTtyKeypress))
883	if (view_start)	891	if (view_start)
884	{	892	{
885	view_start = 0;	893	view_start = 0;
886	want_refresh = 1;	894	want_refresh = 1;
887	}	895	}
…		…
965	scr_overlay_off ();	973	scr_overlay_off ();
966	# endif	974	# endif
967	if (iso14755buf & ISO_14755_51)	975	if (iso14755buf & ISO_14755_51)
968	commit_iso14755 ();	976	commit_iso14755 ();
969	#if ISO_14755	977	#if ISO_14755
970	else if (iso14755buf & ISO_14755_STARTED)	978	else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971	{	979	{
972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair	980	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973		981
974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);	982	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");	983	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
…		…
1102	void	1110	void
1103	rxvt_term::flush_cb (time_watcher &w)	1111	rxvt_term::flush_cb (time_watcher &w)
1104	{	1112	{
1105	make_current ();	1113	make_current ();
1106		1114
1107	refresh_limit = 1;
1108	refresh_count = 0;	1115	refresh_count = 0;
1109	flush ();	1116	flush ();
1110	}	1117	}
1111		1118
1112	#ifdef CURSOR_BLINK	1119	#ifdef CURSOR_BLINK
…		…
1178		1185
1179	#if LINUX_YIELD_HACK	1186	#if LINUX_YIELD_HACK
1180	static struct event_handler	1187	static struct event_handler
1181	{	1188	{
1182	check_watcher yield_ev;	1189	check_watcher yield_ev;
1183		1190
1184	void yield_cb (check_watcher &w)	1191	void yield_cb (check_watcher &w)
1185	{	1192	{
1186	// this should really be sched_yield(), but the linux guys thought	1193	// this should really be sched_yield(), but the linux guys thought
1187	// that giving a process calling sched_yield () less cpu time than	1194	// that giving a process calling sched_yield () less cpu time than
1188	// ones with high nice levels is a useful thing to do. It surely is is	1195	// ones with high nice levels is a useful thing to do. It surely is is
…		…
1232	}	1239	}
1233	else	1240	else
1234	{	1241	{
1235	pty_ev.stop ();	1242	pty_ev.stop ();
1236		1243
1237	if (!OPTION (Opt_hold))	1244	if (!option (Opt_hold))
1238	destroy ();	1245	destroy ();
1239	}	1246	}
1240		1247
1241	return false;	1248	return false;
1242	}	1249	}
1243		1250
1244	void	1251	void
1245	rxvt_term::pty_cb (io_watcher &w, short revents)	1252	rxvt_term::pty_cb (io_watcher &w, short revents)
…		…
1263	recolour_cursor ();	1270	recolour_cursor ();
1264		1271
1265	#ifdef POINTER_BLANK	1272	#ifdef POINTER_BLANK
1266	hidden_pointer = 0;	1273	hidden_pointer = 0;
1267		1274
1268	if (OPTION (Opt_pointerBlank))	1275	if (option (Opt_pointerBlank))
1269	pointer_ev.start (NOW + pointerBlankDelay);	1276	pointer_ev.start (NOW + pointerBlankDelay);
1270	#endif	1277	#endif
1271	}	1278	}
1272		1279
1273	#ifdef POINTER_BLANK	1280	#ifdef POINTER_BLANK
1274	void	1281	void
1275	rxvt_term::pointer_blank ()	1282	rxvt_term::pointer_blank ()
1276	{	1283	{
1277	if (!OPTION (Opt_pointerBlank))	1284	if (!option (Opt_pointerBlank))
1278	return;	1285	return;
1279		1286
1280	XDefineCursor (dpy, vt, display->blank_cursor);	1287	XDefineCursor (dpy, vt, display->blank_cursor);
1281	XFlush (dpy);	1288	XFlush (dpy);
1282		1289
…		…
1458	break;	1465	break;
1459	}	1466	}
1460	break;	1467	break;
1461		1468
1462	case FocusIn:	1469	case FocusIn:
1463	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)	1470	if (ev.xfocus.detail != NotifyInferior
		1471	&& ev.xfocus.detail != NotifyPointer
		1472	&& ev.xfocus.mode != NotifyGrab)
1464	focus_in ();	1473	focus_in ();
1465	break;	1474	break;
1466		1475
1467	case FocusOut:	1476	case FocusOut:
1468	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)	1477	if (ev.xfocus.detail != NotifyInferior
		1478	&& ev.xfocus.detail != NotifyPointer
		1479	&& ev.xfocus.mode != NotifyGrab)
1469	focus_out ();	1480	focus_out ();
1470	break;	1481	break;
1471		1482
1472	case ConfigureNotify:	1483	case ConfigureNotify:
1473	if (ev.xconfigure.window == parent[0])	1484	if (ev.xconfigure.window == parent[0])
…		…
1477		1488
1478	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1489	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1479	{	1490	{
1480	seen_resize = 1;	1491	seen_resize = 1;
1481	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1492	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
		1493	#ifdef XPM_BACKGROUND
		1494	if (!option (Opt_transparent) && bgPixmap.auto_resize)
		1495	{
		1496	resize_pixmap ();
		1497	scr_touch (true);
		1498	}
		1499	#endif
1482	}	1500	}
1483		1501
1484	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1502	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485		1503
1486	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1504	#ifdef TRANSPARENT
1487	#if 0
1488	if (OPTION (Opt_transparent))	1505	if (option (Opt_transparent))
1489	check_our_parents ();	1506	check_our_parents ();
1490	#endif
1491	#endif	1507	#endif
1492	}	1508	}
1493	break;	1509	break;
1494		1510
1495	case PropertyNotify:	1511	case PropertyNotify:
…		…
1676	&ev.xbutton.x, &ev.xbutton.y,	1692	&ev.xbutton.x, &ev.xbutton.y,
1677	&unused_mask);	1693	&unused_mask);
1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1694	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679	scrollbar_size ());	1695	scrollbar_size ());
1680	want_refresh = 1;	1696	want_refresh = 1;
1681	refresh_limit = 0;
1682	scrollbar_show (1);	1697	scrollbar_show (1);
1683	}	1698	}
1684	break;	1699	break;
1685	}	1700	}
1686		1701
1687	#if defined(CURSOR_BLINK)	1702	#if defined(CURSOR_BLINK)
1688	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1703	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1689	{	1704	{
1690	if (hidden_cursor)	1705	if (hidden_cursor)
1691	{	1706	{
1692	hidden_cursor = 0;	1707	hidden_cursor = 0;
1693	want_refresh = 1;	1708	want_refresh = 1;
…		…
1696	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1711	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1697	}	1712	}
1698	#endif	1713	#endif
1699		1714
1700	#if defined(POINTER_BLANK)	1715	#if defined(POINTER_BLANK)
1701	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1716	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702	{	1717	{
1703	if (ev.type == MotionNotify	1718	if (ev.type == MotionNotify
1704	\|\| ev.type == ButtonPress	1719	\|\| ev.type == ButtonPress
1705	\|\| ev.type == ButtonRelease)	1720	\|\| ev.type == ButtonRelease)
1706	if (hidden_pointer)	1721	if (hidden_pointer)
…		…
1728	IMSetPosition ();	1743	IMSetPosition ();
1729	XSetICFocus (Input_Context);	1744	XSetICFocus (Input_Context);
1730	}	1745	}
1731	#endif	1746	#endif
1732	#if CURSOR_BLINK	1747	#if CURSOR_BLINK
1733	if (OPTION (Opt_cursorBlink))	1748	if (option (Opt_cursorBlink))
1734	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1749	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1735	#endif	1750	#endif
1736	#if OFF_FOCUS_FADING	1751	#if OFF_FOCUS_FADING
1737	if (rs[Rs_fade])	1752	if (rs[Rs_fade])
1738	{	1753	{
1739	pix_colors = pix_colors_focused;	1754	pix_colors = pix_colors_focused;
1740	scr_recolour ();	1755	scr_recolour ();
		1756	}
		1757	#endif
		1758	#if ENABLE_FRILLS
		1759	if (option (Opt_urgentOnBell))
		1760	{
		1761	XWMHints *h;
		1762
		1763	h = XGetWMHints(dpy, parent[0]);
		1764	if (h != NULL)
		1765	{
		1766	h->flags &= ~XUrgencyHint;
		1767	XSetWMHints(dpy, parent[0], h);
		1768	}
1741	}	1769	}
1742	#endif	1770	#endif
1743	}	1771	}
1744	}	1772	}
1745		1773
…		…
1765	#if USE_XIM	1793	#if USE_XIM
1766	if (Input_Context != NULL)	1794	if (Input_Context != NULL)
1767	XUnsetICFocus (Input_Context);	1795	XUnsetICFocus (Input_Context);
1768	#endif	1796	#endif
1769	#if CURSOR_BLINK	1797	#if CURSOR_BLINK
1770	if (OPTION (Opt_cursorBlink))	1798	if (option (Opt_cursorBlink))
1771	cursor_blink_ev.stop ();	1799	cursor_blink_ev.stop ();
1772	hidden_cursor = 0;	1800	hidden_cursor = 0;
1773	#endif	1801	#endif
1774	#if OFF_FOCUS_FADING	1802	#if OFF_FOCUS_FADING
1775	if (rs[Rs_fade])	1803	if (rs[Rs_fade])
…		…
1816	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1844	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1817	return;	1845	return;
1818		1846
1819	/* FALLTHROUGH */	1847	/* FALLTHROUGH */
1820	case ReparentNotify:	1848	case ReparentNotify:
1821	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1849	if (option (Opt_transparent))
1822	want_refresh = want_full_refresh = 1;	1850	check_our_parents ();
1823	break;	1851	break;
1824	}	1852	}
1825	# endif	1853	# endif
1826	}	1854	}
1827	#endif	1855	#endif
…		…
2158	selection_make (ev.time);	2186	selection_make (ev.time);
2159	break;	2187	break;
2160		2188
2161	case Button2:	2189	case Button2:
2162	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2190	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2191	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164	break;	2192	break;
2165		2193
2166	#ifdef MOUSE_WHEEL	2194	#ifdef MOUSE_WHEEL
2167	case Button4:	2195	case Button4:
2168	case Button5:	2196	case Button5:
…		…
2172		2200
2173	v = ev.button == Button4 ? UP : DN;	2201	v = ev.button == Button4 ? UP : DN;
2174		2202
2175	if (ev.state & ShiftMask)	2203	if (ev.state & ShiftMask)
2176	i = 1;	2204	i = 1;
2177	else if (OPTION (Opt_mouseWheelScrollPage))	2205	else if (option (Opt_mouseWheelScrollPage))
2178	i = nrow - 1;	2206	i = nrow - 1;
2179	else	2207	else
2180	i = 5;	2208	i = 5;
2181		2209
2182	# ifdef MOUSE_SLIP_WHEELING	2210	# ifdef MOUSE_SLIP_WHEELING
…		…
2203	break;	2231	break;
2204	#endif	2232	#endif
2205	}	2233	}
2206	}	2234	}
2207	}	2235	}
2208
2209	#ifdef TRANSPARENT
2210	#if TINTING
2211	/* taken from aterm-0.4.2 */
2212
2213	typedef uint32_t RUINT32T;
2214
2215	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2216	{
2217	int sh_r, sh_g, sh_b;
2218	RUINT32T mask_r, mask_g, mask_b;
2219	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2220	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2221	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2222	int i;
2223
2224	Visual *visual = term->visual;
2225
2226	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2227
2228	/* for convenience */
2229	mask_r = visual->red_mask;
2230	mask_g = visual->green_mask;
2231	mask_b = visual->blue_mask;
2232
2233	/* boring lookup table pre-initialization */
2234	switch (srcImage->bits_per_pixel) {
2235	case 15:
2236	if ((mask_r != 0x7c00) \|\|
2237	(mask_g != 0x03e0) \|\|
2238	(mask_b != 0x001f))
2239	return;
2240	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));
2241	lookup_r = lookup;
2242	lookup_g = lookup+32;
2243	lookup_b = lookup+32+32;
2244	sh_r = 10;
2245	sh_g = 5;
2246	sh_b = 0;
2247	break;
2248	case 16:
2249	if ((mask_r != 0xf800) \|\|
2250	(mask_g != 0x07e0) \|\|
2251	(mask_b != 0x001f))
2252	return;
2253	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));
2254	lookup_r = lookup;
2255	lookup_g = lookup+32;
2256	lookup_b = lookup+32+64;
2257	sh_r = 11;
2258	sh_g = 5;
2259	sh_b = 0;
2260	break;
2261	case 24:
2262	if ((mask_r != 0xff0000) \|\|
2263	(mask_g != 0x00ff00) \|\|
2264	(mask_b != 0x0000ff))
2265	return;
2266	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));
2267	lookup_r = lookup;
2268	lookup_g = lookup+256;
2269	lookup_b = lookup+256+256;
2270	sh_r = 16;
2271	sh_g = 8;
2272	sh_b = 0;
2273	break;
2274	case 32:
2275	if ((mask_r != 0xff0000) \|\|
2276	(mask_g != 0x00ff00) \|\|
2277	(mask_b != 0x0000ff))
2278	return;
2279	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));
2280	lookup_r = lookup;
2281	lookup_g = lookup+256;
2282	lookup_b = lookup+256+256;
2283	sh_r = 16;
2284	sh_g = 8;
2285	sh_b = 0;
2286	break;
2287	default:
2288	return; /* we do not support this color depth */
2289	}
2290
2291	/* prepare limits for color transformation (each channel is handled separately) */
2292	if (shade < 0) {
2293	shade = -shade;
2294	if (shade < 0) shade = 0;
2295	if (shade > 100) shade = 100;
2296
2297	lower_lim_r = 65535-rm;
2298	lower_lim_g = 65535-gm;
2299	lower_lim_b = 65535-bm;
2300
2301	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2302	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2303	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2304
2305	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2306	} else {
2307	if (shade < 0) shade = 0;
2308	if (shade > 100) shade = 100;
2309
2310	lower_lim_r = lower_lim_g = lower_lim_b = 0;
2311
2312	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2313	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2314	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2315	}
2316
2317	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2318	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2319	{
2320	unsigned int tmp;
2321
2322	tmp = lower_lim_r;
2323	lower_lim_r = lower_lim_b;
2324	lower_lim_b = tmp;
2325
2326	tmp = upper_lim_r;
2327	upper_lim_r = upper_lim_b;
2328	upper_lim_b = tmp;
2329	}
2330
2331	/* fill our lookup tables */
2332	for (i = 0; i <= mask_r>>sh_r; i++)
2333	{
2334	RUINT32T tmp;
2335	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2336	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2337	lookup_r[i] = (tmp/65535)<<sh_r;
2338	}
2339	for (i = 0; i <= mask_g>>sh_g; i++)
2340	{
2341	RUINT32T tmp;
2342	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2343	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2344	lookup_g[i] = (tmp/65535)<<sh_g;
2345	}
2346	for (i = 0; i <= mask_b>>sh_b; i++)
2347	{
2348	RUINT32T tmp;
2349	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2350	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2351	lookup_b[i] = (tmp/65535)<<sh_b;
2352	}
2353
2354	/* apply table to input image (replacing colors by newly calculated ones) */
2355	switch (srcImage->bits_per_pixel)
2356	{
2357	case 15:
2358	{
2359	unsigned short p1, pf, p, pl;
2360	p1 = (unsigned short *) srcImage->data;
2361	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2362	while (p1 < pf)
2363	{
2364	p = p1;
2365	pl = p1 + srcImage->width;
2366	for (; p < pl; p++)
2367	{
2368	p = lookup_r[(p & 0x7c00)>>10] \|
2369	lookup_g[(*p & 0x03e0)>> 5] \|
2370	lookup_b[(*p & 0x001f)];
2371	}
2372	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
2373	}
2374	break;
2375	}
2376	case 16:
2377	{
2378	unsigned short p1, pf, p, pl;
2379	p1 = (unsigned short *) srcImage->data;
2380	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2381	while (p1 < pf)
2382	{
2383	p = p1;
2384	pl = p1 + srcImage->width;
2385	for (; p < pl; p++)
2386	{
2387	p = lookup_r[(p & 0xf800)>>11] \|
2388	lookup_g[(*p & 0x07e0)>> 5] \|
2389	lookup_b[(*p & 0x001f)];
2390	}
2391	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
2392	}
2393	break;
2394	}
2395	case 24:
2396	{
2397	unsigned char p1, pf, p, pl;
2398	p1 = (unsigned char *) srcImage->data;
2399	pf = (unsigned char ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2400	while (p1 < pf)
2401	{
2402	p = p1;
2403	pl = p1 + srcImage->width * 3;
2404	for (; p < pl; p += 3)
2405	{
2406	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2407	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2408	p[2] = lookup_r[(p[2] & 0x0000ff)];
2409	}
2410	p1 = (unsigned char ) ((char ) p1 + srcImage->bytes_per_line);
2411	}
2412	break;
2413	}
2414	case 32:
2415	{
2416	RUINT32T p1, pf, p, pl;
2417	p1 = (RUINT32T *) srcImage->data;
2418	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2419
2420	while (p1 < pf)
2421	{
2422	p = p1;
2423	pl = p1 + srcImage->width;
2424	for (; p < pl; p++)
2425	{
2426	p = lookup_r[(p & 0xff0000)>>16] \|
2427	lookup_g[(*p & 0x00ff00)>> 8] \|
2428	lookup_b[(*p & 0x0000ff)] \|
2429	(*p & ~0xffffff);
2430	}
2431	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);
2432	}
2433	break;
2434	}
2435	}
2436
2437	free (lookup);
2438	}
2439	#endif
2440
2441	/*
2442	* Check our parents are still who we think they are.
2443	* Do transparency updates if required
2444	*/
2445	int
2446	rxvt_term::check_our_parents ()
2447	{
2448	int i, pchanged, aformat, have_pixmap, rootdepth;
2449	unsigned long nitems, bytes_after;
2450	Atom atype;
2451	unsigned char *prop = NULL;
2452	Window root, oldp, *list;
2453	Pixmap rootpixmap = None;
2454	XWindowAttributes wattr, wrootattr;
2455
2456	pchanged = 0;
2457
2458	if (!OPTION (Opt_transparent))
2459	return pchanged; /* Don't try any more */
2460
2461	XGetWindowAttributes (dpy, display->root, &wrootattr);
2462	rootdepth = wrootattr.depth;
2463
2464	XGetWindowAttributes (dpy, parent[0], &wattr);
2465
2466	if (rootdepth != wattr.depth)
2467	{
2468	if (am_transparent)
2469	{
2470	pchanged = 1;
2471	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2472	am_transparent = am_pixmap_trans = 0;
2473	}
2474
2475	return pchanged; /* Don't try any more */
2476	}
2477
2478	/* Get all X ops out of the queue so that our information is up-to-date. */
2479	XSync (dpy, False);
2480
2481	/*
2482	* Make the frame window set by the window manager have
2483	* the root background. Some window managers put multiple nested frame
2484	* windows for each client, so we have to take care about that.
2485	*/
2486	i = (xa[XA_XROOTPMAP_ID]
2487	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2488	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2489	&nitems, &bytes_after, &prop) == Success);
2490
2491	if (!i \|\| prop == NULL)
2492	i = (xa[XA_ESETROOT_PMAP_ID]
2493	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2494	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2495	&nitems, &bytes_after, &prop) == Success);
2496
2497	if (!i \|\| prop == NULL
2498	#if TINTING
2499	\|\| !ISSET_PIXCOLOR (Color_tint)
2500	#endif
2501	)
2502	have_pixmap = 0;
2503	else
2504	{
2505	have_pixmap = 1;
2506	rootpixmap = (Pixmap )prop;
2507	XFree (prop);
2508	}
2509
2510	if (have_pixmap)
2511	{
2512	/*
2513	* Copy display->root pixmap transparency
2514	*/
2515	int sx, sy, nx, ny;
2516	unsigned int nw, nh;
2517	Window cr;
2518	XImage *image;
2519	GC gc;
2520	XGCValues gcvalue;
2521
2522	XTranslateCoordinates (dpy, parent[0], display->root,
2523	0, 0, &sx, &sy, &cr);
2524	nw = (unsigned int)szHint.width;
2525	nh = (unsigned int)szHint.height;
2526	nx = ny = 0;
2527
2528	if (sx < 0)
2529	{
2530	nw += sx;
2531	nx = -sx;
2532	sx = 0;
2533	}
2534
2535	if (sy < 0)
2536	{
2537	nh += sy;
2538	ny = -sy;
2539	sy = 0;
2540	}
2541
2542	min_it (nw, (unsigned int) (wrootattr.width - sx));
2543	min_it (nh, (unsigned int) (wrootattr.height - sy));
2544
2545	XSync (dpy, False);
2546	allowedxerror = -1;
2547	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2548
2549	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2550	/* XXX: may need a delay here? */
2551	allowedxerror = 0;
2552
2553	if (image == NULL)
2554	{
2555	if (am_transparent && am_pixmap_trans)
2556	{
2557	pchanged = 1;
2558	if (pixmap != None)
2559	{
2560	XFreePixmap (dpy, pixmap);
2561	pixmap = None;
2562	}
2563	}
2564
2565	am_pixmap_trans = 0;
2566	}
2567	else
2568	{
2569	if (pixmap != None)
2570	XFreePixmap (dpy, pixmap);
2571
2572	#if TINTING
2573	if (ISSET_PIXCOLOR (Color_tint))
2574	{
2575	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2576
2577	rgba c;
2578	pix_colors_focused [Color_tint].get (c);
2579
2580	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2581	}
2582	#endif
2583
2584	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2585	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2586	XPutImage (dpy, pixmap, gc, image, 0, 0,
2587	nx, ny, image->width, image->height);
2588	XFreeGC (dpy, gc);
2589	XDestroyImage (image);
2590	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2591	XClearWindow (dpy, parent[0]);
2592
2593	if (!am_transparent \|\| !am_pixmap_trans)
2594	pchanged = 1;
2595
2596	am_transparent = am_pixmap_trans = 1;
2597	}
2598	}
2599
2600	if (am_pixmap_trans)
2601	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2602	else
2603	{
2604	unsigned int n;
2605	/*
2606	* InheritPixmap transparency
2607	*/
2608	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2609	{
2610	oldp = parent[i];
2611	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2612	XFree (list);
2613
2614	if (parent[i] == display->root)
2615	{
2616	if (oldp != None)
2617	pchanged = 1;
2618
2619	break;
2620	}
2621
2622	if (oldp != parent[i])
2623	pchanged = 1;
2624	}
2625
2626	n = 0;
2627
2628	if (pchanged)
2629	for (; n < (unsigned int)i; n++)
2630	{
2631	XGetWindowAttributes (dpy, parent[n], &wattr);
2632
2633	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2634	{
2635	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636	break;
2637	}
2638	}
2639
2640	if (n > (sizeof (parent) / sizeof (parent[0])))
2641	{
2642	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2643	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2644	am_transparent = 0;
2645	/* XXX: also turn off Opt_transparent? */
2646	}
2647	else
2648	{
2649	for (n = 0; n < (unsigned int)i; n++)
2650	{
2651	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2652	XClearWindow (dpy, parent[n]);
2653	}
2654
2655	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2656	am_transparent = 1;
2657	}
2658
2659	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2660	parent[i] = None;
2661	}
2662
2663	if (scrollBar.win)
2664	{
2665	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2666	scrollBar.setIdle ();
2667	scrollbar_show (0);
2668	}
2669
2670	if (am_transparent)
2671	{
2672	want_refresh = want_full_refresh = 1;
2673	if (am_pixmap_trans)
2674	flush ();
2675	}
2676
2677	return pchanged;
2678	}
2679	#endif
2680		2236
2681	/}}} /	2237	/}}} /
2682		2238
2683	bool	2239	bool
2684	rxvt_term::cmd_parse ()	2240	rxvt_term::cmd_parse ()
…		…
2733	if (ch == C0_LF)	2289	if (ch == C0_LF)
2734	nlines++;	2290	nlines++;
2735		2291
2736	refresh_count++;	2292	refresh_count++;
2737		2293
2738	if (!OPTION (Opt_jumpScroll)	2294	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2739	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2740	{	2295	{
2741	refreshnow = true;
2742	refresh_count = 0;	2296	refresh_count = 0;
		2297
		2298	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + .1)
		2299	{
		2300	refreshnow = true;
2743	ch = NOCHAR;	2301	ch = NOCHAR;
2744	break;	2302	break;
		2303	}
2745	}	2304	}
2746		2305
2747	// scr_add_lines only works for nlines <= nrow - 1.	2306	// scr_add_lines only works for nlines <= nrow - 1.
2748	if (nlines >= nrow - 1)	2307	if (nlines >= nrow - 1)
2749	{	2308	{
…		…
2777	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))	2336	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778	scr_add_lines (buf, str - buf, nlines);	2337	scr_add_lines (buf, str - buf, nlines);
2779		2338
2780	/*	2339	/*
2781	* If there have been a lot of new lines, then update the screen	2340	* If there have been a lot of new lines, then update the screen
2782	* What the heck I'll cheat and only refresh less than every page-full.	2341	* What the heck we'll cheat and only refresh less than every page-full.
2783	* the number of pages between refreshes is refresh_limit, which	2342	* if skipScroll is enabled.
2784	* is incremented here because we must be doing flat-out scrolling.
2785	*/	2343	*/
2786	if (refreshnow)	2344	if (refreshnow)
2787	{	2345	{
2788	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2789	refresh_limit++;
2790	else
2791	{
2792	flag = true;	2346	flag = true;
2793	//TODO: due to popular request, implement "skipscroll" option here
2794	scr_refresh ();	2347	scr_refresh ();
2795	want_refresh = 1;	2348	want_refresh = 1;
2796	}
2797	}	2349	}
2798		2350
2799	}	2351	}
2800	else	2352	else
2801	{	2353	{
…		…
2950	{	2502	{
2951	if ((buf[len++] = cmd_getc ()) == 'i')	2503	if ((buf[len++] = cmd_getc ()) == 'i')
2952	break; /* done = 1 */	2504	break; /* done = 1 */
2953	}	2505	}
2954	}	2506	}
2955		2507
2956	for (i = 0; i < len; i++)	2508	for (i = 0; i < len; i++)
2957	if (putc (buf[i], fd) == EOF)	2509	if (putc (buf[i], fd) == EOF)
2958	{	2510	{
2959	done = 1;	2511	done = 1;
2960	break;	2512	break;
…		…
3459	break;	3011	break;
3460	case 6: /* CPR requested */	3012	case 6: /* CPR requested */
3461	scr_report_position ();	3013	scr_report_position ();
3462	break;	3014	break;
3463	case 7: /* unofficial extension */	3015	case 7: /* unofficial extension */
3464	if (OPTION (Opt_insecure))	3016	if (option (Opt_insecure))
3465	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3017	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3466	break;	3018	break;
3467	case 8: /* unofficial extension */	3019	case 8: /* unofficial extension */
3468	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3020	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3469	break;	3021	break;
…		…
3633	break;	3185	break;
3634	case 20: /* report icon label */	3186	case 20: /* report icon label */
3635	{	3187	{
3636	char *s;	3188	char *s;
3637	XGetIconName (dpy, parent[0], &s);	3189	XGetIconName (dpy, parent[0], &s);
3638	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3190	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3639	XFree (s);	3191	XFree (s);
3640	}	3192	}
3641	break;	3193	break;
3642	case 21: /* report window title */	3194	case 21: /* report window title */
3643	{	3195	{
3644	char *s;	3196	char *s;
3645	XFetchName (dpy, parent[0], &s);	3197	XFetchName (dpy, parent[0], &s);
3646	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3198	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3647	XFree (s);	3199	XFree (s);
3648	}	3200	}
3649	break;	3201	break;
3650	}	3202	}
3651	}	3203	}
…		…
3778	int saveop = op;	3330	int saveop = op;
3779		3331
3780	dLocal (Display *, dpy);	3332	dLocal (Display *, dpy);
3781		3333
3782	assert (str != NULL);	3334	assert (str != NULL);
3783		3335
3784	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))	3336	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3785	return;	3337	return;
3786		3338
3787	switch (op)	3339	switch (op)
3788	{	3340	{
…		…
3923	#ifdef XPM_BACKGROUND	3475	#ifdef XPM_BACKGROUND
3924	resize_pixmap ();	3476	resize_pixmap ();
3925	scr_touch (true);	3477	scr_touch (true);
3926	#endif	3478	#endif
3927	}	3479	}
		3480	#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
		3481	if (option (Opt_transparent))
		3482	check_our_parents ();
		3483	#endif
3928	}	3484	}
3929	break;	3485	break;
3930		3486
3931	case Rxvt_restoreFG:	3487	case Rxvt_restoreFG:
3932	set_window_color (Color_fg, str);	3488	set_window_color (Color_fg, str);
…		…
3959	case URxvt_italicFont:	3515	case URxvt_italicFont:
3960	case URxvt_boldItalicFont:	3516	case URxvt_boldItalicFont:
3961	#endif	3517	#endif
3962	if (query)	3518	if (query)
3963	tt_printf ("\33]%d;%-.250s%c", saveop,	3519	tt_printf ("\33]%d;%-.250s%c", saveop,
3964	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3520	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965	? fontset[op - URxvt_font]->fontdesc : "",	3521	? fontset[op - URxvt_font]->fontdesc : "",
3966	resp);	3522	resp);
3967	else	3523	else
3968	{	3524	{
3969	const char *&res = rs[Rs_font + (op - URxvt_font)];	3525	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3983	break;	3539	break;
3984		3540
3985	#if !ENABLE_MINIMAL	3541	#if !ENABLE_MINIMAL
3986	case URxvt_locale:	3542	case URxvt_locale:
3987	if (query)	3543	if (query)
3988	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);	3544	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3989	else	3545	else
3990	{	3546	{
3991	set_locale (str);	3547	set_locale (str);
3992	pty->set_utf8_mode (enc_utf8);	3548	pty->set_utf8_mode (enc_utf8);
3993	init_xlocale ();	3549	init_xlocale ();
…		…
4134	scr_touch (true);	3690	scr_touch (true);
4135	break;	3691	break;
4136	#endif	3692	#endif
4137	case 1048: /* alternative cursor save */	3693	case 1048: /* alternative cursor save */
4138	case 1049:	3694	case 1049:
4139	if (OPTION (Opt_secondaryScreen))	3695	if (option (Opt_secondaryScreen))
4140	if (mode == 0)	3696	if (mode == 0)
4141	scr_cursor (RESTORE);	3697	scr_cursor (RESTORE);
4142	else if (mode == 1)	3698	else if (mode == 1)
4143	scr_cursor (SAVE);	3699	scr_cursor (SAVE);
4144	break;	3700	break;
…		…
4209	break;	3765	break;
4210	case 1011: /* scroll to bottom on key press */	3766	case 1011: /* scroll to bottom on key press */
4211	set_option (Opt_scrollTtyKeypress, state);	3767	set_option (Opt_scrollTtyKeypress, state);
4212	break;	3768	break;
4213	case 1047: /* secondary screen w/ clearing last */	3769	case 1047: /* secondary screen w/ clearing last */
4214	if (OPTION (Opt_secondaryScreen))	3770	if (option (Opt_secondaryScreen))
4215	if (current_screen != PRIMARY)	3771	if (current_screen != PRIMARY)
4216	scr_erase_screen (2);	3772	scr_erase_screen (2);
4217	scr_change_screen (state);	3773	scr_change_screen (state);
4218	break;	3774	break;
4219	case 1049: /* secondary screen w/ clearing first */	3775	case 1049: /* secondary screen w/ clearing first */
4220	scr_change_screen (state);	3776	scr_change_screen (state);
4221	if (OPTION (Opt_secondaryScreen))	3777	if (option (Opt_secondaryScreen))
4222	if (current_screen != PRIMARY)	3778	if (current_screen != PRIMARY)
4223	scr_erase_screen (2);	3779	scr_erase_screen (2);
4224	break;	3780	break;
4225	default:	3781	default:
4226	break;	3782	break;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.317 by root, Sat Jan 13 15:06:54 2007 UTC vs. Revision 1.330 by root, Mon Jun 18 12:53:25 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.317 by root, Sat Jan 13 15:06:54 2007 UTC vs.
Revision 1.330 by root, Mon Jun 18 12:53:25 2007 UTC