[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.306 by root, Mon Feb 6 05:40:15 2006 UTC

…		…
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
…		…
1672	refresh_limit = 0;	1677	refresh_limit = 0;
1673	scrollbar_show (1);	1678	scrollbar_show (1);
1674	}	1679	}
1675	break;	1680	break;
1676	}	1681	}
1677
1678	skip_switch: ;
1679		1682
1680	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1681	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1682	{	1685	{
1683	if (hidden_cursor)	1686	if (hidden_cursor)

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.306 by root, Mon Feb 6 05:40:15 2006 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.306 by root, Mon Feb 6 05:40:15 2006 UTC