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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.355 by ayin, Fri Sep 14 09:46:18 2007 UTC vs.
Revision 1.362 by ayin, Sat Nov 10 16:04:49 2007 UTC

…		…
596	newlen = 0;	596	newlen = 0;
597	}	597	}
598	break;	598	break;
599		599
600	#ifdef XK_KP_Left	600	#ifdef XK_KP_Left
		601	case XK_KP_Left: /* \033Ot or standard */
601	case XK_KP_Up: /* \033Ox or standard */	602	case XK_KP_Up: /* \033Ox or standard */
		603	case XK_KP_Right: /* \033Ov or standard */
602	case XK_KP_Down: /* \033Or or standard */	604	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */
605	if (kp)	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;
…		…
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 HAVE_BG_PIXMAP
		1041	if (bgPixmap.check_clearChanged ())
		1042	{
		1043	// scr_clear (true); This needs to be researched further!
		1044	scr_touch (false);
		1045	}
		1046	#endif
		1047
1040	if (want_refresh)	1048	if (want_refresh)
1041	{	1049	{
1042	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	1050	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043	{	1051	{
1044	int row = view_start;	1052	int row = view_start;
…		…
1293	void	1301	void
1294	rxvt_term::mouse_report (XButtonEvent &ev)	1302	rxvt_term::mouse_report (XButtonEvent &ev)
1295	{	1303	{
1296	int button_number, key_state = 0;	1304	int button_number, key_state = 0;
1297	int x, y;	1305	int x, y;
		1306	int code = 32;
1298		1307
1299	x = ev.x;	1308	x = Pixel2Col (ev.x);
1300	y = ev.y;	1309	y = Pixel2Row (ev.y);
1301	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	}
1302		1317
1303	if (MEvent.button == AnyButton)	1318	if (MEvent.button == AnyButton)
1304	button_number = 3;	1319	button_number = 3;
1305	else	1320	else
1306	{	1321	{
…		…
1352	x + 1,	1367	x + 1,
1353	y + 1);	1368	y + 1);
1354	#endif	1369	#endif
1355		1370
1356	tt_printf ("\033[M%c%c%c",	1371	tt_printf ("\033[M%c%c%c",
1357	(32 + button_number + key_state),	1372	(code + button_number + key_state),
1358	(32 + x + 1),	1373	(32 + x + 1),
1359	(32 + y + 1));	1374	(32 + y + 1));
1360	}	1375	}
1361		1376
1362	/{{{ process an X event /	1377	/{{{ process an X event /
…		…
1466	&& ev.xfocus.mode != NotifyGrab)	1481	&& ev.xfocus.mode != NotifyGrab)
1467	focus_out ();	1482	focus_out ();
1468	break;	1483	break;
1469		1484
1470	case ConfigureNotify:	1485	case ConfigureNotify:
1471	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1486	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1487	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473	szHint.width, szHint.height);*/	1488	szHint.width, szHint.height); */
1474	if (ev.xconfigure.window == parent[0])	1489	if (ev.xconfigure.window == parent[0])
1475	{	1490	{
1476	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1491	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477	;	1492	;
1478		1493
…		…
1532	case GraphicsExpose:	1547	case GraphicsExpose:
1533	case Expose:	1548	case Expose:
1534	if (ev.xany.window == vt)	1549	if (ev.xany.window == vt)
1535	{	1550	{
1536	do	1551	do
		1552	{
1537	scr_expose (ev.xexpose.x, ev.xexpose.y,	1553	scr_expose (ev.xexpose.x, ev.xexpose.y,
1538	ev.xexpose.width, ev.xexpose.height, False);	1554	ev.xexpose.width, ev.xexpose.height, False);
		1555	}
1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1556	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540		1557
1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1558	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542		1559
1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1560	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1561	{
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1562	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1563	ev.xexpose.width, ev.xexpose.height, False);
1546		1564	}
1547	want_refresh = 1;	1565	want_refresh = 1;
1548	}	1566	}
1549	else	1567	else
1550	{	1568	{
1551	XEvent unused_event;	1569	XEvent unused_event;
…		…
1566	case MotionNotify:	1584	case MotionNotify:
1567	#ifdef POINTER_BLANK	1585	#ifdef POINTER_BLANK
1568	if (hidden_pointer)	1586	if (hidden_pointer)
1569	pointer_unblank ();	1587	pointer_unblank ();
1570	#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);
1571	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1592	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572	break;	1593	break;
1573		1594
1574	if (ev.xany.window == vt)	1595	if (ev.xany.window == vt)
1575	{	1596	{
…		…
1729	}	1750	}
1730	#endif	1751	#endif
1731	#if ENABLE_FRILLS	1752	#if ENABLE_FRILLS
1732	if (option (Opt_urgentOnBell))	1753	if (option (Opt_urgentOnBell))
1733	{	1754	{
1734	XWMHints *h;
1735
1736	h = XGetWMHints(dpy, parent[0]);	1755	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737	if (h != NULL)
1738	{	1756	{
1739	h->flags &= ~XUrgencyHint;	1757	h->flags &= ~XUrgencyHint;
1740	XSetWMHints(dpy, parent[0], h);	1758	XSetWMHints (dpy, parent[0], h);
1741	}	1759	}
1742	}	1760	}
1743	#endif	1761	#endif
1744	}	1762	}
1745	}	1763	}
…		…
2841	{	2859	{
2842	// 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,
2843	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2861	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844	//	2862	//
2845	// 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
2846	// 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
2847	// that we do not support xterm mouse reporting (should be 95 when we do).	2865	// versions.
2848	//	2866	//
2849	tt_printf ("\033[>%d;94;0c", 'U');	2867	tt_printf ("\033[>%d;95;0c", 'U');
2850	}	2868	}
2851	break;	2869	break;
2852	case '?':	2870	case '?':
2853	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2871	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2854	process_terminal_mode (ch, priv, nargs, arg);	2872	process_terminal_mode (ch, priv, nargs, arg);
…		…
3619	#ifndef NO_BACKSPACE_KEY	3637	#ifndef NO_BACKSPACE_KEY
3620	{ 67, PrivMode_BackSpace },	3638	{ 67, PrivMode_BackSpace },
3621	#endif	3639	#endif
3622	{ 1000, PrivMode_MouseX11 },	3640	{ 1000, PrivMode_MouseX11 },
3623	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3641	// 1001 Use Hilite Mouse Tracking. NYI, TODO
3624	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3642	{ 1002, PrivMode_MouseBtnEvent },
3625	// 1003 Use All Motion Mouse Tracking. NYI, TODO	3643	{ 1003, PrivMode_MouseAnyEvent },
3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3644	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627	{ 1011, PrivMode_Keypress }, // rxvt extension	3645	{ 1011, PrivMode_Keypress }, // rxvt extension
3628	// 1035 enable modifiers for alt, numlock NYI	3646	// 1035 enable modifiers for alt, numlock NYI
3629	// 1036 send ESC for meta keys NYI	3647	// 1036 send ESC for meta keys NYI
3630	// 1037 send DEL for keypad delete NYI	3648	// 1037 send DEL for keypad delete NYI
…		…
3704	scr_autowrap (state);	3722	scr_autowrap (state);
3705	break;	3723	break;
3706	/* 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 */
3707	case 9: /* X10 mouse reporting */	3725	case 9: /* X10 mouse reporting */
3708	if (state) /* orthogonal */	3726	if (state) /* orthogonal */
3709	priv_modes &= ~PrivMode_MouseX11;	3727	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3710	break;	3728	break;
3711	#ifdef scrollBar_esc	3729	#ifdef scrollBar_esc
3712	case scrollBar_esc:	3730	case scrollBar_esc:
3713	if (scrollbar_mapping (state))	3731	if (scrollbar_mapping (state))
3714	{	3732	{
…		…
3727	break;	3745	break;
3728	/* case 66: - application key pad */	3746	/* case 66: - application key pad */
3729	/* case 67: - backspace key */	3747	/* case 67: - backspace key */
3730	case 1000: /* X11 mouse reporting */	3748	case 1000: /* X11 mouse reporting */
3731	if (state) /* orthogonal */	3749	if (state) /* orthogonal */
3732	priv_modes &= ~PrivMode_MouseX10;	3750	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3733	break;	3751	break;
3734	#if 0	3752	#if 0
3735	case 1001:	3753	case 1001:
3736	break; /* X11 mouse highlighting */	3754	break; /* X11 mouse highlighting */
3737	#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;
3738	case 1010: /* scroll to bottom on TTY output inhibit */	3766	case 1010: /* scroll to bottom on TTY output inhibit */
3739	set_option (Opt_scrollTtyOutput, !state);	3767	set_option (Opt_scrollTtyOutput, !state);
3740	break;	3768	break;
3741	case 1011: /* scroll to bottom on key press */	3769	case 1011: /* scroll to bottom on key press */
3742	set_option (Opt_scrollTtyKeypress, state);	3770	set_option (Opt_scrollTtyKeypress, state);

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.355 by ayin, Fri Sep 14 09:46:18 2007 UTC vs. Revision 1.362 by ayin, Sat Nov 10 16:04:49 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.355 by ayin, Fri Sep 14 09:46:18 2007 UTC vs.
Revision 1.362 by ayin, Sat Nov 10 16:04:49 2007 UTC