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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

…		…
95	XK_Shift_L, 0x21e7,	95	XK_Shift_L, 0x21e7,
96	XK_Shift_R, 0x21e7,	96	XK_Shift_R, 0x21e7,
97		97
98	XK_Shift_Lock, 0x21eb,	98	XK_Shift_Lock, 0x21eb,
99	XK_ISO_Lock, 0x21eb,	99	XK_ISO_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,
101	XK_Caps_Lock, 0x21ec,	100	XK_Caps_Lock, 0x21ec,
102	XK_Num_Lock, 0x21ed,	101	XK_Num_Lock, 0x21ed,
103	XK_ISO_Level3_Shift, 0x21ee,	102	XK_ISO_Level3_Shift, 0x21ee,
104	XK_ISO_Level3_Lock, 0x21ef,	103	XK_ISO_Level3_Lock, 0x21ef,
105	XK_ISO_Group_Lock, 0x21f0,	104	XK_ISO_Group_Lock, 0x21f0,
…		…
519	# endif	518	# endif
520	return;	519	return;
521	}	520	}
522	else	521	else
523	{	522	{
524	# if ENABLE_OVERLAY	523	# if ISO_14755
525	scr_overlay_off ();	524	scr_overlay_off ();
526	# endif	525	# endif
527	iso14755buf = 0;	526	iso14755buf = 0;
528	}	527	}
529	}	528	}
530	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	529	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
531	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	530	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))
532	if (!(iso14755buf & ISO_14755_STARTED))	531	if (!(iso14755buf & ISO_14755_STARTED))
533	{	532	{
534	iso14755buf \|= ISO_14755_STARTED;	533	iso14755buf \|= ISO_14755_STARTED;
535	# if ENABLE_OVERLAY	534	# if ISO_14755
536	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537	scr_overlay_set (0, 0, "ISO 14755 mode");	536	scr_overlay_set (0, 0, "ISO 14755 mode");
538	# endif	537	# endif
539	}	538	}
540	#endif	539	#endif
541		540
542	#ifdef PRINTPIPE	541	#ifdef PRINTPIPE
543	if (keysym == XK_Print)	542	if (keysym == XK_Print)
544	{	543	{
545	scr_printscreen (ctrl \| shft);	544	scr_printscreen (ctrl \| shft);
546	return;	545	return;
…		…
728		727
729	case XK_Find:	728	case XK_Find:
730	strcpy (kbuf, "\033[1~");	729	strcpy (kbuf, "\033[1~");
731	break;	730	break;
732		731
733	#ifdef XK_KP_End	732	#ifdef XK_KP_Insert
734	case XK_KP_Insert:	733	case XK_KP_Insert:
735	/* allow shift to override */	734	/* allow shift to override */
736	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	735	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737	{	736	{
738	strcpy (kbuf, "\033Op");	737	strcpy (kbuf, "\033Op");
…		…
934	#if ENABLE_FRILLS \|\| ISO_14755	933	#if ENABLE_FRILLS \|\| ISO_14755
935	// ISO 14755 support	934	// ISO 14755 support
936	if (iso14755buf)	935	if (iso14755buf)
937	if (iso14755buf & ISO_14755_52)	936	if (iso14755buf & ISO_14755_52)
938	{	937	{
939	# if ENABLE_OVERLAY	938	# if ISO_14755
940	scr_overlay_off ();	939	scr_overlay_off ();
941	# endif	940	# endif
942	# if ISO_14755	941	# if ISO_14755
943	// iso14755 part 5.2 handling: release time	942	// iso14755 part 5.2 handling: release time
944	// first: controls	943	// first: controls
…		…
967		966
968	return;	967	return;
969	}	968	}
970	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))	969	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
971	{	970	{
972	# if ENABLE_OVERLAY	971	# if ISO_14755
973	scr_overlay_off ();	972	scr_overlay_off ();
974	# endif	973	# endif
975	if (iso14755buf & ISO_14755_51)	974	if (iso14755buf & ISO_14755_51)
976	commit_iso14755 ();	975	commit_iso14755 ();
977	#if ISO_14755	976	#if ISO_14755
…		…
1035	void	1034	void
1036	rxvt_term::flush ()	1035	rxvt_term::flush ()
1037	{	1036	{
1038	flush_ev.stop ();	1037	flush_ev.stop ();
1039		1038
1040	#ifdef TRANSPARENT	1039	#ifdef ENABLE_TRANSPARENCY
1041	if (want_full_refresh)	1040	if (want_full_refresh)
1042	{	1041	{
1043	want_full_refresh = 0;	1042	want_full_refresh = 0;
1044	scr_clear ();	1043	scr_clear ();
1045	scr_touch (false);	1044	scr_touch (false);
…		…
1110	void	1109	void
1111	rxvt_term::flush_cb (time_watcher &w)	1110	rxvt_term::flush_cb (time_watcher &w)
1112	{	1111	{
1113	make_current ();	1112	make_current ();
1114		1113
1115	refresh_limit = 1;
1116	refresh_count = 0;	1114	refresh_count = 0;
1117	flush ();	1115	flush ();
1118	}	1116	}
1119		1117
1120	#ifdef CURSOR_BLINK	1118	#ifdef CURSOR_BLINK
…		…
1186		1184
1187	#if LINUX_YIELD_HACK	1185	#if LINUX_YIELD_HACK
1188	static struct event_handler	1186	static struct event_handler
1189	{	1187	{
1190	check_watcher yield_ev;	1188	check_watcher yield_ev;
1191		1189
1192	void yield_cb (check_watcher &w)	1190	void yield_cb (check_watcher &w)
1193	{	1191	{
1194	// this should really be sched_yield(), but the linux guys thought	1192	// this should really be sched_yield(), but the linux guys thought
1195	// that giving a process calling sched_yield () less cpu time than	1193	// that giving a process calling sched_yield () less cpu time than
1196	// ones with high nice levels is a useful thing to do. It surely is is	1194	// ones with high nice levels is a useful thing to do. It surely is is
…		…
1243	pty_ev.stop ();	1241	pty_ev.stop ();
1244		1242
1245	if (!option (Opt_hold))	1243	if (!option (Opt_hold))
1246	destroy ();	1244	destroy ();
1247	}	1245	}
1248		1246
1249	return false;	1247	return false;
1250	}	1248	}
1251		1249
1252	void	1250	void
1253	rxvt_term::pty_cb (io_watcher &w, short revents)	1251	rxvt_term::pty_cb (io_watcher &w, short revents)
…		…
1434	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1432	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435	focus_out ();	1433	focus_out ();
1436	}	1434	}
1437	#endif	1435	#endif
1438	}	1436	}
1439	break;
1440
1441	case MappingNotify:
1442	XRefreshKeyboardMapping (&ev.xmapping);
1443	break;	1437	break;
1444		1438
1445	/*	1439	/*
1446	* XXX: this is not the _current_ arrangement	1440	* XXX: this is not the _current_ arrangement
1447	* Here's my conclusion:	1441	* Here's my conclusion:
…		…
1489		1483
1490	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1484	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1491	{	1485	{
1492	seen_resize = 1;	1486	seen_resize = 1;
1493	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1487	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494	#ifdef XPM_BACKGROUND
1495	if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496	{
1497	resize_pixmap ();
1498	scr_touch (true);
1499	}
1500	#endif
1501	}	1488	}
1502		1489	else
		1490	{
		1491	#ifdef ENABLE_TRANSPARENCY
		1492	if (option (Opt_transparent))
		1493	if (bgPixmap.render ())
		1494	scr_touch (false);
		1495	#endif
		1496	}
1503	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1497	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505	#ifdef TRANSPARENT
1506	if (option (Opt_transparent))
1507	check_our_parents ();
1508	#endif
1509	}	1498	}
1510	break;	1499	break;
1511		1500
1512	case PropertyNotify:	1501	case PropertyNotify:
1513	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1502	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1544	text_blink_ev.stop ();	1533	text_blink_ev.stop ();
1545	#endif	1534	#endif
1546	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1535	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547	break;	1536	break;
1548		1537
1549	#ifdef TRANSPARENT	1538	#ifdef ENABLE_TRANSPARENCY
1550	case ReparentNotify:	1539	case ReparentNotify:
1551	rootwin_cb (ev);	1540	rootwin_cb (ev);
1552	break;	1541	break;
1553	#endif /* TRANSPARENT */	1542	#endif /* ENABLE_TRANSPARENCY */
1554		1543
1555	case GraphicsExpose:	1544	case GraphicsExpose:
1556	case Expose:	1545	case Expose:
1557	if (ev.xany.window == vt)	1546	if (ev.xany.window == vt)
1558	{	1547	{
…		…
1581	if (isScrollbarWindow (ev.xany.window))	1570	if (isScrollbarWindow (ev.xany.window))
1582	{	1571	{
1583	scrollBar.setIdle ();	1572	scrollBar.setIdle ();
1584	scrollbar_show (0);	1573	scrollbar_show (0);
1585	}	1574	}
1586
1587	#ifdef TRANSPARENT
1588	if (am_transparent && ev.xany.window == parent[0])
1589	XClearWindow (dpy, ev.xany.window);
1590	#endif
1591	}	1575	}
1592	break;	1576	break;
1593		1577
1594	case MotionNotify:	1578	case MotionNotify:
1595	#ifdef POINTER_BLANK	1579	#ifdef POINTER_BLANK
…		…
1693	&ev.xbutton.x, &ev.xbutton.y,	1677	&ev.xbutton.x, &ev.xbutton.y,
1694	&unused_mask);	1678	&unused_mask);
1695	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696	scrollbar_size ());	1680	scrollbar_size ());
1697	want_refresh = 1;	1681	want_refresh = 1;
1698	refresh_limit = 0;
1699	scrollbar_show (1);	1682	scrollbar_show (1);
1700	}	1683	}
1701	break;	1684	break;
1702	}	1685	}
1703		1686
…		…
1785		1768
1786	#if ENABLE_FRILLS \|\| ISO_14755	1769	#if ENABLE_FRILLS \|\| ISO_14755
1787	if (iso14755buf)	1770	if (iso14755buf)
1788	{	1771	{
1789	iso14755buf = 0;	1772	iso14755buf = 0;
1790	# if ENABLE_OVERLAY	1773	# if ISO_14755
1791	scr_overlay_off ();	1774	scr_overlay_off ();
1792	# endif	1775	# endif
1793	}	1776	}
1794	#endif	1777	#endif
1795	#if USE_XIM	1778	#if USE_XIM
…		…
1822	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1805	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823	}	1806	}
1824	#endif	1807	#endif
1825	}	1808	}
1826		1809
1827	#if TRANSPARENT \|\| ENABLE_PERL	1810	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1828	void	1811	void
1829	rxvt_term::rootwin_cb (XEvent &ev)	1812	rxvt_term::rootwin_cb (XEvent &ev)
1830	{	1813	{
1831	make_current ();	1814	make_current ();
1832		1815
1833	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1816	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1817	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835	return;	1818	return;
1836		1819
1837	# if TRANSPARENT	1820	# if ENABLE_TRANSPARENCY
1838	switch (ev.type)	1821	switch (ev.type)
1839	{	1822	{
1840	case PropertyNotify:	1823	case PropertyNotify:
1841	/*	1824	/*
1842	* if user used some Esetroot compatible prog to set the root bg,	1825	* if user used some Esetroot compatible prog to set the root bg,
1843	* use the property to determine the pixmap. We use it later on.	1826	* use the property to determine the pixmap. We use it later on.
1844	*/	1827	*/
1845	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1828	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1829	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847	return;	1830	{
1848		1831	bgPixmap.set_root_pixmap ();
1849	/* FALLTHROUGH */	1832	bgPixmap.render ();
1850	case ReparentNotify:	1833	}
1851	if (option (Opt_transparent))
1852	check_our_parents ();
1853	break;	1834	break;
1854	}	1835	}
1855	# endif	1836	# endif
1856	}	1837	}
1857	#endif	1838	#endif
…		…
2234	#endif	2215	#endif
2235	}	2216	}
2236	}	2217	}
2237	}	2218	}
2238		2219
2239	#ifdef TRANSPARENT
2240	#if TINTING && !defined(HAVE_AFTERIMAGE)
2241	/* taken from aterm-0.4.2 */
2242
2243	typedef uint32_t RUINT32T;
2244
2245	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2246	{
2247	int sh_r, sh_g, sh_b;
2248	RUINT32T mask_r, mask_g, mask_b;
2249	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2250	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252	int i;
2253
2254	Visual *visual = term->visual;
2255
2256	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2257
2258	/* for convenience */
2259	mask_r = visual->red_mask;
2260	mask_g = visual->green_mask;
2261	mask_b = visual->blue_mask;
2262
2263	/* boring lookup table pre-initialization */
2264	switch (srcImage->bits_per_pixel) {
2265	case 15:
2266	if ((mask_r != 0x7c00) \|\|
2267	(mask_g != 0x03e0) \|\|
2268	(mask_b != 0x001f))
2269	return;
2270	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));
2271	lookup_r = lookup;
2272	lookup_g = lookup+32;
2273	lookup_b = lookup+32+32;
2274	sh_r = 10;
2275	sh_g = 5;
2276	sh_b = 0;
2277	break;
2278	case 16:
2279	if ((mask_r != 0xf800) \|\|
2280	(mask_g != 0x07e0) \|\|
2281	(mask_b != 0x001f))
2282	return;
2283	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));
2284	lookup_r = lookup;
2285	lookup_g = lookup+32;
2286	lookup_b = lookup+32+64;
2287	sh_r = 11;
2288	sh_g = 5;
2289	sh_b = 0;
2290	break;
2291	case 24:
2292	if ((mask_r != 0xff0000) \|\|
2293	(mask_g != 0x00ff00) \|\|
2294	(mask_b != 0x0000ff))
2295	return;
2296	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));
2297	lookup_r = lookup;
2298	lookup_g = lookup+256;
2299	lookup_b = lookup+256+256;
2300	sh_r = 16;
2301	sh_g = 8;
2302	sh_b = 0;
2303	break;
2304	case 32:
2305	if ((mask_r != 0xff0000) \|\|
2306	(mask_g != 0x00ff00) \|\|
2307	(mask_b != 0x0000ff))
2308	return;
2309	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));
2310	lookup_r = lookup;
2311	lookup_g = lookup+256;
2312	lookup_b = lookup+256+256;
2313	sh_r = 16;
2314	sh_g = 8;
2315	sh_b = 0;
2316	break;
2317	default:
2318	return; /* we do not support this color depth */
2319	}
2320
2321	/* prepare limits for color transformation (each channel is handled separately) */
2322	if (shade < 0) {
2323	shade = -shade;
2324	if (shade < 0) shade = 0;
2325	if (shade > 100) shade = 100;
2326
2327	lower_lim_r = 65535-rm;
2328	lower_lim_g = 65535-gm;
2329	lower_lim_b = 65535-bm;
2330
2331	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336	} else {
2337	if (shade < 0) shade = 0;
2338	if (shade > 100) shade = 100;
2339
2340	lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345	}
2346
2347	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349	{
2350	unsigned int tmp;
2351
2352	tmp = lower_lim_r;
2353	lower_lim_r = lower_lim_b;
2354	lower_lim_b = tmp;
2355
2356	tmp = upper_lim_r;
2357	upper_lim_r = upper_lim_b;
2358	upper_lim_b = tmp;
2359	}
2360
2361	/* fill our lookup tables */
2362	for (i = 0; i <= mask_r>>sh_r; i++)
2363	{
2364	RUINT32T tmp;
2365	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367	lookup_r[i] = (tmp/65535)<<sh_r;
2368	}
2369	for (i = 0; i <= mask_g>>sh_g; i++)
2370	{
2371	RUINT32T tmp;
2372	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374	lookup_g[i] = (tmp/65535)<<sh_g;
2375	}
2376	for (i = 0; i <= mask_b>>sh_b; i++)
2377	{
2378	RUINT32T tmp;
2379	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381	lookup_b[i] = (tmp/65535)<<sh_b;
2382	}
2383
2384	/* apply table to input image (replacing colors by newly calculated ones) */
2385	switch (srcImage->bits_per_pixel)
2386	{
2387	case 15:
2388	{
2389	unsigned short p1, pf, p, pl;
2390	p1 = (unsigned short *) srcImage->data;
2391	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2392	while (p1 < pf)
2393	{
2394	p = p1;
2395	pl = p1 + srcImage->width;
2396	for (; p < pl; p++)
2397	{
2398	p = lookup_r[(p & 0x7c00)>>10] \|
2399	lookup_g[(*p & 0x03e0)>> 5] \|
2400	lookup_b[(*p & 0x001f)];
2401	}
2402	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
2403	}
2404	break;
2405	}
2406	case 16:
2407	{
2408	unsigned short p1, pf, p, pl;
2409	p1 = (unsigned short *) srcImage->data;
2410	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2411	while (p1 < pf)
2412	{
2413	p = p1;
2414	pl = p1 + srcImage->width;
2415	for (; p < pl; p++)
2416	{
2417	p = lookup_r[(p & 0xf800)>>11] \|
2418	lookup_g[(*p & 0x07e0)>> 5] \|
2419	lookup_b[(*p & 0x001f)];
2420	}
2421	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
2422	}
2423	break;
2424	}
2425	case 24:
2426	{
2427	unsigned char p1, pf, p, pl;
2428	p1 = (unsigned char *) srcImage->data;
2429	pf = (unsigned char ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2430	while (p1 < pf)
2431	{
2432	p = p1;
2433	pl = p1 + srcImage->width * 3;
2434	for (; p < pl; p += 3)
2435	{
2436	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438	p[2] = lookup_r[(p[2] & 0x0000ff)];
2439	}
2440	p1 = (unsigned char ) ((char ) p1 + srcImage->bytes_per_line);
2441	}
2442	break;
2443	}
2444	case 32:
2445	{
2446	RUINT32T p1, pf, p, pl;
2447	p1 = (RUINT32T *) srcImage->data;
2448	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2449
2450	while (p1 < pf)
2451	{
2452	p = p1;
2453	pl = p1 + srcImage->width;
2454	for (; p < pl; p++)
2455	{
2456	p = lookup_r[(p & 0xff0000)>>16] \|
2457	lookup_g[(*p & 0x00ff00)>> 8] \|
2458	lookup_b[(*p & 0x0000ff)] \|
2459	(*p & ~0xffffff);
2460	}
2461	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);
2462	}
2463	break;
2464	}
2465	}
2466
2467	free (lookup);
2468	}
2469	#endif
2470
2471	/*
2472	* Check our parents are still who we think they are.
2473	* Do transparency updates if required
2474	*/
2475	int
2476	rxvt_term::check_our_parents ()
2477	{
2478	check_our_parents_ev.stop ();
2479	check_our_parents_ev.start (NOW + .1);
2480	return 0;
2481	}
2482
2483	void
2484	rxvt_term::check_our_parents_cb (time_watcher &w)
2485	{
2486	int i, pchanged, aformat, have_pixmap, rootdepth;
2487	unsigned long nitems, bytes_after;
2488	Atom atype;
2489	unsigned char *prop = NULL;
2490	Window root, oldp, *list;
2491	Pixmap rootpixmap = None;
2492	XWindowAttributes wattr, wrootattr;
2493	int sx, sy;
2494	Window cr;
2495
2496	pchanged = 0;
2497
2498	if (!option (Opt_transparent))
2499	return /pchanged/; /* Don't try any more */
2500
2501	XGetWindowAttributes (dpy, display->root, &wrootattr);
2502	rootdepth = wrootattr.depth;
2503
2504	XGetWindowAttributes (dpy, parent[0], &wattr);
2505
2506	if (rootdepth != wattr.depth)
2507	{
2508	if (am_transparent)
2509	{
2510	pchanged = 1;
2511	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2512	am_transparent = am_pixmap_trans = 0;
2513	}
2514
2515	return /pchanged/; /* Don't try any more */
2516	}
2517
2518	/* Get all X ops out of the queue so that our information is up-to-date. */
2519	XSync (dpy, False);
2520
2521	XTranslateCoordinates (dpy, parent[0], display->root,
2522	0, 0, &sx, &sy, &cr);
2523
2524	/* check if we are outside of the visible part of the virtual screen : */
2525	if( sx + (int)szHint.width <= 0 \|\| sy + (int)szHint.height <= 0
2526	\|\| sx >= wrootattr.width \|\| sy >= wrootattr.height )
2527	return /* 0 */ ;
2528	/*
2529	* Make the frame window set by the window manager have
2530	* the root background. Some window managers put multiple nested frame
2531	* windows for each client, so we have to take care about that.
2532	*/
2533	i = (xa[XA_XROOTPMAP_ID]
2534	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2535	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2536	&nitems, &bytes_after, &prop) == Success);
2537
2538	if (!i \|\| prop == NULL)
2539	i = (xa[XA_ESETROOT_PMAP_ID]
2540	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2541	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2542	&nitems, &bytes_after, &prop) == Success);
2543
2544	if (!i \|\| prop == NULL
2545	#if TINTING
2546	\|\| (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547	#ifdef HAVE_AFTERIMAGE
2548	&& original_asim == NULL && rs[Rs_blurradius] == NULL
2549	#endif
2550	)
2551	#endif
2552	)
2553	have_pixmap = 0;
2554	else
2555	{
2556	have_pixmap = 1;
2557	rootpixmap = (Pixmap )prop;
2558	XFree (prop);
2559	}
2560
2561	if (have_pixmap)
2562	{
2563	Bool success = False ;
2564	GC gc;
2565	XGCValues gcvalue;
2566	#ifdef HAVE_AFTERIMAGE
2567	{
2568	Pixmap tmp_pmap = None ;
2569	ShadingInfo shade;
2570	ARGB32 tint ;
2571	unsigned int pmap_w = 0, pmap_h = 0;
2572
2573	if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574	{
2575	int root_x = 0, root_y = 0;
2576
2577	shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578	if (ISSET_PIXCOLOR (Color_tint))
2579	{
2580	rgba c;
2581	pix_colors_focused [Color_tint].get (c);
2582	shade.tintColor.red = c.r;
2583	shade.tintColor.green = c.g;
2584	shade.tintColor.blue = c.b;
2585	}
2586	else
2587	shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588	tint = shading2tint32( &shade );
2589	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590	if (GetWinPosition (parent[0], &root_x, &root_y) )
2591	{
2592	ASImageLayer *layers = create_image_layers( 2 );
2593	ASImage *merged_im = NULL;
2594	int back_x, back_y, back_w, back_h;
2595	/* merge_layers does good job at tiling background appropriately,
2596	so all we need is to cut out smallest possible piece : */
2597	#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598	do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599	back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600	if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601	back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602	else \
2603	{ /* small background - need the whole of it for successfull tiling :*/ \
2604	back_##xy = 0; \
2605	back_##wh = pmap_##wh; \
2606	}}while(0)
2607
2608	MAKE_ROOTPMAP_GEOM(x,w,width);
2609	MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611	layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612	layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613	layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614	layers[0].clip_width = szHint.width;
2615	layers[0].clip_height = szHint.height;
2616	layers[0].tint = tint;
2617	if (rs[Rs_blurradius] && layers[0].im)
2618	{
2619	double r = atof(rs[Rs_blurradius]);
2620	ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621	if( tmp )
2622	{
2623	destroy_asimage( &layers[0].im );
2624	layers[0].im = tmp;
2625	}
2626	}
2627	if (original_asim != NULL)
2628	{
2629	int fore_w, fore_h;
2630	layers[1].im = original_asim;
2631	if( bgPixmap.auto_resize )
2632	{
2633	fore_w = szHint.width;
2634	fore_h = szHint.height;
2635	}
2636	else
2637	{
2638	fore_w = bgPixmap.w;
2639	fore_h = bgPixmap.h;
2640	}
2641	if (fore_w != original_asim->width
2642	\|\| fore_h != original_asim->height)
2643	{
2644	layers[1].im = scale_asimage( display->asv,
2645	original_asim,
2646	fore_w, fore_h,
2647	ASA_ASImage, 100,
2648	ASIMAGE_QUALITY_DEFAULT );
2649	}
2650
2651	layers[1].clip_width = szHint.width;
2652	layers[1].clip_height = szHint.height;
2653
2654	if (rs[Rs_blendtype])
2655	{
2656	layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657	if( layers[1].merge_scanlines == NULL )
2658	layers[1].merge_scanlines = alphablend_scanlines;
2659	}
2660	}
2661	merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662	szHint.width, szHint.height,
2663	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664	if (layers[1].im != original_asim)
2665	destroy_asimage( &(layers[1].im) );
2666	destroy_asimage( &(layers[0].im) );
2667	if (merged_im != NULL)
2668	{
2669	tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670	destroy_asimage( &merged_im );
2671	}
2672	free( layers );
2673	}
2674	}
2675	if (tmp_pmap != None)
2676	{
2677	success = True;
2678	if (pixmap != None)
2679	XFreePixmap (dpy, pixmap);
2680	pixmap = tmp_pmap;
2681	}
2682	}
2683	#else /* HAVE_AFTERIMAGE */
2684	{
2685	/*
2686	* Copy display->root pixmap transparency
2687	*/
2688	int nx, ny;
2689	unsigned int nw, nh;
2690	XImage *image;
2691
2692	nw = (unsigned int)szHint.width;
2693	nh = (unsigned int)szHint.height;
2694	nx = ny = 0;
2695
2696	if (sx < 0)
2697	{
2698	nw += sx;
2699	nx = -sx;
2700	sx = 0;
2701	}
2702
2703	if (sy < 0)
2704	{
2705	nh += sy;
2706	ny = -sy;
2707	sy = 0;
2708	}
2709
2710	min_it (nw, (unsigned int) (wrootattr.width - sx));
2711	min_it (nh, (unsigned int) (wrootattr.height - sy));
2712
2713	XSync (dpy, False);
2714	allowedxerror = -1;
2715	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2716
2717	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2718	/* XXX: may need a delay here? */
2719	allowedxerror = 0;
2720	if (image != NULL)
2721	{
2722	if (pixmap != None)
2723	XFreePixmap (dpy, pixmap);
2724
2725	#if TINTING
2726	if (ISSET_PIXCOLOR (Color_tint))
2727	{
2728	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730	rgba c;
2731	pix_colors_focused [Color_tint].get (c);
2732	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733	}
2734	#endif
2735
2736	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738	XPutImage (dpy, pixmap, gc, image, 0, 0,
2739	nx, ny, image->width, image->height);
2740	XDestroyImage (image);
2741	success = True ;
2742	}
2743	}
2744	#endif /* HAVE_AFTERIMAGE */
2745	if (gc != NULL)
2746	XFreeGC (dpy, gc);
2747
2748	if (!success)
2749	{
2750	if (am_transparent && am_pixmap_trans)
2751	{
2752	pchanged = 1;
2753	if (pixmap != None)
2754	{
2755	XFreePixmap (dpy, pixmap);
2756	pixmap = None;
2757	}
2758	}
2759
2760	am_pixmap_trans = 0;
2761	}
2762	else
2763	{
2764	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2765	XClearWindow (dpy, parent[0]);
2766
2767	if (!am_transparent \|\| !am_pixmap_trans)
2768	pchanged = 1;
2769
2770	am_transparent = am_pixmap_trans = 1;
2771	}
2772	}
2773
2774	if (am_pixmap_trans)
2775	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2776	else
2777	{
2778	unsigned int n;
2779	/*
2780	* InheritPixmap transparency
2781	*/
2782	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2783	{
2784	oldp = parent[i];
2785	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2786	XFree (list);
2787
2788	if (parent[i] == display->root)
2789	{
2790	if (oldp != None)
2791	pchanged = 1;
2792
2793	break;
2794	}
2795
2796	if (oldp != parent[i])
2797	pchanged = 1;
2798	}
2799
2800	n = 0;
2801
2802	if (pchanged)
2803	for (; n < (unsigned int)i; n++)
2804	{
2805	XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2807	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2808	{
2809	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2810	break;
2811	}
2812	}
2813
2814	if (n > (sizeof (parent) / sizeof (parent[0])))
2815	{
2816	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2817	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2818	am_transparent = 0;
2819	/* XXX: also turn off Opt_transparent? */
2820	}
2821	else
2822	{
2823	for (n = 0; n < (unsigned int)i; n++)
2824	{
2825	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2826	XClearWindow (dpy, parent[n]);
2827	}
2828
2829	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2830	am_transparent = 1;
2831	}
2832
2833	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2834	parent[i] = None;
2835	}
2836
2837	if (scrollBar.win)
2838	{
2839	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2840	scrollBar.setIdle ();
2841	scrollbar_show (0);
2842	}
2843
2844	if (am_transparent)
2845	{
2846	want_refresh = want_full_refresh = 1;
2847	if (am_pixmap_trans)
2848	flush ();
2849	}
2850
2851	// return pchanged;
2852	}
2853	#endif
2854
2855	/}}} /	2220	/}}} /
2856		2221
2857	bool	2222	bool
2858	rxvt_term::cmd_parse ()	2223	rxvt_term::cmd_parse ()
2859	{	2224	{
…		…
2907	if (ch == C0_LF)	2272	if (ch == C0_LF)
2908	nlines++;	2273	nlines++;
2909		2274
2910	refresh_count++;	2275	refresh_count++;
2911		2276
2912	if (!option (Opt_jumpScroll)	2277	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2913	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2914	{	2278	{
2915	refreshnow = true;
2916	refresh_count = 0;	2279	refresh_count = 0;
		2280
		2281	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)
		2282	{
		2283	refreshnow = true;
2917	ch = NOCHAR;	2284	ch = NOCHAR;
2918	break;	2285	break;
		2286	}
2919	}	2287	}
2920		2288
2921	// scr_add_lines only works for nlines <= nrow - 1.	2289	// scr_add_lines only works for nlines <= nrow - 1.
2922	if (nlines >= nrow - 1)	2290	if (nlines >= nrow - 1)
2923	{	2291	{
…		…
2951	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))	2319	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2952	scr_add_lines (buf, str - buf, nlines);	2320	scr_add_lines (buf, str - buf, nlines);
2953		2321
2954	/*	2322	/*
2955	* If there have been a lot of new lines, then update the screen	2323	* If there have been a lot of new lines, then update the screen
2956	* What the heck I'll cheat and only refresh less than every page-full.	2324	* What the heck we'll cheat and only refresh less than every page-full.
2957	* the number of pages between refreshes is refresh_limit, which	2325	* if skipScroll is enabled.
2958	* is incremented here because we must be doing flat-out scrolling.
2959	*/	2326	*/
2960	if (refreshnow)	2327	if (refreshnow)
2961	{	2328	{
2962	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2963	refresh_limit++;
2964	else
2965	{
2966	flag = true;	2329	flag = true;
2967	//TODO: due to popular request, implement "skipscroll" option here
2968	scr_refresh ();	2330	scr_refresh ();
2969	want_refresh = 1;	2331	want_refresh = 1;
2970	}
2971	}	2332	}
2972		2333
2973	}	2334	}
2974	else	2335	else
2975	{	2336	{
…		…
3124	{	2485	{
3125	if ((buf[len++] = cmd_getc ()) == 'i')	2486	if ((buf[len++] = cmd_getc ()) == 'i')
3126	break; /* done = 1 */	2487	break; /* done = 1 */
3127	}	2488	}
3128	}	2489	}
3129		2490
3130	for (i = 0; i < len; i++)	2491	for (i = 0; i < len; i++)
3131	if (putc (buf[i], fd) == EOF)	2492	if (putc (buf[i], fd) == EOF)
3132	{	2493	{
3133	done = 1;	2494	done = 1;
3134	break;	2495	break;
…		…
3196	process_dcs_seq ();	2557	process_dcs_seq ();
3197	break;	2558	break;
3198	case 0x9b: /* CSI */	2559	case 0x9b: /* CSI */
3199	process_csi_seq ();	2560	process_csi_seq ();
3200	break;	2561	break;
3201	case 0x9d: /* CSI */	2562	case 0x9d: /* OSC */
3202	process_osc_seq ();	2563	process_osc_seq ();
3203	break;	2564	break;
3204	#endif	2565	#endif
3205	}	2566	}
3206	}	2567	}
…		…
3434	unicode_t ch, priv, i;	2795	unicode_t ch, priv, i;
3435	unsigned int nargs, p;	2796	unsigned int nargs, p;
3436	int n, ndef;	2797	int n, ndef;
3437	int arg[ESC_ARGS];	2798	int arg[ESC_ARGS];
3438		2799
3439	for (nargs = ESC_ARGS; nargs > 0;)	2800	memset (arg, 0, sizeof (arg));
3440	arg[--nargs] = 0;	2801	nargs = 0;
3441		2802
3442	priv = 0;	2803	priv = 0;
3443	ch = cmd_getc ();	2804	ch = cmd_getc ();
3444	if (ch >= '<' && ch <= '?')	2805	if (ch >= '<' && ch <= '?')
3445	{ /* '<' '=' '>' '?' */	2806	{ /* '<' '=' '>' '?' */
…		…
3489	switch (priv)	2850	switch (priv)
3490	{	2851	{
3491	case '>':	2852	case '>':
3492	if (ch == CSI_DA) /* secondary device attributes */	2853	if (ch == CSI_DA) /* secondary device attributes */
3493	{	2854	{
3494	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	2855	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3495	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2856	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
3496	//	2857	//
3497	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2858	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3498	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2859	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3499	// that we do not support xterm mouse reporting (should be 95 when we do).	2860	// that we do not support xterm mouse reporting (should be 95 when we do).
…		…
3952	int saveop = op;	3313	int saveop = op;
3953		3314
3954	dLocal (Display *, dpy);	3315	dLocal (Display *, dpy);
3955		3316
3956	assert (str != NULL);	3317	assert (str != NULL);
3957		3318
3958	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))	3319	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3959	return;	3320	return;
3960		3321
3961	switch (op)	3322	switch (op)
3962	{	3323	{
…		…
4057	break;	3418	break;
4058	case URxvt_Color_IT:	3419	case URxvt_Color_IT:
4059	process_color_seq (op, Color_IT, str, resp);	3420	process_color_seq (op, Color_IT, str, resp);
4060	break;	3421	break;
4061	#endif	3422	#endif
4062	#if TRANSPARENT && TINTING	3423	#if ENABLE_TRANSPARENCY
4063	case URxvt_Color_tint:	3424	case URxvt_Color_tint:
4064	process_color_seq (op, Color_tint, str, resp);	3425	process_color_seq (op, Color_tint, str, resp);
		3426	{
		3427	bool changed = false;
		3428	if (ISSET_PIXCOLOR (Color_tint))
		3429	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3430	else
		3431	changed = bgPixmap.unset_tint ();
		3432	if (changed)
		3433	bgPixmap.render ();
		3434	}
4065		3435
4066	check_our_parents ();
4067
4068	if (am_transparent)
4069	want_full_refresh = want_refresh = 1;
4070
4071	break;	3436	break;
4072	#endif	3437	#endif
4073		3438
		3439	#if XPM_BACKGROUND
4074	case Rxvt_Pixmap:	3440	case Rxvt_Pixmap:
		3441	if (!strcmp (str, "?"))
4075	{	3442	{
		3443	char str[256];
		3444
		3445	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
		3446	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
		3447	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3448	process_xterm_seq (XTerm_title, str, CHAR_ST);
		3449	}
		3450	else
		3451	{
		3452	int changed = 0;
		3453
4076	if (*str != ';')	3454	if (*str != ';')
4077	{	3455	{
4078	#if XPM_BACKGROUND
4079	scale_pixmap (""); /* reset to default scaling */	3456	/* reset to default scaling :*/
		3457	bgPixmap.unset_geometry ();
4080	set_bgPixmap (str); /* change pixmap */	3458	if (bgPixmap.set_file (str)) /* change pixmap */
		3459	changed++;
		3460	str = strchr (str, ';');
		3461	if (str == NULL)
		3462	bgPixmap.set_defaultGeometry ();
		3463	}
		3464	while (str)
		3465	{
		3466	str++;
		3467	if (bgPixmap.set_geometry (str))
		3468	changed++;
		3469	str = strchr (str, ';');
		3470	}
		3471	if (changed)
		3472	{
		3473	bgPixmap.render ();
4081	scr_touch (true);	3474	scr_touch (true);
4082	#endif
4083	}	3475	}
4084
4085	int changed = 0;
4086
4087	while ((str = strchr (str, ';')) != NULL)
4088	{
4089	str++;
4090	#if XPM_BACKGROUND
4091	changed += scale_pixmap (str);
4092	#endif
4093	}	3476	}
4094		3477	break;
4095	if (changed)
4096	{
4097	#ifdef XPM_BACKGROUND
4098	resize_pixmap ();
4099	scr_touch (true);
4100	#endif
4101	}
4102	#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103	if (option(Opt_transparent))
4104	check_our_parents ();
4105	#endif	3478	#endif
4106
4107	}
4108	break;
4109		3479
4110	case Rxvt_restoreFG:	3480	case Rxvt_restoreFG:
4111	set_window_color (Color_fg, str);	3481	set_window_color (Color_fg, str);
4112	break;	3482	break;
4113	case Rxvt_restoreBG:	3483	case Rxvt_restoreBG:
…		…
4235	{	3605	{
4236	unsigned int i, j;	3606	unsigned int i, j;
4237	int state;	3607	int state;
4238		3608
4239	static const struct	3609	static const struct
4240	{	3610	{
4241	const int argval;	3611	const int argval;
4242	const unsigned long bit;	3612	const unsigned long bit;
4243	}
4244
4245	argtopriv[] = {	3613	} argtopriv[] = {
4246	{ 1, PrivMode_aplCUR },	3614	{ 1, PrivMode_aplCUR },
4247	{ 2, PrivMode_vt52 },	3615	{ 2, PrivMode_vt52 },
4248	{ 3, PrivMode_132 },	3616	{ 3, PrivMode_132 },
4249	{ 4, PrivMode_smoothScroll },	3617	{ 4, PrivMode_smoothScroll },
4250	{ 5, PrivMode_rVideo },	3618	{ 5, PrivMode_rVideo },

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC vs. Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC