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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.337 by ayin, Sat Jul 28 20:04:00 2007 UTC vs.
Revision 1.361 by ayin, Wed Oct 31 09:55:23 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,
…		…
548	#endif	547	#endif
549		548
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	550	{
552	{	551	{
		552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	553	newlen = 1;
554	switch (keysym)	554	switch (keysym)
555	{	555	{
556	#ifndef NO_BACKSPACE_KEY	556	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	557	case XK_BackSpace:
…		…
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';	561	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';	562	kbuf[1] = '\0';
563	}	563	}
564	else	564	else
565	strcpy (kbuf, key_backspace);	565	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	566	break;
567	#endif	567	#endif
568	#ifndef NO_DELETE_KEY	568	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Prior	569	# ifdef XK_KP_Delete
570	case XK_KP_Delete:	570	case XK_KP_Delete:
571	/* allow shift to override */	571	/* allow shift to override */
572	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	572	if (kp)
573	{	573	{
574	strcpy (kbuf, "\033On");	574	strcpy (kbuf, "\033On");
575	break;	575	break;
576	}	576	}
577	/* FALLTHROUGH */	577	/* FALLTHROUGH */
578	# endif	578	# endif
579	case XK_Delete:	579	case XK_Delete:
580	strcpy (kbuf, key_delete);	580	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	581	break;
582	#endif	582	#endif
583	case XK_Tab:	583	case XK_Tab:
584	if (shft)	584	if (shft)
585	strcpy (kbuf, "\033[Z");	585	strcpy (kbuf, "\033[Z");
…		…
600	#ifdef XK_KP_Left	600	#ifdef XK_KP_Left
601	case XK_KP_Up: /* \033Ox or standard */	601	case XK_KP_Up: /* \033Ox or standard */
602	case XK_KP_Down: /* \033Or or standard */	602	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */	603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */	604	case XK_KP_Left: /* \033Ot or standard */
605	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	605	if (kp)
606	{	606	{
607	strcpy (kbuf, "\033OZ");	607	strcpy (kbuf, "\033OZ");
608	kbuf[2] = "txvr"[keysym - XK_KP_Left];	608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
609	break;	609	break;
610	}	610	}
…		…
633		633
634	#ifndef UNSHIFTED_SCROLLKEYS	634	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior	635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:	636	case XK_KP_Prior:
637	/* allow shift to override */	637	/* allow shift to override */
638	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	638	if (kp)
639	{	639	{
640	strcpy (kbuf, "\033Oy");	640	strcpy (kbuf, "\033Oy");
641	break;	641	break;
642	}	642	}
643	/* FALLTHROUGH */	643	/* FALLTHROUGH */
…		…
646	strcpy (kbuf, "\033[5~");	646	strcpy (kbuf, "\033[5~");
647	break;	647	break;
648	# ifdef XK_KP_Next	648	# ifdef XK_KP_Next
649	case XK_KP_Next:	649	case XK_KP_Next:
650	/* allow shift to override */	650	/* allow shift to override */
651	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	651	if (kp)
652	{	652	{
653	strcpy (kbuf, "\033Os");	653	strcpy (kbuf, "\033Os");
654	break;	654	break;
655	}	655	}
656	/* FALLTHROUGH */	656	/* FALLTHROUGH */
…		…
659	strcpy (kbuf, "\033[6~");	659	strcpy (kbuf, "\033[6~");
660	break;	660	break;
661	#endif	661	#endif
662	case XK_KP_Enter:	662	case XK_KP_Enter:
663	/* allow shift to override */	663	/* allow shift to override */
664	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	664	if (kp)
665	{	665	{
666	strcpy (kbuf, "\033OM");	666	strcpy (kbuf, "\033OM");
667	break;	667	break;
668	}	668	}
669		669
…		…
712	case XK_KP_6: /* "\033Ov" : "6" */	712	case XK_KP_6: /* "\033Ov" : "6" */
713	case XK_KP_7: /* "\033Ow" : "7" */	713	case XK_KP_7: /* "\033Ow" : "7" */
714	case XK_KP_8: /* "\033Ox" : "8" */	714	case XK_KP_8: /* "\033Ox" : "8" */
715	case XK_KP_9: /* "\033Oy" : "9" */	715	case XK_KP_9: /* "\033Oy" : "9" */
716	/* allow shift to override */	716	/* allow shift to override */
717	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	717	if (kp)
718	{	718	{
719	strcpy (kbuf, "\033Oj");	719	strcpy (kbuf, "\033Oj");
720	kbuf[2] += (keysym - XK_KP_Multiply);	720	kbuf[2] += (keysym - XK_KP_Multiply);
721	}	721	}
722	else	722	else
…		…
728		728
729	case XK_Find:	729	case XK_Find:
730	strcpy (kbuf, "\033[1~");	730	strcpy (kbuf, "\033[1~");
731	break;	731	break;
732		732
733	#ifdef XK_KP_End	733	#ifdef XK_KP_Insert
734	case XK_KP_Insert:	734	case XK_KP_Insert:
735	/* allow shift to override */	735	/* allow shift to override */
736	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	736	if (kp)
737	{	737	{
738	strcpy (kbuf, "\033Op");	738	strcpy (kbuf, "\033Op");
739	break;	739	break;
740	}	740	}
741	/* FALLTHROUGH */	741	/* FALLTHROUGH */
…		…
754	strcpy (kbuf, "\033[4~");	754	strcpy (kbuf, "\033[4~");
755	break;	755	break;
756	#ifdef XK_KP_End	756	#ifdef XK_KP_End
757	case XK_KP_End:	757	case XK_KP_End:
758	/* allow shift to override */	758	/* allow shift to override */
759	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	759	if (kp)
760	{	760	{
761	strcpy (kbuf, "\033Oq");	761	strcpy (kbuf, "\033Oq");
762	break;	762	break;
763	}	763	}
764	/* FALLTHROUGH */	764	/* FALLTHROUGH */
…		…
767	strcpy (kbuf, KS_END);	767	strcpy (kbuf, KS_END);
768	break;	768	break;
769	#ifdef XK_KP_Home	769	#ifdef XK_KP_Home
770	case XK_KP_Home:	770	case XK_KP_Home:
771	/* allow shift to override */	771	/* allow shift to override */
772	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	772	if (kp)
773	{	773	{
774	strcpy (kbuf, "\033Ow");	774	strcpy (kbuf, "\033Ow");
775	break;	775	break;
776	}	776	}
777	/* FALLTHROUGH */	777	/* FALLTHROUGH */
…		…
1035	void	1035	void
1036	rxvt_term::flush ()	1036	rxvt_term::flush ()
1037	{	1037	{
1038	flush_ev.stop ();	1038	flush_ev.stop ();
1039		1039
1040	#ifdef ENABLE_TRANSPARENCY	1040	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	1041	if (bgPixmap.check_clearChanged ())
1042	{	1042	{
1043	want_full_refresh = 0;	1043	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	1044	scr_touch (false);
1046	}	1045	}
1047	#endif	1046	#endif
1048		1047
1049	if (want_refresh)	1048	if (want_refresh)
…		…
1302	void	1301	void
1303	rxvt_term::mouse_report (XButtonEvent &ev)	1302	rxvt_term::mouse_report (XButtonEvent &ev)
1304	{	1303	{
1305	int button_number, key_state = 0;	1304	int button_number, key_state = 0;
1306	int x, y;	1305	int x, y;
		1306	int code = 32;
1307		1307
1308	x = ev.x;	1308	x = Pixel2Col (ev.x);
1309	y = ev.y;	1309	y = Pixel2Row (ev.y);
1310	pixel_position (&x, &y);	1310	if (ev.type == MotionNotify) {
		1311	if (x == mouse_row && y == mouse_col)
		1312	return;
		1313	mouse_row = x;
		1314	mouse_col = y;
		1315	code += 32;
		1316	}
1311		1317
1312	if (MEvent.button == AnyButton)	1318	if (MEvent.button == AnyButton)
1313	button_number = 3;	1319	button_number = 3;
1314	else	1320	else
1315	{	1321	{
…		…
1361	x + 1,	1367	x + 1,
1362	y + 1);	1368	y + 1);
1363	#endif	1369	#endif
1364		1370
1365	tt_printf ("\033[M%c%c%c",	1371	tt_printf ("\033[M%c%c%c",
1366	(32 + button_number + key_state),	1372	(code + button_number + key_state),
1367	(32 + x + 1),	1373	(32 + x + 1),
1368	(32 + y + 1));	1374	(32 + y + 1));
1369	}	1375	}
1370		1376
1371	/{{{ process an X event /	1377	/{{{ process an X event /
…		…
1475	&& ev.xfocus.mode != NotifyGrab)	1481	&& ev.xfocus.mode != NotifyGrab)
1476	focus_out ();	1482	focus_out ();
1477	break;	1483	break;
1478		1484
1479	case ConfigureNotify:	1485	case ConfigureNotify:
		1486	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1487	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1488	szHint.width, szHint.height); */
1480	if (ev.xconfigure.window == parent[0])	1489	if (ev.xconfigure.window == parent[0])
1481	{	1490	{
1482	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1491	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483	;	1492	;
1484		1493
1485	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1494	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1486	{	1495	{
1487	seen_resize = 1;	1496	seen_resize = 1;
1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1497	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489	#ifdef XPM_BACKGROUND
1490	if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491	{
1492	resize_pixmap ();
1493	scr_touch (true);
1494	}
1495	#endif
1496	}	1498	}
1497		1499	else
		1500	{
		1501	#ifdef HAVE_BG_PIXMAP
		1502	if (bgPixmap.window_position_sensitive ())
		1503	update_background ();
		1504	#endif
		1505	}
1498	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1506	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500	#ifdef ENABLE_TRANSPARENCY
1501	if (option (Opt_transparent))
1502	check_our_parents ();
1503	#endif
1504	}	1507	}
1505	break;	1508	break;
1506		1509
1507	case PropertyNotify:	1510	case PropertyNotify:
1508	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1511	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1539	text_blink_ev.stop ();	1542	text_blink_ev.stop ();
1540	#endif	1543	#endif
1541	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1544	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542	break;	1545	break;
1543		1546
1544	#ifdef ENABLE_TRANSPARENCY
1545	case ReparentNotify:
1546	rootwin_cb (ev);
1547	break;
1548	#endif /* ENABLE_TRANSPARENCY */
1549
1550	case GraphicsExpose:	1547	case GraphicsExpose:
1551	case Expose:	1548	case Expose:
1552	if (ev.xany.window == vt)	1549	if (ev.xany.window == vt)
1553	{	1550	{
1554	do	1551	do
		1552	{
1555	scr_expose (ev.xexpose.x, ev.xexpose.y,	1553	scr_expose (ev.xexpose.x, ev.xexpose.y,
1556	ev.xexpose.width, ev.xexpose.height, False);	1554	ev.xexpose.width, ev.xexpose.height, False);
		1555	}
1557	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1556	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558		1557
1559	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1558	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560		1559
1561	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1560	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1561	{
1562	scr_expose (ev.xexpose.x, ev.xexpose.y,	1562	scr_expose (ev.xexpose.x, ev.xexpose.y,
1563	ev.xexpose.width, ev.xexpose.height, False);	1563	ev.xexpose.width, ev.xexpose.height, False);
1564		1564	}
1565	want_refresh = 1;	1565	want_refresh = 1;
1566	}	1566	}
1567	else	1567	else
1568	{	1568	{
1569	XEvent unused_event;	1569	XEvent unused_event;
…		…
1576	if (isScrollbarWindow (ev.xany.window))	1576	if (isScrollbarWindow (ev.xany.window))
1577	{	1577	{
1578	scrollBar.setIdle ();	1578	scrollBar.setIdle ();
1579	scrollbar_show (0);	1579	scrollbar_show (0);
1580	}	1580	}
1581
1582	#ifdef ENABLE_TRANSPARENCY
1583	if (am_transparent && ev.xany.window == parent[0])
1584	XClearWindow (dpy, ev.xany.window);
1585	#endif
1586	}	1581	}
1587	break;	1582	break;
1588		1583
1589	case MotionNotify:	1584	case MotionNotify:
1590	#ifdef POINTER_BLANK	1585	#ifdef POINTER_BLANK
1591	if (hidden_pointer)	1586	if (hidden_pointer)
1592	pointer_unblank ();	1587	pointer_unblank ();
1593	#endif	1588	#endif
		1589	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1590	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1591	mouse_report (ev.xbutton);
1594	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1592	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595	break;	1593	break;
1596		1594
1597	if (ev.xany.window == vt)	1595	if (ev.xany.window == vt)
1598	{	1596	{
…		…
1752	}	1750	}
1753	#endif	1751	#endif
1754	#if ENABLE_FRILLS	1752	#if ENABLE_FRILLS
1755	if (option (Opt_urgentOnBell))	1753	if (option (Opt_urgentOnBell))
1756	{	1754	{
1757	XWMHints *h;
1758
1759	h = XGetWMHints(dpy, parent[0]);	1755	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1760	if (h != NULL)
1761	{	1756	{
1762	h->flags &= ~XUrgencyHint;	1757	h->flags &= ~XUrgencyHint;
1763	XSetWMHints(dpy, parent[0], h);	1758	XSetWMHints (dpy, parent[0], h);
1764	}	1759	}
1765	}	1760	}
1766	#endif	1761	#endif
1767	}	1762	}
1768	}	1763	}
…		…
1834	case PropertyNotify:	1829	case PropertyNotify:
1835	/*	1830	/*
1836	* if user used some Esetroot compatible prog to set the root bg,	1831	* if user used some Esetroot compatible prog to set the root bg,
1837	* use the property to determine the pixmap. We use it later on.	1832	* use the property to determine the pixmap. We use it later on.
1838	*/	1833	*/
1839	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1834	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1835	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841	return;	1836	{
1842		1837	bgPixmap.set_root_pixmap ();
1843	/* FALLTHROUGH */	1838	update_background ();
1844	case ReparentNotify:	1839	}
1845	if (option (Opt_transparent))
1846	check_our_parents ();
1847	break;	1840	break;
1848	}	1841	}
1849	# endif	1842	# endif
1850	}	1843	}
1851	#endif	1844	#endif
…		…
2806	rxvt_term::process_csi_seq ()	2799	rxvt_term::process_csi_seq ()
2807	{	2800	{
2808	unicode_t ch, priv, i;	2801	unicode_t ch, priv, i;
2809	unsigned int nargs, p;	2802	unsigned int nargs, p;
2810	int n, ndef;	2803	int n, ndef;
2811	int arg[ESC_ARGS];	2804	int arg[ESC_ARGS] = { };
2812		2805
2813	memset (arg, 0, sizeof (arg));
2814	nargs = 0;	2806	nargs = 0;
2815		2807
2816	priv = 0;	2808	priv = 0;
2817	ch = cmd_getc ();	2809	ch = cmd_getc ();
2818	if (ch >= '<' && ch <= '?')	2810	if (ch >= '<' && ch <= '?')
…		…
2867	{	2859	{
2868	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2860	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2861	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870	//	2862	//
2871	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2863	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2864	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873	// that we do not support xterm mouse reporting (should be 95 when we do).	2865	// versions.
2874	//	2866	//
2875	tt_printf ("\033[>%d;94;0c", 'U');	2867	tt_printf ("\033[>%d;95;0c", 'U');
2876	}	2868	}
2877	break;	2869	break;
2878	case '?':	2870	case '?':
2879	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2871	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2880	process_terminal_mode (ch, priv, nargs, arg);	2872	process_terminal_mode (ch, priv, nargs, arg);
…		…
3431	break;	3423	break;
3432	case URxvt_Color_IT:	3424	case URxvt_Color_IT:
3433	process_color_seq (op, Color_IT, str, resp);	3425	process_color_seq (op, Color_IT, str, resp);
3434	break;	3426	break;
3435	#endif	3427	#endif
3436	#if ENABLE_TRANSPARENCY && TINTING	3428	#if ENABLE_TRANSPARENCY
3437	case URxvt_Color_tint:	3429	case URxvt_Color_tint:
3438	process_color_seq (op, Color_tint, str, resp);	3430	process_color_seq (op, Color_tint, str, resp);
		3431	{
		3432	bool changed = false;
		3433	if (ISSET_PIXCOLOR (Color_tint))
		3434	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3435	else
		3436	changed = bgPixmap.unset_tint ();
		3437	if (changed)
		3438	update_background ();
		3439	}
3439		3440
3440	check_our_parents ();
3441
3442	if (am_transparent)
3443	want_full_refresh = want_refresh = 1;
3444
3445	break;	3441	break;
3446	#endif	3442	#endif
3447		3443
		3444	#if BG_IMAGE_FROM_FILE
3448	case Rxvt_Pixmap:	3445	case Rxvt_Pixmap:
3449	{	3446	if (!strcmp (str, "?"))
3450	if (*str != ';')
3451	{	3447	{
3452	#if XPM_BACKGROUND	3448	char str[256];
3453	scale_pixmap (""); /* reset to default scaling */	3449
3454	set_bgPixmap (str); /* change pixmap */	3450	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3455	scr_touch (true);	3451	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3456	#endif	3452	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3453	process_xterm_seq (XTerm_title, str, CHAR_ST);
3457	}	3454	}
3458		3455	else
		3456	{
3459	int changed = 0;	3457	int changed = 0;
3460		3458
3461	while ((str = strchr (str, ';')) != NULL)	3459	if (*str != ';')
3462	{	3460	{
		3461	/* reset to default scaling :*/
		3462	bgPixmap.unset_geometry ();
		3463	if (bgPixmap.set_file (str)) /* change pixmap */
		3464	changed++;
		3465	str = strchr (str, ';');
		3466	if (str == NULL)
		3467	bgPixmap.set_defaultGeometry ();
		3468	}
		3469	while (str)
		3470	{
3463	str++;	3471	str++;
3464	#if XPM_BACKGROUND	3472	if (bgPixmap.set_geometry (str))
3465	changed += scale_pixmap (str);	3473	changed++;
3466	#endif	3474	str = strchr (str, ';');
3467	}	3475	}
3468
3469	if (changed)	3476	if (changed)
3470	{	3477	update_background ();
3471	#ifdef XPM_BACKGROUND
3472	resize_pixmap ();
3473	scr_touch (true);
3474	#endif
3475	}	3478	}
3476	#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477	if (option (Opt_transparent))
3478	check_our_parents ();
3479	#endif
3480	}
3481	break;	3479	break;
		3480	#endif
3482		3481
3483	case Rxvt_restoreFG:	3482	case Rxvt_restoreFG:
3484	set_window_color (Color_fg, str);	3483	set_window_color (Color_fg, str);
3485	break;	3484	break;
3486	case Rxvt_restoreBG:	3485	case Rxvt_restoreBG:
…		…
3608	{	3607	{
3609	unsigned int i, j;	3608	unsigned int i, j;
3610	int state;	3609	int state;
3611		3610
3612	static const struct	3611	static const struct
3613	{	3612	{
3614	const int argval;	3613	const int argval;
3615	const unsigned long bit;	3614	const unsigned long bit;
3616	}
3617
3618	argtopriv[] = {	3615	} argtopriv[] = {
3619	{ 1, PrivMode_aplCUR },	3616	{ 1, PrivMode_aplCUR },
3620	{ 2, PrivMode_vt52 },	3617	{ 2, PrivMode_vt52 },
3621	{ 3, PrivMode_132 },	3618	{ 3, PrivMode_132 },
3622	{ 4, PrivMode_smoothScroll },	3619	{ 4, PrivMode_smoothScroll },
3623	{ 5, PrivMode_rVideo },	3620	{ 5, PrivMode_rVideo },
…		…
3640	#ifndef NO_BACKSPACE_KEY	3637	#ifndef NO_BACKSPACE_KEY
3641	{ 67, PrivMode_BackSpace },	3638	{ 67, PrivMode_BackSpace },
3642	#endif	3639	#endif
3643	{ 1000, PrivMode_MouseX11 },	3640	{ 1000, PrivMode_MouseX11 },
3644	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3641	// 1001 Use Hilite Mouse Tracking. NYI, TODO
3645	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3642	{ 1002, PrivMode_MouseBtnEvent },
3646	// 1003 Use All Motion Mouse Tracking. NYI, TODO	3643	{ 1003, PrivMode_MouseAnyEvent },
3647	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3644	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3648	{ 1011, PrivMode_Keypress }, // rxvt extension	3645	{ 1011, PrivMode_Keypress }, // rxvt extension
3649	// 1035 enable modifiers for alt, numlock NYI	3646	// 1035 enable modifiers for alt, numlock NYI
3650	// 1036 send ESC for meta keys NYI	3647	// 1036 send ESC for meta keys NYI
3651	// 1037 send DEL for keypad delete NYI	3648	// 1037 send DEL for keypad delete NYI
…		…
3725	scr_autowrap (state);	3722	scr_autowrap (state);
3726	break;	3723	break;
3727	/* case 8: - auto repeat, can't do on a per window basis */	3724	/* case 8: - auto repeat, can't do on a per window basis */
3728	case 9: /* X10 mouse reporting */	3725	case 9: /* X10 mouse reporting */
3729	if (state) /* orthogonal */	3726	if (state) /* orthogonal */
3730	priv_modes &= ~PrivMode_MouseX11;	3727	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3731	break;	3728	break;
3732	#ifdef scrollBar_esc	3729	#ifdef scrollBar_esc
3733	case scrollBar_esc:	3730	case scrollBar_esc:
3734	if (scrollbar_mapping (state))	3731	if (scrollbar_mapping (state))
3735	{	3732	{
…		…
3748	break;	3745	break;
3749	/* case 66: - application key pad */	3746	/* case 66: - application key pad */
3750	/* case 67: - backspace key */	3747	/* case 67: - backspace key */
3751	case 1000: /* X11 mouse reporting */	3748	case 1000: /* X11 mouse reporting */
3752	if (state) /* orthogonal */	3749	if (state) /* orthogonal */
3753	priv_modes &= ~PrivMode_MouseX10;	3750	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3754	break;	3751	break;
3755	#if 0	3752	#if 0
3756	case 1001:	3753	case 1001:
3757	break; /* X11 mouse highlighting */	3754	break; /* X11 mouse highlighting */
3758	#endif	3755	#endif
		3756	case 1002:
		3757	case 1003:
		3758	if (state) {
		3759	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3760	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3761	vt_emask_mouse = PointerMotionMask;
		3762	} else
		3763	vt_emask_mouse = NoEventMask;
		3764	vt_select_input ();
		3765	break;
3759	case 1010: /* scroll to bottom on TTY output inhibit */	3766	case 1010: /* scroll to bottom on TTY output inhibit */
3760	set_option (Opt_scrollTtyOutput, !state);	3767	set_option (Opt_scrollTtyOutput, !state);
3761	break;	3768	break;
3762	case 1011: /* scroll to bottom on key press */	3769	case 1011: /* scroll to bottom on key press */
3763	set_option (Opt_scrollTtyKeypress, state);	3770	set_option (Opt_scrollTtyKeypress, state);
…		…
4015		4022
4016	if (v_buflen == 0)	4023	if (v_buflen == 0)
4017	{	4024	{
4018	free (v_buffer);	4025	free (v_buffer);
4019	v_buffer = 0;	4026	v_buffer = 0;
4020	v_buflen = 0;
4021		4027
4022	pty_ev.set (EVENT_READ);	4028	pty_ev.set (EVENT_READ);
4023	return;	4029	return;
4024	}	4030	}
4025		4031

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.337 by ayin, Sat Jul 28 20:04:00 2007 UTC vs. Revision 1.361 by ayin, Wed Oct 31 09:55:23 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.337 by ayin, Sat Jul 28 20:04:00 2007 UTC vs.
Revision 1.361 by ayin, Wed Oct 31 09:55:23 2007 UTC