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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC vs.
Revision 1.318 by root, Sat Jan 13 15:26:56 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: command.C	2	* File: command.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
298		298
299	return -1;	299	return -1;
300	}	300	}
301	#endif	301	#endif
302		302
303	/{{{ Convert the keypress event into a string /
304	void	303	void
305	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
306	{	305	{
307	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
308	unsigned int newlen;	307	unsigned int newlen;
309	KeySym keysym;	308	KeySym keysym;
310	int valid_keysym;	309	int valid_keysym;
311	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
312		316
313	/*	317	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	318	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
316	*	320	*
…		…
907	tt_write (&ch, 1);	911	tt_write (&ch, 1);
908	}	912	}
909		913
910	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
911	}	915	}
912	/}}} /	916
		917	void
		918	rxvt_term::key_release (XKeyEvent &ev)
		919	{
		920	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
		921	KeySym keysym;
		922
		923	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		924	#endif
		925
		926	#if ENABLE_FRILLS \|\| ISO_14755
		927	// ISO 14755 support
		928	if (iso14755buf)
		929	if (iso14755buf & ISO_14755_52)
		930	{
		931	# if ENABLE_OVERLAY
		932	scr_overlay_off ();
		933	# endif
		934	# if ISO_14755
		935	// iso14755 part 5.2 handling: release time
		936	// first: controls
		937	if ((ev.state & ControlMask)
		938	&& ((keysym >= 0x40 && keysym <= 0x5f)
		939	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
		940	{
		941	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
		942	commit_iso14755 ();
		943
		944	return;
		945	}
		946
		947	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		948	if (i[0] == keysym)
		949	{
		950	iso14755buf = ISO_14755_51 \| i[1];
		951	commit_iso14755 ();
		952
		953	return;
		954	}
		955
		956	scr_bell ();
		957	# endif
		958	iso14755buf = 0;
		959
		960	return;
		961	}
		962	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
		963	{
		964	# if ENABLE_OVERLAY
		965	scr_overlay_off ();
		966	# endif
		967	if (iso14755buf & ISO_14755_51)
		968	commit_iso14755 ();
		969	#if ISO_14755
		970	else if (iso14755buf & ISO_14755_STARTED)
		971	{
		972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		973
		974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		976	}
		977	# endif
		978	else
		979	iso14755buf = 0;
		980	}
		981	#endif
		982
		983	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		984	return;
		985
		986	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		987	if (!(ev.state & ControlMask))
		988	slip_wheel_ev.stop ();
		989	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
		990	mouse_slip_wheel_speed = 0;
		991	#endif
		992	}
913		993
914	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
915	unsigned int	995	unsigned int
916	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
917	{	997	{
…		…
1300	unsigned int unused_mask;	1380	unsigned int unused_mask;
1301		1381
1302	switch (ev.type)	1382	switch (ev.type)
1303	{	1383	{
1304	case KeyPress:	1384	case KeyPress:
1305	#if ISO_14755	1385	key_press (ev.xkey);
1306	if (!(iso14755buf & ISO_14755_52))
1307	#endif
1308	lookup_key (ev.xkey);
1309
1310	break;	1386	break;
1311		1387
1312	case KeyRelease:	1388	case KeyRelease:
1313	{	1389	key_release (ev.xkey);
1314	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1315	KeySym keysym;
1316
1317	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1318	#endif
1319
1320	#if ENABLE_FRILLS \|\| ISO_14755
1321	// ISO 14755 support
1322	if (iso14755buf)
1323	if (iso14755buf & ISO_14755_52)
1324	{
1325	# if ENABLE_OVERLAY
1326	scr_overlay_off ();
1327	# endif
1328	# if ISO_14755
1329	// iso14755 part 5.2 handling: release time
1330	// first: controls
1331	if ((ev.xkey.state & ControlMask)
1332	&& ((keysym >= 0x40 && keysym <= 0x5f)
1333	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1334	{
1335	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1336	commit_iso14755 ();
1337	goto skip_switch;
1338	}
1339
1340	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1341	if (i[0] == keysym)
1342	{
1343	iso14755buf = ISO_14755_51 \| i[1];
1344	commit_iso14755 ();
1345	goto skip_switch;
1346	}
1347
1348	scr_bell ();
1349	# endif
1350	iso14755buf = 0;
1351	break;
1352	}
1353	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1354	{
1355	# if ENABLE_OVERLAY
1356	scr_overlay_off ();
1357	# endif
1358	if (iso14755buf & ISO_14755_51)
1359	commit_iso14755 ();
1360	#if ISO_14755
1361	else if (iso14755buf & ISO_14755_STARTED)
1362	{
1363	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367	}
1368	# endif
1369	else
1370	iso14755buf = 0;
1371	}
1372	#endif
1373
1374	if (ev.xany.window == vt
1375	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376	break;
1377
1378	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379	if (!(ev.xkey.state & ControlMask))
1380	slip_wheel_ev.stop ();
1381	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1382	mouse_slip_wheel_speed = 0;
1383	#endif
1384	break;	1390	break;
1385	}
1386		1391
1387	case ButtonPress:	1392	case ButtonPress:
1388	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1389	break;	1394	break;
1390		1395
…		…
1453	break;	1458	break;
1454	}	1459	}
1455	break;	1460	break;
1456		1461
1457	case FocusIn:	1462	case FocusIn:
		1463	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1458	focus_in ();	1464	focus_in ();
1459	break;	1465	break;
1460		1466
1461	case FocusOut:	1467	case FocusOut:
		1468	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1462	focus_out ();	1469	focus_out ();
1463	break;	1470	break;
1464		1471
1465	case ConfigureNotify:	1472	case ConfigureNotify:
1466	if (ev.xconfigure.window == parent[0])	1473	if (ev.xconfigure.window == parent[0])
1467	{	1474	{
…		…
1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1481	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475	}	1482	}
1476		1483
1477	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1484	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478		1485
1479	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1486	#ifdef TRANSPARENT
1480	if (OPTION (Opt_transparent))	1487	if (OPTION (Opt_transparent))
1481	check_our_parents ();	1488	check_our_parents ();
1482	#endif	1489	#endif
1483	}	1490	}
1484	break;	1491	break;
…		…
1673	scrollbar_show (1);	1680	scrollbar_show (1);
1674	}	1681	}
1675	break;	1682	break;
1676	}	1683	}
1677		1684
1678	skip_switch: ;
1679
1680	#if defined(CURSOR_BLINK)	1685	#if defined(CURSOR_BLINK)
1681	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1686	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1682	{	1687	{
1683	if (hidden_cursor)	1688	if (hidden_cursor)
1684	{	1689	{
…		…
1711	if (!focus)	1716	if (!focus)
1712	{	1717	{
1713	focus = 1;	1718	focus = 1;
1714	want_refresh = 1;	1719	want_refresh = 1;
1715		1720
1716	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1721	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717		1722
1718	#if USE_XIM	1723	#if USE_XIM
1719	if (Input_Context != NULL)	1724	if (Input_Context != NULL)
1720	{	1725	{
1721	IMSetStatusPosition ();	1726	IMSetPosition ();
1722	XSetICFocus (Input_Context);	1727	XSetICFocus (Input_Context);
1723	}	1728	}
1724	#endif	1729	#endif
1725	#if CURSOR_BLINK	1730	#if CURSOR_BLINK
1726	if (OPTION (Opt_cursorBlink))	1731	if (OPTION (Opt_cursorBlink))
…		…
1772	}	1777	}
1773	#endif	1778	#endif
1774	}	1779	}
1775	}	1780	}
1776		1781
1777	#if TRANSPARENT	1782	void
		1783	rxvt_term::update_fade_color (unsigned int idx)
		1784	{
		1785	#if OFF_FOCUS_FADING
		1786	if (rs[Rs_fade])
		1787	{
		1788	rgba c;
		1789	pix_colors [Color_fade].get (c);
		1790	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1791	}
		1792	#endif
		1793	}
		1794
		1795	#if TRANSPARENT \|\| ENABLE_PERL
1778	void	1796	void
1779	rxvt_term::rootwin_cb (XEvent &ev)	1797	rxvt_term::rootwin_cb (XEvent &ev)
1780	{	1798	{
1781	make_current ();	1799	make_current ();
1782		1800
		1801	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1802	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1803	return;
		1804
		1805	# if TRANSPARENT
1783	switch (ev.type)	1806	switch (ev.type)
1784	{	1807	{
1785	case PropertyNotify:	1808	case PropertyNotify:
1786	/*	1809	/*
1787	* if user used some Esetroot compatible prog to set the root bg,	1810	* if user used some Esetroot compatible prog to set the root bg,
…		…
1795	case ReparentNotify:	1818	case ReparentNotify:
1796	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1819	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1797	want_refresh = want_full_refresh = 1;	1820	want_refresh = want_full_refresh = 1;
1798	break;	1821	break;
1799	}	1822	}
		1823	# endif
1800	}	1824	}
1801	#endif	1825	#endif
1802		1826
1803	void	1827	void
1804	rxvt_term::button_press (XButtonEvent &ev)	1828	rxvt_term::button_press (XButtonEvent &ev)
…		…
2762	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2786	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763	refresh_limit++;	2787	refresh_limit++;
2764	else	2788	else
2765	{	2789	{
2766	flag = true;	2790	flag = true;
		2791	//TODO: due to popular request, implement "skipscroll" option here
2767	scr_refresh ();	2792	scr_refresh ();
2768	want_refresh = 1;	2793	want_refresh = 1;
2769	}	2794	}
2770	}	2795	}
2771		2796
…		…
3651	seen_esc = true;	3676	seen_esc = true;
3652	continue;	3677	continue;
3653	}	3678	}
3654	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3679	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3655	break;	3680	break;
		3681	else if (ch == C0_SYN)
		3682	ch = cmd_get8 ();
3656	else if (ch < 0x20)	3683	else if (ch < 0x20)
3657	return NULL; /* other control character - exit */	3684	return NULL; /* other control character - exit */
3658		3685
3659	seen_esc = false;	3686	seen_esc = false;
3660		3687
3661	if (n >= STRING_MAX - 1)	3688	if (n >= STRING_MAX - 1)
3662	// stop at some sane length	3689	// stop at some sane length
3663	return NULL;	3690	return NULL;
3664		3691
3665	if (ch == C0_SYN)
3666	string[n++] = cmd_get8 ();
3667	else
3668	string[n++] = ch;	3692	string[n++] = ch;
3669	}	3693	}
3670		3694
3671	string[n++] = '\0';	3695	string[n++] = '\0';
3672		3696
3673	ends_how = (ch == 0x5c ? C0_ESC : ch);	3697	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3752	int saveop = op;	3776	int saveop = op;
3753		3777
3754	dLocal (Display *, dpy);	3778	dLocal (Display *, dpy);
3755		3779
3756	assert (str != NULL);	3780	assert (str != NULL);
		3781
		3782	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3783	return;
		3784
3757	switch (op)	3785	switch (op)
3758	{	3786	{
3759	case XTerm_name:	3787	case XTerm_name:
3760	set_title (str);	3788	set_title (str);
3761	/* FALLTHROUGH */	3789	/* FALLTHROUGH */
…		…
3978	break;	4006	break;
3979	#endif	4007	#endif
3980		4008
3981	#if ENABLE_PERL	4009	#if ENABLE_PERL
3982	case URxvt_perl:	4010	case URxvt_perl:
3983	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4011	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984	; // no responses yet	4012	; // no responses yet
3985	break;	4013	break;
3986	#endif	4014	#endif
3987	}	4015	}
3988	}	4016	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC vs. Revision 1.318 by root, Sat Jan 13 15:26:56 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC vs.
Revision 1.318 by root, Sat Jan 13 15:26:56 2007 UTC