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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.328 by ayin, Mon Jun 11 17:40:15 2007 UTC vs.
Revision 1.348 by sasha, Thu Aug 16 21:26:20 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:
…		…
1480	&& ev.xfocus.mode != NotifyGrab)	1474	&& ev.xfocus.mode != NotifyGrab)
1481	focus_out ();	1475	focus_out ();
1482	break;	1476	break;
1483		1477
1484	case ConfigureNotify:	1478	case ConfigureNotify:
		1479	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1480	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1481	szHint.width, szHint.height);*/
1485	if (ev.xconfigure.window == parent[0])	1482	if (ev.xconfigure.window == parent[0])
1486	{	1483	{
1487	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1484	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488	;	1485	;
1489		1486
1490	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1487	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1491	{	1488	{
1492	seen_resize = 1;	1489	seen_resize = 1;
1493	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1490	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	}	1491	}
1502		1492	else
		1493	{
		1494	#ifdef ENABLE_TRANSPARENCY
		1495	if (option (Opt_transparent))
		1496	update_background ();
		1497	#endif
		1498	}
1503	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1499	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	}	1500	}
1510	break;	1501	break;
1511		1502
1512	case PropertyNotify:	1503	case PropertyNotify:
1513	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1504	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1544	text_blink_ev.stop ();	1535	text_blink_ev.stop ();
1545	#endif	1536	#endif
1546	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1537	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547	break;	1538	break;
1548		1539
1549	#ifdef TRANSPARENT	1540	#ifdef ENABLE_TRANSPARENCY
1550	case ReparentNotify:	1541	case ReparentNotify:
1551	rootwin_cb (ev);	1542	rootwin_cb (ev);
1552	break;	1543	break;
1553	#endif /* TRANSPARENT */	1544	#endif /* ENABLE_TRANSPARENCY */
1554		1545
1555	case GraphicsExpose:	1546	case GraphicsExpose:
1556	case Expose:	1547	case Expose:
1557	if (ev.xany.window == vt)	1548	if (ev.xany.window == vt)
1558	{	1549	{
…		…
1581	if (isScrollbarWindow (ev.xany.window))	1572	if (isScrollbarWindow (ev.xany.window))
1582	{	1573	{
1583	scrollBar.setIdle ();	1574	scrollBar.setIdle ();
1584	scrollbar_show (0);	1575	scrollbar_show (0);
1585	}	1576	}
1586
1587	#ifdef TRANSPARENT
1588	if (am_transparent && ev.xany.window == parent[0])
1589	XClearWindow (dpy, ev.xany.window);
1590	#endif
1591	}	1577	}
1592	break;	1578	break;
1593		1579
1594	case MotionNotify:	1580	case MotionNotify:
1595	#ifdef POINTER_BLANK	1581	#ifdef POINTER_BLANK
…		…
1693	&ev.xbutton.x, &ev.xbutton.y,	1679	&ev.xbutton.x, &ev.xbutton.y,
1694	&unused_mask);	1680	&unused_mask);
1695	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1681	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696	scrollbar_size ());	1682	scrollbar_size ());
1697	want_refresh = 1;	1683	want_refresh = 1;
1698	refresh_limit = 0;
1699	scrollbar_show (1);	1684	scrollbar_show (1);
1700	}	1685	}
1701	break;	1686	break;
1702	}	1687	}
1703		1688
…		…
1785		1770
1786	#if ENABLE_FRILLS \|\| ISO_14755	1771	#if ENABLE_FRILLS \|\| ISO_14755
1787	if (iso14755buf)	1772	if (iso14755buf)
1788	{	1773	{
1789	iso14755buf = 0;	1774	iso14755buf = 0;
1790	# if ENABLE_OVERLAY	1775	# if ISO_14755
1791	scr_overlay_off ();	1776	scr_overlay_off ();
1792	# endif	1777	# endif
1793	}	1778	}
1794	#endif	1779	#endif
1795	#if USE_XIM	1780	#if USE_XIM
…		…
1822	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1807	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823	}	1808	}
1824	#endif	1809	#endif
1825	}	1810	}
1826		1811
1827	#if TRANSPARENT \|\| ENABLE_PERL	1812	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1828	void	1813	void
1829	rxvt_term::rootwin_cb (XEvent &ev)	1814	rxvt_term::rootwin_cb (XEvent &ev)
1830	{	1815	{
1831	make_current ();	1816	make_current ();
1832		1817
1833	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1818	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1819	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835	return;	1820	return;
1836		1821
1837	# if TRANSPARENT	1822	# if ENABLE_TRANSPARENCY
1838	switch (ev.type)	1823	switch (ev.type)
1839	{	1824	{
1840	case PropertyNotify:	1825	case PropertyNotify:
1841	/*	1826	/*
1842	* if user used some Esetroot compatible prog to set the root bg,	1827	* 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.	1828	* use the property to determine the pixmap. We use it later on.
1844	*/	1829	*/
1845	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1830	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1831	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847	return;	1832	{
1848		1833	bgPixmap.set_root_pixmap ();
1849	/* FALLTHROUGH */	1834	update_background ();
1850	case ReparentNotify:	1835	}
1851	if (option (Opt_transparent))
1852	check_our_parents ();
1853	break;	1836	break;
1854	}	1837	}
1855	# endif	1838	# endif
1856	}	1839	}
1857	#endif	1840	#endif
…		…
2291	if (ch == C0_LF)	2274	if (ch == C0_LF)
2292	nlines++;	2275	nlines++;
2293		2276
2294	refresh_count++;	2277	refresh_count++;
2295		2278
2296	if (!option (Opt_jumpScroll)	2279	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2297	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2298	{	2280	{
2299	refreshnow = true;
2300	refresh_count = 0;	2281	refresh_count = 0;
		2282
		2283	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)
		2284	{
		2285	refreshnow = true;
2301	ch = NOCHAR;	2286	ch = NOCHAR;
2302	break;	2287	break;
		2288	}
2303	}	2289	}
2304		2290
2305	// scr_add_lines only works for nlines <= nrow - 1.	2291	// scr_add_lines only works for nlines <= nrow - 1.
2306	if (nlines >= nrow - 1)	2292	if (nlines >= nrow - 1)
2307	{	2293	{
…		…
2335	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))	2321	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336	scr_add_lines (buf, str - buf, nlines);	2322	scr_add_lines (buf, str - buf, nlines);
2337		2323
2338	/*	2324	/*
2339	* If there have been a lot of new lines, then update the screen	2325	* If there have been a lot of new lines, then update the screen
2340	* What the heck I'll cheat and only refresh less than every page-full.	2326	* What the heck we'll cheat and only refresh less than every page-full.
2341	* the number of pages between refreshes is refresh_limit, which	2327	* if skipScroll is enabled.
2342	* is incremented here because we must be doing flat-out scrolling.
2343	*/	2328	*/
2344	if (refreshnow)	2329	if (refreshnow)
2345	{	2330	{
2346	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347	refresh_limit++;
2348	else
2349	{
2350	flag = true;	2331	flag = true;
2351	//TODO: due to popular request, implement "skipscroll" option here
2352	scr_refresh ();	2332	scr_refresh ();
2353	want_refresh = 1;	2333	want_refresh = 1;
2354	}
2355	}	2334	}
2356		2335
2357	}	2336	}
2358	else	2337	else
2359	{	2338	{
…		…
2508	{	2487	{
2509	if ((buf[len++] = cmd_getc ()) == 'i')	2488	if ((buf[len++] = cmd_getc ()) == 'i')
2510	break; /* done = 1 */	2489	break; /* done = 1 */
2511	}	2490	}
2512	}	2491	}
2513		2492
2514	for (i = 0; i < len; i++)	2493	for (i = 0; i < len; i++)
2515	if (putc (buf[i], fd) == EOF)	2494	if (putc (buf[i], fd) == EOF)
2516	{	2495	{
2517	done = 1;	2496	done = 1;
2518	break;	2497	break;
…		…
2580	process_dcs_seq ();	2559	process_dcs_seq ();
2581	break;	2560	break;
2582	case 0x9b: /* CSI */	2561	case 0x9b: /* CSI */
2583	process_csi_seq ();	2562	process_csi_seq ();
2584	break;	2563	break;
2585	case 0x9d: /* CSI */	2564	case 0x9d: /* OSC */
2586	process_osc_seq ();	2565	process_osc_seq ();
2587	break;	2566	break;
2588	#endif	2567	#endif
2589	}	2568	}
2590	}	2569	}
…		…
2818	unicode_t ch, priv, i;	2797	unicode_t ch, priv, i;
2819	unsigned int nargs, p;	2798	unsigned int nargs, p;
2820	int n, ndef;	2799	int n, ndef;
2821	int arg[ESC_ARGS];	2800	int arg[ESC_ARGS];
2822		2801
2823	for (nargs = ESC_ARGS; nargs > 0;)	2802	memset (arg, 0, sizeof (arg));
2824	arg[--nargs] = 0;	2803	nargs = 0;
2825		2804
2826	priv = 0;	2805	priv = 0;
2827	ch = cmd_getc ();	2806	ch = cmd_getc ();
2828	if (ch >= '<' && ch <= '?')	2807	if (ch >= '<' && ch <= '?')
2829	{ /* '<' '=' '>' '?' */	2808	{ /* '<' '=' '>' '?' */
…		…
2873	switch (priv)	2852	switch (priv)
2874	{	2853	{
2875	case '>':	2854	case '>':
2876	if (ch == CSI_DA) /* secondary device attributes */	2855	if (ch == CSI_DA) /* secondary device attributes */
2877	{	2856	{
2878	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	2857	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2858	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880	//	2859	//
2881	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2860	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2861	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2883	// that we do not support xterm mouse reporting (should be 95 when we do).	2862	// that we do not support xterm mouse reporting (should be 95 when we do).
…		…
3336	int saveop = op;	3315	int saveop = op;
3337		3316
3338	dLocal (Display *, dpy);	3317	dLocal (Display *, dpy);
3339		3318
3340	assert (str != NULL);	3319	assert (str != NULL);
3341		3320
3342	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))	3321	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343	return;	3322	return;
3344		3323
3345	switch (op)	3324	switch (op)
3346	{	3325	{
…		…
3441	break;	3420	break;
3442	case URxvt_Color_IT:	3421	case URxvt_Color_IT:
3443	process_color_seq (op, Color_IT, str, resp);	3422	process_color_seq (op, Color_IT, str, resp);
3444	break;	3423	break;
3445	#endif	3424	#endif
3446	#if TRANSPARENT && TINTING	3425	#if ENABLE_TRANSPARENCY
3447	case URxvt_Color_tint:	3426	case URxvt_Color_tint:
3448	process_color_seq (op, Color_tint, str, resp);	3427	process_color_seq (op, Color_tint, str, resp);
		3428	{
		3429	bool changed = false;
		3430	if (ISSET_PIXCOLOR (Color_tint))
		3431	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3432	else
		3433	changed = bgPixmap.unset_tint ();
		3434	if (changed)
		3435	update_background ();
		3436	}
3449		3437
3450	check_our_parents ();
3451
3452	if (am_transparent)
3453	want_full_refresh = want_refresh = 1;
3454
3455	break;	3438	break;
3456	#endif	3439	#endif
3457		3440
		3441	#if XPM_BACKGROUND
3458	case Rxvt_Pixmap:	3442	case Rxvt_Pixmap:
3459	{	3443	if (!strcmp (str, "?"))
3460	if (*str != ';')
3461	{	3444	{
3462	#if XPM_BACKGROUND	3445	char str[256];
3463	scale_pixmap (""); /* reset to default scaling */	3446
3464	set_bgPixmap (str); /* change pixmap */	3447	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3465	scr_touch (true);	3448	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466	#endif	3449	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3450	process_xterm_seq (XTerm_title, str, CHAR_ST);
3467	}	3451	}
3468		3452	else
		3453	{
3469	int changed = 0;	3454	int changed = 0;
3470		3455
3471	while ((str = strchr (str, ';')) != NULL)	3456	if (*str != ';')
3472	{	3457	{
		3458	/* reset to default scaling :*/
		3459	bgPixmap.unset_geometry ();
		3460	if (bgPixmap.set_file (str)) /* change pixmap */
		3461	changed++;
		3462	str = strchr (str, ';');
		3463	if (str == NULL)
		3464	bgPixmap.set_defaultGeometry ();
		3465	}
		3466	while (str)
		3467	{
3473	str++;	3468	str++;
3474	#if XPM_BACKGROUND	3469	if (bgPixmap.set_geometry (str))
3475	changed += scale_pixmap (str);	3470	changed++;
3476	#endif	3471	str = strchr (str, ';');
3477	}	3472	}
3478
3479	if (changed)	3473	if (changed)
3480	{	3474	update_background ();
3481	#ifdef XPM_BACKGROUND
3482	resize_pixmap ();
3483	scr_touch (true);
3484	#endif
3485	}	3475	}
3486	#if TRANSPARENT && defined(HAVE_AFTERIMAGE)	3476	break;
3487	if (option(Opt_transparent))
3488	check_our_parents ();
3489	#endif	3477	#endif
3490
3491	}
3492	break;
3493		3478
3494	case Rxvt_restoreFG:	3479	case Rxvt_restoreFG:
3495	set_window_color (Color_fg, str);	3480	set_window_color (Color_fg, str);
3496	break;	3481	break;
3497	case Rxvt_restoreBG:	3482	case Rxvt_restoreBG:
…		…
3619	{	3604	{
3620	unsigned int i, j;	3605	unsigned int i, j;
3621	int state;	3606	int state;
3622		3607
3623	static const struct	3608	static const struct
3624	{	3609	{
3625	const int argval;	3610	const int argval;
3626	const unsigned long bit;	3611	const unsigned long bit;
3627	}
3628
3629	argtopriv[] = {	3612	} argtopriv[] = {
3630	{ 1, PrivMode_aplCUR },	3613	{ 1, PrivMode_aplCUR },
3631	{ 2, PrivMode_vt52 },	3614	{ 2, PrivMode_vt52 },
3632	{ 3, PrivMode_132 },	3615	{ 3, PrivMode_132 },
3633	{ 4, PrivMode_smoothScroll },	3616	{ 4, PrivMode_smoothScroll },
3634	{ 5, PrivMode_rVideo },	3617	{ 5, PrivMode_rVideo },

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.328 by ayin, Mon Jun 11 17:40:15 2007 UTC vs. Revision 1.348 by sasha, Thu Aug 16 21:26:20 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.328 by ayin, Mon Jun 11 17:40:15 2007 UTC vs.
Revision 1.348 by sasha, Thu Aug 16 21:26:20 2007 UTC