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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.396 by ayin, Sun Jan 20 14:12:39 2008 UTC vs.
Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC

…		…
279	}	279	}
280		280
281	iso14755buf = 0;	281	iso14755buf = 0;
282	}	282	}
283		283
284	int	284	static int
285	rxvt_term::hex_keyval (XKeyEvent &ev)	285	hex_keyval (XKeyEvent &ev)
286	{	286	{
287	// check wether this event corresponds to a hex digit	287	// check wether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	288	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	289	for (int index = 0; index < 8; index++)
290	{	290	{
…		…
298		298
299	return -1;	299	return -1;
300	}	300	}
301	#endif	301	#endif
302		302
		303	static inline KeySym
		304	translate_keypad (KeySym keysym, bool kp)
		305	{
		306	#ifdef XK_KP_Home
		307	static const KeySym keypadtrans[] = {
		308	XK_KP_7, // XK_KP_Home
		309	XK_KP_4, // XK_KP_Left
		310	XK_KP_8, // XK_KP_Up
		311	XK_KP_6, // XK_KP_Right
		312	XK_KP_2, // XK_KP_Down
		313	# ifndef UNSHIFTED_SCROLLKEYS
		314	XK_KP_9, // XK_KP_Prior
		315	XK_KP_3, // XK_KP_Next
		316	# else
		317	XK_Prior,
		318	XK_Next,
		319	# endif
		320	XK_KP_1, // XK_KP_End
		321	XK_KP_5, // XK_KP_Begin
		322	};
		323
		324	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		325	{
		326	unsigned int index = keysym - XK_KP_Home;
		327	keysym = kp ? keypadtrans[index] : XK_Home + index;
		328	}
		329	else if (keysym == XK_KP_Insert)
		330	keysym = kp ? XK_KP_0 : XK_Insert;
		331	# ifndef NO_DELETE_KEY
		332	else if (keysym == XK_KP_Delete)
		333	keysym = kp ? XK_KP_Decimal : XK_Delete;
		334	# endif
		335	#endif
		336	return keysym;
		337	}
		338
		339	static inline int
		340	map_function_key (KeySym keysym)
		341	{
		342	int param = 0;
		343
		344	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		345	{
		346	param = 11 + keysym - XK_F1;
		347	if (keysym >= XK_F17)
		348	param += 4;
		349	else if (keysym >= XK_F15)
		350	param += 3;
		351	else if (keysym >= XK_F11)
		352	param += 2;
		353	else if (keysym >= XK_F6)
		354	param += 1;
		355	}
		356	else
		357	switch (keysym)
		358	{
		359	case XK_Find:
		360	param = 1;
		361	break;
		362	case XK_Insert:
		363	param = 2;
		364	break;
		365	#ifdef DXK_Remove
		366	case DXK_Remove:
		367	#endif
		368	case XK_Execute:
		369	param = 3;
		370	break;
		371	case XK_Select:
		372	param = 4;
		373	break;
		374	#ifndef UNSHIFTED_SCROLLKEYS
		375	case XK_Prior:
		376	param = 5;
		377	break;
		378	case XK_Next:
		379	param = 6;
		380	break;
		381	case XK_Home:
		382	param = 7;
		383	break;
		384	case XK_End:
		385	param = 8;
		386	break;
		387	#endif
		388	case XK_Help:
		389	param = 28;
		390	break;
		391	case XK_Menu:
		392	param = 29;
		393	break;
		394	}
		395	return param;
		396	}
		397
303	void	398	void
304	rxvt_term::key_press (XKeyEvent &ev)	399	rxvt_term::key_press (XKeyEvent &ev)
305	{	400	{
306	int ctrl, meta, shft, len;	401	int ctrl, meta, shft, len;
307	unsigned int newlen;
308	KeySym keysym;	402	KeySym keysym;
309	int valid_keysym;	403	int valid_keysym;
310	char kbuf[KBUFSZ];	404	char kbuf[KBUFSZ];
311		405
312	#if ISO_14755	406	#if ISO_14755
…		…
325	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
326		420
327	if (numlock_state \|\| (ev.state & ModNumLockMask))	421	if (numlock_state \|\| (ev.state & ModNumLockMask))
328	{	422	{
329	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
330	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
331	}	425	}
332		426
333	kbuf[0] = 0;	427	kbuf[0] = 0;
334		428
335	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
547	}	641	}
548	#endif	642	#endif
549		643
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	645	{
		646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		647	unsigned int newlen = 1;
		648
		649	switch (translate_keypad (keysym, kp))
552	{	650	{
553	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	651	#ifndef NO_BACKSPACE_KEY
554	newlen = 1;	652	case XK_BackSpace:
555	#ifdef XK_KP_Home	653	if (priv_modes & PrivMode_HaveBackSpace)
556	static const KeySym keypadtrans[] = {	654	{
557	XK_KP_7, // XK_KP_Home	655	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558	XK_KP_4, // XK_KP_Left	656	^ !!ctrl) ? '\b' : '\177';
559	XK_KP_8, // XK_KP_Up	657	kbuf[1] = '\0';
560	XK_KP_6, // XK_KP_Right
561	XK_KP_2, // XK_KP_Down
562	#ifndef UNSHIFTED_SCROLLKEYS
563	XK_KP_9, // XK_KP_Prior
564	XK_KP_3, // XK_KP_Next
565	#else
566	XK_Prior,
567	XK_Next,
568	#endif
569	XK_KP_1, // XK_KP_End
570	XK_KP_5, // XK_KP_Begin
571	};	658	}
		659	else
		660	strcpy (kbuf, rs[Rs_backspace_key]);
		661	break;
		662	#endif
		663	#ifndef NO_DELETE_KEY
		664	case XK_Delete:
		665	strcpy (kbuf, rs[Rs_delete_key]);
		666	break;
		667	#endif
		668	case XK_Tab:
		669	if (shft)
		670	strcpy (kbuf, "\033[Z");
		671	else
		672	{
		673	#ifdef CTRL_TAB_MAKES_META
		674	if (ctrl)
		675	meta = 1;
		676	#endif
		677	#ifdef MOD4_TAB_MAKES_META
		678	if (ev.state & Mod4Mask)
		679	meta = 1;
		680	#endif
		681	newlen = 0;
		682	}
		683	break;
572		684
573	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	685	case XK_Up: /* "\033[A" */
		686	case XK_Down: /* "\033[B" */
		687	case XK_Right: /* "\033[C" */
		688	case XK_Left: /* "\033[D" */
		689	strcpy (kbuf, "\033[Z");
		690	kbuf[2] = "DACB"[keysym - XK_Left];
		691	/* do Shift first */
		692	if (shft)
		693	kbuf[2] = "dacb"[keysym - XK_Left];
		694	else if (ctrl)
		695	{
		696	kbuf[1] = 'O';
		697	kbuf[2] = "dacb"[keysym - XK_Left];
		698	}
		699	else if (priv_modes & PrivMode_aplCUR)
		700	kbuf[1] = 'O';
		701	break;
		702
		703	case XK_KP_Enter:
		704	/* allow shift to override */
		705	if (kp)
		706	{
		707	strcpy (kbuf, "\033OM");
		708	break;
		709	}
		710
		711	/* FALLTHROUGH */
		712
		713	case XK_Return:
		714	if (priv_modes & PrivMode_LFNL)
		715	{
		716	kbuf[0] = '\015';
		717	kbuf[1] = '\012';
		718	kbuf[2] = '\0';
		719	}
		720	else
		721	{
		722	kbuf[0] = '\015';
		723	kbuf[1] = '\0';
		724	}
		725	break;
		726
		727	case XK_KP_F1: /* "\033OP" */
		728	case XK_KP_F2: /* "\033OQ" */
		729	case XK_KP_F3: /* "\033OR" */
		730	case XK_KP_F4: /* "\033OS" */
		731	strcpy (kbuf, "\033OP");
		732	kbuf[2] += (keysym - XK_KP_F1);
		733	break;
		734
		735	case XK_KP_Multiply: /* "\033Oj" : "" /
		736	case XK_KP_Add: /* "\033Ok" : "+" */
		737	case XK_KP_Separator: /* "\033Ol" : "," */
		738	case XK_KP_Subtract: /* "\033Om" : "-" */
		739	case XK_KP_Decimal: /* "\033On" : "." */
		740	case XK_KP_Divide: /* "\033Oo" : "/" */
		741	case XK_KP_0: /* "\033Op" : "0" */
		742	case XK_KP_1: /* "\033Oq" : "1" */
		743	case XK_KP_2: /* "\033Or" : "2" */
		744	case XK_KP_3: /* "\033Os" : "3" */
		745	case XK_KP_4: /* "\033Ot" : "4" */
		746	case XK_KP_5: /* "\033Ou" : "5" */
		747	case XK_KP_6: /* "\033Ov" : "6" */
		748	case XK_KP_7: /* "\033Ow" : "7" */
		749	case XK_KP_8: /* "\033Ox" : "8" */
		750	case XK_KP_9: /* "\033Oy" : "9" */
		751	/* allow shift to override */
		752	if (kp)
		753	{
		754	strcpy (kbuf, "\033Oj");
		755	kbuf[2] += (keysym - XK_KP_Multiply);
		756	}
		757	else
		758	{
		759	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		760	kbuf[1] = '\0';
		761	}
		762	break;
		763
		764	default:
574	{	765	{
575	unsigned int index = keysym - XK_KP_Home;	766	int param = map_function_key (keysym);
576	keysym = kp ? keypadtrans[index] : XK_Home + index;	767	if (param > 0)
		768	sprintf (kbuf,"\033[%d~", param);
		769	else
		770	newlen = 0;
577	}	771	}
578	else if (keysym == XK_KP_Insert)
579	keysym = kp ? XK_KP_0 : XK_Insert;
580	#ifndef NO_DELETE_KEY
581	else if (keysym == XK_KP_Delete)
582	keysym = kp ? XK_KP_Decimal : XK_Delete;
583	#endif
584	#endif
585	switch (keysym)
586	{
587	#ifndef NO_BACKSPACE_KEY
588	case XK_BackSpace:
589	if (priv_modes & PrivMode_HaveBackSpace)
590	{
591	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592	^ !!ctrl) ? '\b' : '\177';
593	kbuf[1] = '\0';
594	}
595	else
596	strcpy (kbuf, rs[Rs_backspace_key]);
597	break;	772	break;
598	#endif
599	#ifndef NO_DELETE_KEY
600	case XK_Delete:
601	strcpy (kbuf, rs[Rs_delete_key]);
602	break;
603	#endif
604	case XK_Tab:
605	if (shft)
606	strcpy (kbuf, "\033[Z");
607	else
608	{
609	#ifdef CTRL_TAB_MAKES_META
610	if (ctrl)
611	meta = 1;
612	#endif
613	#ifdef MOD4_TAB_MAKES_META
614	if (ev.state & Mod4Mask)
615	meta = 1;
616	#endif
617	newlen = 0;
618	}
619	break;
620
621	case XK_Up: /* "\033[A" */
622	case XK_Down: /* "\033[B" */
623	case XK_Right: /* "\033[C" */
624	case XK_Left: /* "\033[D" */
625	strcpy (kbuf, "\033[Z");
626	kbuf[2] = "DACB"[keysym - XK_Left];
627	/* do Shift first */
628	if (shft)
629	kbuf[2] = "dacb"[keysym - XK_Left];
630	else if (ctrl)
631	{
632	kbuf[1] = 'O';
633	kbuf[2] = "dacb"[keysym - XK_Left];
634	}
635	else if (priv_modes & PrivMode_aplCUR)
636	kbuf[1] = 'O';
637	break;
638
639	#ifndef UNSHIFTED_SCROLLKEYS
640	case XK_Prior:
641	strcpy (kbuf, "\033[5~");
642	break;
643	case XK_Next:
644	strcpy (kbuf, "\033[6~");
645	break;
646	#endif
647	case XK_KP_Enter:
648	/* allow shift to override */
649	if (kp)
650	{
651	strcpy (kbuf, "\033OM");
652	break;
653	}
654
655	/* FALLTHROUGH */
656
657	case XK_Return:
658	if (priv_modes & PrivMode_LFNL)
659	{
660	kbuf[0] = '\015';
661	kbuf[1] = '\012';
662	kbuf[2] = '\0';
663	}
664	else
665	{
666	kbuf[0] = '\015';
667	kbuf[1] = '\0';
668	}
669	break;
670
671	case XK_KP_F1: /* "\033OP" */
672	case XK_KP_F2: /* "\033OQ" */
673	case XK_KP_F3: /* "\033OR" */
674	case XK_KP_F4: /* "\033OS" */
675	strcpy (kbuf, "\033OP");
676	kbuf[2] += (keysym - XK_KP_F1);
677	break;
678
679	case XK_KP_Multiply: /* "\033Oj" : "" /
680	case XK_KP_Add: /* "\033Ok" : "+" */
681	case XK_KP_Separator: /* "\033Ol" : "," */
682	case XK_KP_Subtract: /* "\033Om" : "-" */
683	case XK_KP_Decimal: /* "\033On" : "." */
684	case XK_KP_Divide: /* "\033Oo" : "/" */
685	case XK_KP_0: /* "\033Op" : "0" */
686	case XK_KP_1: /* "\033Oq" : "1" */
687	case XK_KP_2: /* "\033Or" : "2" */
688	case XK_KP_3: /* "\033Os" : "3" */
689	case XK_KP_4: /* "\033Ot" : "4" */
690	case XK_KP_5: /* "\033Ou" : "5" */
691	case XK_KP_6: /* "\033Ov" : "6" */
692	case XK_KP_7: /* "\033Ow" : "7" */
693	case XK_KP_8: /* "\033Ox" : "8" */
694	case XK_KP_9: /* "\033Oy" : "9" */
695	/* allow shift to override */
696	if (kp)
697	{
698	strcpy (kbuf, "\033Oj");
699	kbuf[2] += (keysym - XK_KP_Multiply);
700	}
701	else
702	{
703	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704	kbuf[1] = '\0';
705	}
706	break;
707
708	case XK_Find:
709	strcpy (kbuf, "\033[1~");
710	break;
711
712	case XK_Insert:
713	strcpy (kbuf, "\033[2~");
714	break;
715	#ifdef DXK_Remove /* support for DEC remove like key */
716	case DXK_Remove:
717	/* FALLTHROUGH */
718	#endif
719	case XK_Execute:
720	strcpy (kbuf, "\033[3~");
721	break;
722	case XK_Select:
723	strcpy (kbuf, "\033[4~");
724	break;
725	case XK_End:
726	strcpy (kbuf, KS_END);
727	break;
728	case XK_Home:
729	strcpy (kbuf, KS_HOME);
730	break;
731
732	#define FKEY(n, fkey) \
733	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735	case XK_F1: /* "\033[11~" */
736	case XK_F2: /* "\033[12~" */
737	case XK_F3: /* "\033[13~" */
738	case XK_F4: /* "\033[14~" */
739	case XK_F5: /* "\033[15~" */
740	FKEY (11, XK_F1);
741	break;
742	case XK_F6: /* "\033[17~" */
743	case XK_F7: /* "\033[18~" */
744	case XK_F8: /* "\033[19~" */
745	case XK_F9: /* "\033[20~" */
746	case XK_F10: /* "\033[21~" */
747	FKEY (17, XK_F6);
748	break;
749	case XK_F11: /* "\033[23~" */
750	case XK_F12: /* "\033[24~" */
751	case XK_F13: /* "\033[25~" */
752	case XK_F14: /* "\033[26~" */
753	FKEY (23, XK_F11);
754	break;
755	case XK_F15: /* "\033[28~" */
756	case XK_F16: /* "\033[29~" */
757	FKEY (28, XK_F15);
758	break;
759	case XK_Help: /* "\033[28~" */
760	FKEY (28, XK_Help);
761	break;
762	case XK_Menu: /* "\033[29~" */
763	FKEY (29, XK_Menu);
764	break;
765	case XK_F17: /* "\033[31~" */
766	case XK_F18: /* "\033[32~" */
767	case XK_F19: /* "\033[33~" */
768	case XK_F20: /* "\033[34~" */
769	case XK_F21: /* "\033[35~" */
770	case XK_F22: /* "\033[36~" */
771	case XK_F23: /* "\033[37~" */
772	case XK_F24: /* "\033[38~" */
773	case XK_F25: /* "\033[39~" */
774	case XK_F26: /* "\033[40~" */
775	case XK_F27: /* "\033[41~" */
776	case XK_F28: /* "\033[42~" */
777	case XK_F29: /* "\033[43~" */
778	case XK_F30: /* "\033[44~" */
779	case XK_F31: /* "\033[45~" */
780	case XK_F32: /* "\033[46~" */
781	case XK_F33: /* "\033[47~" */
782	case XK_F34: /* "\033[48~" */
783	case XK_F35: /* "\033[49~" */
784	FKEY (31, XK_F17);
785	break;
786	#undef FKEY
787	default:
788	newlen = 0;
789	break;
790	}
791
792	if (newlen)
793	len = strlen (kbuf);
794	}	773	}
		774
		775	if (newlen)
		776	len = strlen (kbuf);
795		777
796	/*	778	/*
797	* Pass meta for all function keys, if 'meta' option set	779	* Pass meta for all function keys, if 'meta' option set
798	*/	780	*/
799	#ifdef META8_OPTION	781	#ifdef META8_OPTION
…		…
1033	}	1015	}
1034	while (row < end_row);	1016	while (row < end_row);
1035	}	1017	}
1036		1018
1037	scr_refresh ();	1019	scr_refresh ();
1038	scrollbar_show (1);	1020	scrollBar.show (1);
1039	#ifdef USE_XIM	1021	#ifdef USE_XIM
1040	IMSendSpot ();	1022	IMSendSpot ();
1041	#endif	1023	#endif
1042	}	1024	}
1043		1025
…		…
1090		1072
1091	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1073	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092	void	1074	void
1093	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1075	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094	{	1076	{
1095	if ((scrollbar_isUp () \|\| scrollbar_isDn ())	1077	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1096	&& scr_page (scrollbar_isUp () ? UP : DN, 1))	1078	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097	{	1079	{
1098	want_refresh = 1;	1080	want_refresh = 1;
1099	refresh_check ();	1081	refresh_check ();
1100	}	1082	}
1101	else	1083	else
…		…
1438	&& ev.xfocus.mode != NotifyGrab)	1420	&& ev.xfocus.mode != NotifyGrab)
1439	focus_out ();	1421	focus_out ();
1440	break;	1422	break;
1441		1423
1442	case ConfigureNotify:	1424	case ConfigureNotify:
1443	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1425	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1426	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445	szHint.width, szHint.height); */	1427	szHint.width, szHint.height);*/
1446	if (ev.xconfigure.window == parent[0])	1428	if (ev.xconfigure.window == parent[0])
1447	{	1429	{
1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1430	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449	;	1431	;
1450		1432
…		…
1553	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1535	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554	;	1536	;
1555		1537
1556	if (scrollBar.state && ev.xany.window == scrollBar.win)	1538	if (scrollBar.state && ev.xany.window == scrollBar.win)
1557	{	1539	{
1558	scrollBar.setIdle ();	1540	scrollBar.state = STATE_IDLE;
1559	scrollbar_show (0);	1541	scrollBar.show (0);
1560	}	1542	}
1561	}	1543	}
1562	break;	1544	break;
1563		1545
1564	case MotionNotify:	1546	case MotionNotify:
…		…
1651	#ifdef MOUSE_THRESHOLD	1633	#ifdef MOUSE_THRESHOLD
1652	}	1634	}
1653	#endif	1635	#endif
1654	}	1636	}
1655	}	1637	}
1656	else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)	1638	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657	{	1639	{
1658	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1640	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659	MotionNotify, &ev))	1641	MotionNotify, &ev))
1660	;	1642	;
1661		1643
…		…
1663	&unused_root, &unused_child,	1645	&unused_root, &unused_child,
1664	&unused_root_x, &unused_root_y,	1646	&unused_root_x, &unused_root_y,
1665	&ev.xbutton.x, &ev.xbutton.y,	1647	&ev.xbutton.x, &ev.xbutton.y,
1666	&unused_mask);	1648	&unused_mask);
1667	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1649	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668	scrollbar_size ());	1650	scrollBar.size ());
1669	want_refresh = 1;	1651	want_refresh = 1;
1670	scrollbar_show (1);	1652	scrollBar.show (1);
1671	}	1653	}
1672	break;	1654	break;
1673	}	1655	}
1674		1656
1675	#if defined(CURSOR_BLINK)	1657	#if defined(CURSOR_BLINK)
…		…
1701		1683
1702	refresh_check ();	1684	refresh_check ();
1703	}	1685	}
1704		1686
1705	void	1687	void
		1688	rxvt_term::set_urgency (bool enable)
		1689	{
		1690	if (enable == urgency_hint)
		1691	return;
		1692
		1693	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1694	{
		1695	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1696	XSetWMHints (dpy, parent[0], h);
		1697	urgency_hint = enable;
		1698	}
		1699	}
		1700
		1701	void
1706	rxvt_term::focus_in ()	1702	rxvt_term::focus_in ()
1707	{	1703	{
1708	if (!focus)	1704	if (!focus)
1709	{	1705	{
1710	focus = 1;	1706	focus = 1;
1711	want_refresh = 1;	1707	want_refresh = 1;
1712
1713	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714		1708
1715	#if USE_XIM	1709	#if USE_XIM
1716	if (Input_Context != NULL)	1710	if (Input_Context != NULL)
1717	{	1711	{
1718	IMSetPosition ();	1712	IMSetPosition ();
…		…
1730	scr_recolour ();	1724	scr_recolour ();
1731	}	1725	}
1732	#endif	1726	#endif
1733	#if ENABLE_FRILLS	1727	#if ENABLE_FRILLS
1734	if (option (Opt_urgentOnBell))	1728	if (option (Opt_urgentOnBell))
1735	{	1729	set_urgency (0);
1736	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737	{
1738	h->flags &= ~XUrgencyHint;
1739	XSetWMHints (dpy, parent[0], h);
1740	}
1741	}
1742	#endif	1730	#endif
		1731
		1732	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743	}	1733	}
1744	}	1734	}
1745		1735
1746	void	1736	void
1747	rxvt_term::focus_out ()	1737	rxvt_term::focus_out ()
…		…
1749	if (focus)	1739	if (focus)
1750	{	1740	{
1751	focus = 0;	1741	focus = 0;
1752	want_refresh = 1;	1742	want_refresh = 1;
1753		1743
1754	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1744	#if ENABLE_FRILLS
1755		1745	if (option (Opt_urgentOnBell))
		1746	set_urgency (0);
		1747	#endif
1756	#if ENABLE_FRILLS \|\| ISO_14755	1748	#if ENABLE_FRILLS \|\| ISO_14755
1757	if (iso14755buf)	1749	if (iso14755buf)
1758	{	1750	{
1759	iso14755buf = 0;	1751	iso14755buf = 0;
1760	# if ISO_14755	1752	# if ISO_14755
…		…
1777	{	1769	{
1778	pix_colors = pix_colors_unfocused;	1770	pix_colors = pix_colors_unfocused;
1779	scr_recolour ();	1771	scr_recolour ();
1780	}	1772	}
1781	#endif	1773	#endif
		1774
		1775	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782	}	1776	}
1783	}	1777	}
1784		1778
1785	void	1779	void
1786	rxvt_term::update_fade_color (unsigned int idx)	1780	rxvt_term::update_fade_color (unsigned int idx)
…		…
1947	/*	1941	/*
1948	* Scrollbar window processing of button press	1942	* Scrollbar window processing of button press
1949	*/	1943	*/
1950	if (scrollBar.state && ev.window == scrollBar.win)	1944	if (scrollBar.state && ev.window == scrollBar.win)
1951	{	1945	{
1952	scrollBar.setIdle ();	1946	page_dirn direction = NO_DIR;
		1947
		1948	if (scrollBar.upButton (ev.y))
		1949	direction = UP; /* up */
		1950	else if (scrollBar.dnButton (ev.y))
		1951	direction = DN; /* down */
		1952
		1953	scrollBar.state = STATE_IDLE;
1953	/*	1954	/*
1954	* Rxvt-style scrollbar:	1955	* Rxvt-style scrollbar:
1955	* move up if mouse is above slider	1956	* move up if mouse is above slider
1956	* move dn if mouse is below slider	1957	* move dn if mouse is below slider
1957	*	1958	*
…		…
1966	/*	1967	/*
1967	* Mouse report disabled scrollbar:	1968	* Mouse report disabled scrollbar:
1968	* arrow buttons - send up/down	1969	* arrow buttons - send up/down
1969	* click on scrollbar - send pageup/down	1970	* click on scrollbar - send pageup/down
1970	*/	1971	*/
1971	if ((scrollBar.style == R_SB_NEXT	1972	if (direction == UP)
1972	&& scrollbarnext_upButton (ev.y))
1973	\|\| (scrollBar.style == R_SB_RXVT
1974	&& scrollbarrxvt_upButton (ev.y)))
1975	tt_printf ("\033[A");	1973	tt_printf ("\033[A");
1976	else if ((scrollBar.style == R_SB_NEXT	1974	else if (direction == DN)
1977	&& scrollbarnext_dnButton (ev.y))
1978	\|\| (scrollBar.style == R_SB_RXVT
1979	&& scrollbarrxvt_dnButton (ev.y)))
1980	tt_printf ("\033[B");	1975	tt_printf ("\033[B");
1981	else	1976	else
1982	switch (ev.button)	1977	switch (ev.button)
1983	{	1978	{
1984	case Button2:	1979	case Button2:
…		…
1992	break;	1987	break;
1993	}	1988	}
1994	}	1989	}
1995	else	1990	else
1996	#endif /* NO_SCROLLBAR_REPORT */	1991	#endif /* NO_SCROLLBAR_REPORT */
1997
1998	{
1999	char upordown = 0;
2000
2001	if (scrollBar.style == R_SB_NEXT)
2002	{	1992	{
2003	if (scrollbarnext_upButton (ev.y))	1993	if (direction != NO_DIR)
2004	upordown = -1; /* up */
2005	else if (scrollbarnext_dnButton (ev.y))
2006	upordown = 1; /* down */
2007	}
2008	else if (scrollBar.style == R_SB_RXVT)
2009	{
2010	if (scrollbarrxvt_upButton (ev.y))
2011	upordown = -1; /* up */
2012	else if (scrollbarrxvt_dnButton (ev.y))
2013	upordown = 1; /* down */
2014	}
2015
2016	if (upordown)
2017	{	1994	{
2018	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1995	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019	if (!cont_scroll_ev.is_active ())	1996	if (!cont_scroll_ev.is_active ())
2020	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	1997	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021	#endif	1998	#endif
2022	if (scr_page (upordown < 0 ? UP : DN, 1))	1999	if (scr_page (direction, 1))
2023	{	2000	{
2024	if (upordown < 0)	2001	if (direction == UP)
2025	scrollBar.setUp ();	2002	scrollBar.state = STATE_UP;
2026	else	2003	else
2027	scrollBar.setDn ();	2004	scrollBar.state = STATE_DOWN;
2028	}	2005	}
2029	}	2006	}
2030	else	2007	else
2031	switch (ev.button)	2008	switch (ev.button)
2032	{	2009	{
…		…
2045	}	2022	}
2046		2023
2047	if (scrollBar.style == R_SB_XTERM	2024	if (scrollBar.style == R_SB_XTERM
2048	\|\| scrollbar_above_slider (ev.y)	2025	\|\| scrollbar_above_slider (ev.y)
2049	\|\| scrollbar_below_slider (ev.y))	2026	\|\| scrollbar_below_slider (ev.y))
2050	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2027	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2051		2028
2052	scrollBar.setMotion ();	2029	scrollBar.state = STATE_MOTION;
2053	break;	2030	break;
2054		2031
2055	case Button1:	2032	case Button1:
2056	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2033	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057	csrO = ev.y - scrollBar.top;	2034	csrO = ev.y - scrollBar.top;
…		…
2071	scr_page (DN, nrow - 1);	2048	scr_page (DN, nrow - 1);
2072	# else	2049	# else
2073	scr_page (DN, nrow / 4);	2050	scr_page (DN, nrow / 4);
2074	# endif	2051	# endif
2075	else	2052	else
2076	scrollBar.setMotion ();	2053	scrollBar.state = STATE_MOTION;
2077	}	2054	}
2078	else	2055	else
2079	{	2056	{
2080	scr_page ((ev.button == Button1 ? DN : UP),	2057	scr_page ((ev.button == Button1 ? DN : UP),
2081	(nrow	2058	(nrow
2082	* scrollbar_position (ev.y)	2059	* scrollbar_position (ev.y)
2083	/ scrollbar_size ()));	2060	/ scrollBar.size ()));
2084	}	2061	}
2085		2062
2086	break;	2063	break;
2087	}	2064	}
2088	}	2065	}
…		…
2098		2075
2099	csrO = 0; /* reset csr Offset */	2076	csrO = 0; /* reset csr Offset */
2100	if (!bypass_keystate)	2077	if (!bypass_keystate)
2101	reportmode = !! (priv_modes & PrivMode_mouse_report);	2078	reportmode = !! (priv_modes & PrivMode_mouse_report);
2102		2079
2103	if (scrollbar_isUpDn ())	2080	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2104	{	2081	{
2105	scrollBar.setIdle ();	2082	scrollBar.state = STATE_IDLE;
2106	scrollbar_show (0);	2083	scrollBar.show (0);
2107	}	2084	}
2108		2085
2109	#ifdef SELECTION_SCROLLING	2086	#ifdef SELECTION_SCROLLING
2110	sel_scroll_ev.stop();	2087	sel_scroll_ev.stop();
2111	#endif	2088	#endif
…		…
2194	}	2171	}
2195	else	2172	else
2196	# endif	2173	# endif
2197	{	2174	{
2198	scr_page (v, i);	2175	scr_page (v, i);
2199	scrollbar_show (1);	2176	scrollBar.show (1);
2200	}	2177	}
2201	}	2178	}
2202	break;	2179	break;
2203	#endif	2180	#endif
2204	}	2181	}
…		…
2214	wchar_t ch = NOCHAR;	2191	wchar_t ch = NOCHAR;
2215	char *seq_begin; // remember start of esc-sequence here	2192	char *seq_begin; // remember start of esc-sequence here
2216		2193
2217	for (;;)	2194	for (;;)
2218	{	2195	{
2219	if (ch == NOCHAR)	2196	if (expect_false (ch == NOCHAR))
2220	{	2197	{
2221	seq_begin = cmdbuf_ptr;	2198	seq_begin = cmdbuf_ptr;
2222	ch = next_char ();	2199	ch = next_char ();
2223		2200
2224	if (ch == NOCHAR)	2201	if (ch == NOCHAR)
2225	break;	2202	break;
2226	}	2203	}
2227		2204
2228	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2205	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2229	{	2206	{
2230	if (!seen_input)	2207	if (expect_false (!seen_input))
2231	{	2208	{
2232	seen_input = 1;	2209	seen_input = 1;
2233	// many badly-written programs (e.g. jed) contain a race condition:	2210	// many badly-written programs (e.g. jed) contain a race condition:
2234	// they first read the screensize and then install a SIGWINCH handler.	2211	// they first read the screensize and then install a SIGWINCH handler.
2235	// some window managers resize the window early, and these programs	2212	// some window managers resize the window early, and these programs
…		…
2248	wchar_t *str = buf;	2225	wchar_t *str = buf;
2249	wchar_t *eol = str + min (ncol, UBUFSIZ);	2226	wchar_t *eol = str + min (ncol, UBUFSIZ);
2250		2227
2251	for (;;)	2228	for (;;)
2252	{	2229	{
2253	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2230	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254	break;	2231	break;
2255		2232
2256	*str++ = ch;	2233	*str++ = ch;
2257		2234
2258	if (ch == C0_LF \|\| str >= eol)	2235	if (expect_false (ch == C0_LF \|\| str >= eol))
2259	{	2236	{
2260	if (ch == C0_LF)	2237	if (ch == C0_LF)
2261	nlines++;	2238	nlines++;
2262		2239
2263	refresh_count++;	2240	refresh_count++;
…		…
2345	rxvt_term::next_char () NOTHROW	2322	rxvt_term::next_char () NOTHROW
2346	{	2323	{
2347	while (cmdbuf_ptr < cmdbuf_endp)	2324	while (cmdbuf_ptr < cmdbuf_endp)
2348	{	2325	{
2349	// assume 7-bit to be ascii ALWAYS	2326	// assume 7-bit to be ascii ALWAYS
2350	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2327	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2351	return *cmdbuf_ptr++;	2328	return *cmdbuf_ptr++;
2352		2329
2353	wchar_t wc;	2330	wchar_t wc;
2354	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2331	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355		2332
…		…
2359	cmdbuf_ptr = cmdbuf_endp;	2336	cmdbuf_ptr = cmdbuf_endp;
2360	break;	2337	break;
2361	}	2338	}
2362		2339
2363	if (len == (size_t)-1)	2340	if (len == (size_t)-1)
		2341	{
		2342	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2364	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2343	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2344	}
2365		2345
2366	// assume wchar == unicode	2346	// assume wchar == unicode
2367	cmdbuf_ptr += len;	2347	cmdbuf_ptr += len;
2368	return wc & UNICODE_MASK;	2348	return wc & UNICODE_MASK;
2369	}	2349	}
…		…
2413	/----------------------------------------------------------------------/	2393	/----------------------------------------------------------------------/
2414	#ifdef PRINTPIPE	2394	#ifdef PRINTPIPE
2415	FILE *	2395	FILE *
2416	rxvt_term::popen_printer ()	2396	rxvt_term::popen_printer ()
2417	{	2397	{
2418	FILE *stream = popen (rs[Rs_print_pipe], "w");	2398	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419		2399
2420	if (stream == NULL)	2400	if (stream == NULL)
2421	rxvt_warn ("can't open printer pipe, not printing.\n");	2401	rxvt_warn ("can't open printer pipe, not printing.\n");
2422		2402
2423	return stream;	2403	return stream;
…		…
2434	* simulate attached vt100 printer	2414	* simulate attached vt100 printer
2435	*/	2415	*/
2436	void	2416	void
2437	rxvt_term::process_print_pipe ()	2417	rxvt_term::process_print_pipe ()
2438	{	2418	{
2439	int done;	2419	FILE *fd = popen_printer ();
2440	FILE *fd;
2441		2420
2442	if ((fd = popen_printer ()) == NULL)	2421	if (!fd)
2443	return;	2422	return;
2444		2423
2445	/*	2424	/*
2446	* Send all input to the printer until either ESC[4i or ESC[?4i	2425	* Send all input to the printer until either ESC[4i or ESC[?4i
2447	* is received.	2426	* is received.
2448	*/	2427	*/
2449	for (done = 0; !done;)	2428	for (int done = 0; !done; )
2450	{	2429	{
2451	unsigned char buf[8];	2430	unsigned char buf[8];
2452	unicode_t ch;	2431	unicode_t ch;
2453	unsigned int i, len;	2432	unsigned int i, len;
2454		2433
…		…
2599	break;	2578	break;
2600	case 'Z': /* identify the terminal type */	2579	case 'Z': /* identify the terminal type */
2601	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2580	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602	break;	2581	break;
2603	case '<': /* turn off VT52 mode */	2582	case '<': /* turn off VT52 mode */
2604	PrivMode (0, PrivMode_vt52);	2583	set_privmode (PrivMode_vt52, 0);
2605	break;	2584	break;
2606	case 'F': /* use special graphics character set */	2585	case 'F': /* use special graphics character set */
2607	case 'G': /* use regular character set */	2586	case 'G': /* use regular character set */
2608	/* unimplemented */	2587	/* unimplemented */
2609	break;	2588	break;
…		…
2663	scr_forwardindex ();	2642	scr_forwardindex ();
2664	break;	2643	break;
2665	#endif	2644	#endif
2666	case '=':	2645	case '=':
2667	case '>':	2646	case '>':
2668	PrivMode ((ch == '='), PrivMode_aplKP);	2647	set_privmode (PrivMode_aplKP, ch == '=');
2669	break;	2648	break;
2670		2649
2671	case C1_40:	2650	case C1_40:
2672	cmd_getc ();	2651	cmd_getc ();
2673	break;	2652	break;
…		…
2726		2705
2727	/* 8.3.106: RESET TO INITIAL STATE */	2706	/* 8.3.106: RESET TO INITIAL STATE */
2728	case 'c':	2707	case 'c':
2729	mbstate.reset ();	2708	mbstate.reset ();
2730	scr_poweron ();	2709	scr_poweron ();
2731	scrollbar_show (1);	2710	scrollBar.show (1);
2732	break;	2711	break;
2733		2712
2734	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2713	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735	case 'n':	2714	case 'n':
2736	scr_charset_choose (2);	2715	scr_charset_choose (2);
…		…
3542	break;	3521	break;
3543	#endif	3522	#endif
3544		3523
3545	#if ENABLE_PERL	3524	#if ENABLE_PERL
3546	case URxvt_perl:	3525	case URxvt_perl:
3547	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3526	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3548	; // no responses yet
3549	break;	3527	break;
3550	#endif	3528	#endif
3551	}	3529	}
3552	}	3530	}
3553	/----------------------------------------------------------------------/	3531	/----------------------------------------------------------------------/
…		…
3576	{	3554	{
3577	if (mode == 'r')	3555	if (mode == 'r')
3578	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3556	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579	else	3557	else
3580	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3558	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581	PrivMode (state, bit);	3559	set_privmode (bit, state);
3582	}	3560	}
3583		3561
3584	return state;	3562	return state;
3585	}	3563	}
3586		3564
…		…
3684	case 2: /* VT52 mode */	3662	case 2: /* VT52 mode */
3685	/* oddball mode. should be set regardless of set/reset	3663	/* oddball mode. should be set regardless of set/reset
3686	* parameter. Return from VT52 mode with an ESC < from	3664	* parameter. Return from VT52 mode with an ESC < from
3687	* within VT52 mode	3665	* within VT52 mode
3688	*/	3666	*/
3689	PrivMode (1, PrivMode_vt52);	3667	set_privmode (PrivMode_vt52, 1);
3690	break;	3668	break;
3691	case 3: /* 80/132 */	3669	case 3: /* 80/132 */
3692	if (priv_modes & PrivMode_132OK)	3670	if (priv_modes & PrivMode_132OK)
3693	{	3671	{
3694	scr_poweron ();	3672	scr_poweron ();
…		…
3712	if (state) /* orthogonal */	3690	if (state) /* orthogonal */
3713	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3691	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3714	break;	3692	break;
3715	#ifdef scrollBar_esc	3693	#ifdef scrollBar_esc
3716	case scrollBar_esc:	3694	case scrollBar_esc:
3717	if (scrollbar_mapping (state))	3695	if (scrollBar.map (state))
3718	{	3696	{
3719	resize_all_windows (0, 0, 0);	3697	resize_all_windows (0, 0, 0);
3720	scr_touch (true);	3698	scr_touch (true);
3721	}	3699	}
3722	break;	3700	break;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.396 by ayin, Sun Jan 20 14:12:39 2008 UTC vs. Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.396 by ayin, Sun Jan 20 14:12:39 2008 UTC vs.
Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC