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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.397 by root, Sat Jan 26 11:40:47 2008 UTC vs.
Revision 1.437 by sf-exg, Fri Jan 29 17:27:36 2010 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
…		…
485	}	579	}
486	}	580	}
487		581
488	#if ENABLE_FRILLS \|\| ISO_14755	582	#if ENABLE_FRILLS \|\| ISO_14755
489	// ISO 14755 support	583	// ISO 14755 support
490	if (shft && ctrl)	584	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
491	{	585	{
492	int hv;	586	int hv;
493		587
494	if (iso14755buf & ISO_14755_51	588	if (iso14755buf & ISO_14755_51
495	&& (keysym == XK_space \|\| keysym == XK_KP_Space	589	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
525	scr_overlay_off ();	619	scr_overlay_off ();
526	# endif	620	# endif
527	iso14755buf = 0;	621	iso14755buf = 0;
528	}	622	}
529	}	623	}
		624	else if (option (Opt_iso14755) &&
530	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	625	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
531	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	626	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
532	if (!(iso14755buf & ISO_14755_STARTED))	627	if (!(iso14755buf & ISO_14755_STARTED))
533	{	628	{
534	iso14755buf \|= ISO_14755_STARTED;	629	iso14755buf \|= ISO_14755_STARTED;
535	# if ISO_14755	630	# if ISO_14755
536	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	631	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
547	}	642	}
548	#endif	643	#endif
549		644
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	645	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	646	{
		647	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		648	unsigned int newlen = 1;
		649
		650	switch (translate_keypad (keysym, kp))
552	{	651	{
553	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	652	#ifndef NO_BACKSPACE_KEY
554	newlen = 1;	653	case XK_BackSpace:
555	#ifdef XK_KP_Home	654	if (priv_modes & PrivMode_HaveBackSpace)
556	static const KeySym keypadtrans[] = {	655	{
557	XK_KP_7, // XK_KP_Home	656	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558	XK_KP_4, // XK_KP_Left	657	^ !!ctrl) ? '\b' : '\177';
559	XK_KP_8, // XK_KP_Up	658	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	};	659	}
		660	else
		661	strcpy (kbuf, rs[Rs_backspace_key]);
		662	break;
		663	#endif
		664	#ifndef NO_DELETE_KEY
		665	case XK_Delete:
		666	strcpy (kbuf, rs[Rs_delete_key]);
		667	break;
		668	#endif
		669	case XK_Tab:
		670	if (shft)
		671	strcpy (kbuf, "\033[Z");
		672	else
		673	{
		674	#ifdef CTRL_TAB_MAKES_META
		675	if (ctrl)
		676	meta = 1;
		677	#endif
		678	#ifdef MOD4_TAB_MAKES_META
		679	if (ev.state & Mod4Mask)
		680	meta = 1;
		681	#endif
		682	newlen = 0;
		683	}
		684	break;
572		685
573	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	686	case XK_Up: /* "\033[A" */
		687	case XK_Down: /* "\033[B" */
		688	case XK_Right: /* "\033[C" */
		689	case XK_Left: /* "\033[D" */
		690	strcpy (kbuf, "\033[Z");
		691	kbuf[2] = "DACB"[keysym - XK_Left];
		692	/* do Shift first */
		693	if (shft)
		694	kbuf[2] = "dacb"[keysym - XK_Left];
		695	else if (ctrl)
		696	{
		697	kbuf[1] = 'O';
		698	kbuf[2] = "dacb"[keysym - XK_Left];
		699	}
		700	else if (priv_modes & PrivMode_aplCUR)
		701	kbuf[1] = 'O';
		702	break;
		703
		704	case XK_KP_Enter:
		705	/* allow shift to override */
		706	if (kp)
		707	{
		708	strcpy (kbuf, "\033OM");
		709	break;
		710	}
		711
		712	/* FALLTHROUGH */
		713
		714	case XK_Return:
		715	if (priv_modes & PrivMode_LFNL)
		716	{
		717	kbuf[0] = '\015';
		718	kbuf[1] = '\012';
		719	kbuf[2] = '\0';
		720	}
		721	else
		722	{
		723	kbuf[0] = '\015';
		724	kbuf[1] = '\0';
		725	}
		726	break;
		727
		728	case XK_KP_F1: /* "\033OP" */
		729	case XK_KP_F2: /* "\033OQ" */
		730	case XK_KP_F3: /* "\033OR" */
		731	case XK_KP_F4: /* "\033OS" */
		732	strcpy (kbuf, "\033OP");
		733	kbuf[2] += (keysym - XK_KP_F1);
		734	break;
		735
		736	case XK_KP_Multiply: /* "\033Oj" : "" /
		737	case XK_KP_Add: /* "\033Ok" : "+" */
		738	case XK_KP_Separator: /* "\033Ol" : "," */
		739	case XK_KP_Subtract: /* "\033Om" : "-" */
		740	case XK_KP_Decimal: /* "\033On" : "." */
		741	case XK_KP_Divide: /* "\033Oo" : "/" */
		742	case XK_KP_0: /* "\033Op" : "0" */
		743	case XK_KP_1: /* "\033Oq" : "1" */
		744	case XK_KP_2: /* "\033Or" : "2" */
		745	case XK_KP_3: /* "\033Os" : "3" */
		746	case XK_KP_4: /* "\033Ot" : "4" */
		747	case XK_KP_5: /* "\033Ou" : "5" */
		748	case XK_KP_6: /* "\033Ov" : "6" */
		749	case XK_KP_7: /* "\033Ow" : "7" */
		750	case XK_KP_8: /* "\033Ox" : "8" */
		751	case XK_KP_9: /* "\033Oy" : "9" */
		752	/* allow shift to override */
		753	if (kp)
		754	{
		755	strcpy (kbuf, "\033Oj");
		756	kbuf[2] += (keysym - XK_KP_Multiply);
		757	}
		758	else
		759	{
		760	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		761	kbuf[1] = '\0';
		762	}
		763	break;
		764
		765	default:
574	{	766	{
575	unsigned int index = keysym - XK_KP_Home;	767	int param = map_function_key (keysym);
576	keysym = kp ? keypadtrans[index] : XK_Home + index;	768	if (param > 0)
		769	sprintf (kbuf,"\033[%d~", param);
		770	else
		771	newlen = 0;
577	}	772	}
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;	773	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	}	774	}
		775
		776	if (newlen)
		777	len = strlen (kbuf);
795		778
796	/*	779	/*
797	* Pass meta for all function keys, if 'meta' option set	780	* Pass meta for all function keys, if 'meta' option set
798	*/	781	*/
799	#ifdef META8_OPTION	782	#ifdef META8_OPTION
…		…
1033	}	1016	}
1034	while (row < end_row);	1017	while (row < end_row);
1035	}	1018	}
1036		1019
1037	scr_refresh ();	1020	scr_refresh ();
1038	scrollbar_show (1);	1021	scrollBar.show (1);
1039	#ifdef USE_XIM	1022	#ifdef USE_XIM
1040	IMSendSpot ();	1023	IMSendSpot ();
1041	#endif	1024	#endif
1042	}	1025	}
1043		1026
…		…
1090		1073
1091	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1074	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092	void	1075	void
1093	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1076	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094	{	1077	{
1095	if ((scrollbar_isUp () \|\| scrollbar_isDn ())	1078	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1096	&& scr_page (scrollbar_isUp () ? UP : DN, 1))	1079	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097	{	1080	{
1098	want_refresh = 1;	1081	want_refresh = 1;
1099	refresh_check ();	1082	refresh_check ();
1100	}	1083	}
1101	else	1084	else
…		…
1145	{	1128	{
1146	// this should really be sched_yield(), but the linux guys thought	1129	// this should really be sched_yield(), but the linux guys thought
1147	// that giving a process calling sched_yield () less cpu time than	1130	// that giving a process calling sched_yield () less cpu time than
1148	// ones with high nice levels is a useful thing to do. It surely is is	1131	// ones with high nice levels is a useful thing to do. It surely is is
1149	// allowed by the sus... as is returning ENOSYS.	1132	// allowed by the sus... as is returning ENOSYS.
		1133	// since the linux guys additionally thought that breaking the only
		1134	// known workaroudn against their unusable sched_yield hack is cool,
		1135	// we just nanosleep a bit and hope for the best.
1150		1136
1151	struct timespec ts = { 0, 0 };	1137	struct timespec ts = { 0, 1000 };
1152	nanosleep (&ts, 0);	1138	nanosleep (&ts, 0);
1153		1139
1154	w.stop ();	1140	w.stop ();
1155	}	1141	}
1156		1142
…		…
1206	{	1192	{
1207	make_current ();	1193	make_current ();
1208		1194
1209	if (revents & ev::READ)	1195	if (revents & ev::READ)
1210	// loop, but don't allow a single term to monopolize us	1196	// loop, but don't allow a single term to monopolize us
1211	while (pty_fill ())	1197	for (int i = CBUFCNT; i-- && pty_fill (); )
1212	if (cmd_parse ())	1198	cmd_parse ();
1213	break;
1214		1199
1215	if (revents & ev::WRITE)	1200	if (revents & ev::WRITE)
1216	pty_write ();	1201	pty_write ();
1217		1202
1218	refresh_check ();	1203	refresh_check ();
…		…
1438	&& ev.xfocus.mode != NotifyGrab)	1423	&& ev.xfocus.mode != NotifyGrab)
1439	focus_out ();	1424	focus_out ();
1440	break;	1425	break;
1441		1426
1442	case ConfigureNotify:	1427	case ConfigureNotify:
1443	fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1428	/*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,	1429	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445	szHint.width, szHint.height);	1430	szHint.width, szHint.height);*/
1446	if (ev.xconfigure.window == parent[0])	1431	if (ev.xconfigure.window == parent[0])
1447	{	1432	{
1448	//while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1433	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449	;	1434	;
1450		1435
1451	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1436	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1452	{	1437	{
1453	seen_resize = 1;	1438	seen_resize = 1;
…		…
1477	selection_property (ev.xproperty.window, ev.xproperty.atom);	1462	selection_property (ev.xproperty.window, ev.xproperty.atom);
1478		1463
1479	break;	1464	break;
1480		1465
1481	case SelectionClear:	1466	case SelectionClear:
1482	selection_clear ();	1467	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483	break;	1468	break;
1484		1469
1485	case SelectionNotify:	1470	case SelectionNotify:
1486	if (selection_wait == Sel_normal)	1471	if (selection_wait == Sel_normal)
1487	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1472	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1553	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1538	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554	;	1539	;
1555		1540
1556	if (scrollBar.state && ev.xany.window == scrollBar.win)	1541	if (scrollBar.state && ev.xany.window == scrollBar.win)
1557	{	1542	{
1558	scrollBar.setIdle ();	1543	scrollBar.state = STATE_IDLE;
1559	scrollbar_show (0);	1544	scrollBar.show (0);
1560	}	1545	}
1561	}	1546	}
1562	break;	1547	break;
1563		1548
1564	case MotionNotify:	1549	case MotionNotify:
…		…
1651	#ifdef MOUSE_THRESHOLD	1636	#ifdef MOUSE_THRESHOLD
1652	}	1637	}
1653	#endif	1638	#endif
1654	}	1639	}
1655	}	1640	}
1656	else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)	1641	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657	{	1642	{
1658	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1643	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659	MotionNotify, &ev))	1644	MotionNotify, &ev))
1660	;	1645	;
1661		1646
…		…
1663	&unused_root, &unused_child,	1648	&unused_root, &unused_child,
1664	&unused_root_x, &unused_root_y,	1649	&unused_root_x, &unused_root_y,
1665	&ev.xbutton.x, &ev.xbutton.y,	1650	&ev.xbutton.x, &ev.xbutton.y,
1666	&unused_mask);	1651	&unused_mask);
1667	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1652	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668	scrollbar_size ());	1653	scrollBar.size ());
1669	want_refresh = 1;	1654	want_refresh = 1;
1670	scrollbar_show (1);	1655	scrollBar.show (1);
1671	}	1656	}
1672	break;	1657	break;
1673	}	1658	}
1674		1659
1675	#if defined(CURSOR_BLINK)	1660	#if defined(CURSOR_BLINK)
…		…
1700	#endif	1685	#endif
1701		1686
1702	refresh_check ();	1687	refresh_check ();
1703	}	1688	}
1704		1689
		1690	#if ENABLE_FRILLS
		1691	void
		1692	rxvt_term::set_urgency (bool enable)
		1693	{
		1694	if (enable == urgency_hint)
		1695	return;
		1696
		1697	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1698	{
		1699	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1700	XSetWMHints (dpy, parent[0], h);
		1701	urgency_hint = enable;
		1702	}
		1703	}
		1704	#endif
		1705
1705	void	1706	void
1706	rxvt_term::focus_in ()	1707	rxvt_term::focus_in ()
1707	{	1708	{
1708	if (!focus)	1709	if (!focus)
1709	{	1710	{
1710	focus = 1;	1711	focus = 1;
1711	want_refresh = 1;	1712	want_refresh = 1;
1712
1713	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714		1713
1715	#if USE_XIM	1714	#if USE_XIM
1716	if (Input_Context != NULL)	1715	if (Input_Context != NULL)
1717	{	1716	{
1718	IMSetPosition ();	1717	IMSetPosition ();
…		…
1730	scr_recolour ();	1729	scr_recolour ();
1731	}	1730	}
1732	#endif	1731	#endif
1733	#if ENABLE_FRILLS	1732	#if ENABLE_FRILLS
1734	if (option (Opt_urgentOnBell))	1733	if (option (Opt_urgentOnBell))
1735	{	1734	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	1735	#endif
		1736
		1737	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743	}	1738	}
1744	}	1739	}
1745		1740
1746	void	1741	void
1747	rxvt_term::focus_out ()	1742	rxvt_term::focus_out ()
…		…
1749	if (focus)	1744	if (focus)
1750	{	1745	{
1751	focus = 0;	1746	focus = 0;
1752	want_refresh = 1;	1747	want_refresh = 1;
1753		1748
1754	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1749	#if ENABLE_FRILLS
1755		1750	if (option (Opt_urgentOnBell))
		1751	set_urgency (0);
		1752	#endif
1756	#if ENABLE_FRILLS \|\| ISO_14755	1753	#if ENABLE_FRILLS \|\| ISO_14755
1757	if (iso14755buf)	1754	if (iso14755buf)
1758	{	1755	{
1759	iso14755buf = 0;	1756	iso14755buf = 0;
1760	# if ISO_14755	1757	# if ISO_14755
…		…
1777	{	1774	{
1778	pix_colors = pix_colors_unfocused;	1775	pix_colors = pix_colors_unfocused;
1779	scr_recolour ();	1776	scr_recolour ();
1780	}	1777	}
1781	#endif	1778	#endif
		1779
		1780	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782	}	1781	}
1783	}	1782	}
1784		1783
1785	void	1784	void
1786	rxvt_term::update_fade_color (unsigned int idx)	1785	rxvt_term::update_fade_color (unsigned int idx)
…		…
1947	/*	1946	/*
1948	* Scrollbar window processing of button press	1947	* Scrollbar window processing of button press
1949	*/	1948	*/
1950	if (scrollBar.state && ev.window == scrollBar.win)	1949	if (scrollBar.state && ev.window == scrollBar.win)
1951	{	1950	{
1952	scrollBar.setIdle ();	1951	page_dirn direction = NO_DIR;
		1952
		1953	if (scrollBar.upButton (ev.y))
		1954	direction = UP; /* up */
		1955	else if (scrollBar.dnButton (ev.y))
		1956	direction = DN; /* down */
		1957
		1958	scrollBar.state = STATE_IDLE;
1953	/*	1959	/*
1954	* Rxvt-style scrollbar:	1960	* Rxvt-style scrollbar:
1955	* move up if mouse is above slider	1961	* move up if mouse is above slider
1956	* move dn if mouse is below slider	1962	* move dn if mouse is below slider
1957	*	1963	*
…		…
1966	/*	1972	/*
1967	* Mouse report disabled scrollbar:	1973	* Mouse report disabled scrollbar:
1968	* arrow buttons - send up/down	1974	* arrow buttons - send up/down
1969	* click on scrollbar - send pageup/down	1975	* click on scrollbar - send pageup/down
1970	*/	1976	*/
1971	if ((scrollBar.style == R_SB_NEXT	1977	if (direction == UP)
1972	&& scrollbarnext_upButton (ev.y))
1973	\|\| (scrollBar.style == R_SB_RXVT
1974	&& scrollbarrxvt_upButton (ev.y)))
1975	tt_printf ("\033[A");	1978	tt_printf ("\033[A");
1976	else if ((scrollBar.style == R_SB_NEXT	1979	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");	1980	tt_printf ("\033[B");
1981	else	1981	else
1982	switch (ev.button)	1982	switch (ev.button)
1983	{	1983	{
1984	case Button2:	1984	case Button2:
…		…
1992	break;	1992	break;
1993	}	1993	}
1994	}	1994	}
1995	else	1995	else
1996	#endif /* NO_SCROLLBAR_REPORT */	1996	#endif /* NO_SCROLLBAR_REPORT */
1997
1998	{
1999	char upordown = 0;
2000
2001	if (scrollBar.style == R_SB_NEXT)
2002	{	1997	{
2003	if (scrollbarnext_upButton (ev.y))	1998	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	{	1999	{
2018	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2000	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019	if (!cont_scroll_ev.is_active ())	2001	if (!cont_scroll_ev.is_active ())
2020	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2002	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021	#endif	2003	#endif
2022	if (scr_page (upordown < 0 ? UP : DN, 1))	2004	if (scr_page (direction, 1))
2023	{	2005	{
2024	if (upordown < 0)	2006	if (direction == UP)
2025	scrollBar.setUp ();	2007	scrollBar.state = STATE_UP;
2026	else	2008	else
2027	scrollBar.setDn ();	2009	scrollBar.state = STATE_DOWN;
2028	}	2010	}
2029	}	2011	}
2030	else	2012	else
2031	switch (ev.button)	2013	switch (ev.button)
2032	{	2014	{
…		…
2045	}	2027	}
2046		2028
2047	if (scrollBar.style == R_SB_XTERM	2029	if (scrollBar.style == R_SB_XTERM
2048	\|\| scrollbar_above_slider (ev.y)	2030	\|\| scrollbar_above_slider (ev.y)
2049	\|\| scrollbar_below_slider (ev.y))	2031	\|\| scrollbar_below_slider (ev.y))
2050	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2032	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2051		2033
2052	scrollBar.setMotion ();	2034	scrollBar.state = STATE_MOTION;
2053	break;	2035	break;
2054		2036
2055	case Button1:	2037	case Button1:
2056	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2038	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057	csrO = ev.y - scrollBar.top;	2039	csrO = ev.y - scrollBar.top;
…		…
2071	scr_page (DN, nrow - 1);	2053	scr_page (DN, nrow - 1);
2072	# else	2054	# else
2073	scr_page (DN, nrow / 4);	2055	scr_page (DN, nrow / 4);
2074	# endif	2056	# endif
2075	else	2057	else
2076	scrollBar.setMotion ();	2058	scrollBar.state = STATE_MOTION;
2077	}	2059	}
2078	else	2060	else
2079	{	2061	{
2080	scr_page ((ev.button == Button1 ? DN : UP),	2062	scr_page ((ev.button == Button1 ? DN : UP),
2081	(nrow	2063	(nrow
2082	* scrollbar_position (ev.y)	2064	* scrollbar_position (ev.y)
2083	/ scrollbar_size ()));	2065	/ scrollBar.size ()));
2084	}	2066	}
2085		2067
2086	break;	2068	break;
2087	}	2069	}
2088	}	2070	}
…		…
2098		2080
2099	csrO = 0; /* reset csr Offset */	2081	csrO = 0; /* reset csr Offset */
2100	if (!bypass_keystate)	2082	if (!bypass_keystate)
2101	reportmode = !! (priv_modes & PrivMode_mouse_report);	2083	reportmode = !! (priv_modes & PrivMode_mouse_report);
2102		2084
2103	if (scrollbar_isUpDn ())	2085	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2104	{	2086	{
2105	scrollBar.setIdle ();	2087	scrollBar.state = STATE_IDLE;
2106	scrollbar_show (0);	2088	scrollBar.show (0);
2107	}	2089	}
2108		2090
2109	#ifdef SELECTION_SCROLLING	2091	#ifdef SELECTION_SCROLLING
2110	sel_scroll_ev.stop();	2092	sel_scroll_ev.stop();
2111	#endif	2093	#endif
…		…
2194	}	2176	}
2195	else	2177	else
2196	# endif	2178	# endif
2197	{	2179	{
2198	scr_page (v, i);	2180	scr_page (v, i);
2199	scrollbar_show (1);	2181	scrollBar.show (1);
2200	}	2182	}
2201	}	2183	}
2202	break;	2184	break;
2203	#endif	2185	#endif
2204	}	2186	}
2205	}	2187	}
2206	}	2188	}
2207		2189
2208	/}}} /	2190	/}}} /
2209		2191
2210	bool	2192	void
2211	rxvt_term::cmd_parse ()	2193	rxvt_term::cmd_parse ()
2212	{	2194	{
2213	bool flag = false;
2214	wchar_t ch = NOCHAR;	2195	wchar_t ch = NOCHAR;
2215	char *seq_begin; // remember start of esc-sequence here	2196	char *seq_begin; // remember start of esc-sequence here
2216		2197
2217	for (;;)	2198	for (;;)
2218	{	2199	{
2219	if (ch == NOCHAR)	2200	if (expect_false (ch == NOCHAR))
2220	{	2201	{
2221	seq_begin = cmdbuf_ptr;	2202	seq_begin = cmdbuf_ptr;
2222	ch = next_char ();	2203	ch = next_char ();
2223		2204
2224	if (ch == NOCHAR)	2205	if (ch == NOCHAR)
2225	break;	2206	break;
2226	}	2207	}
2227		2208
2228	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2209	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2229	{	2210	{
2230	if (!seen_input)	2211	if (expect_false (!seen_input))
2231	{	2212	{
2232	seen_input = 1;	2213	seen_input = 1;
2233	// many badly-written programs (e.g. jed) contain a race condition:	2214	// many badly-written programs (e.g. jed) contain a race condition:
2234	// they first read the screensize and then install a SIGWINCH handler.	2215	// they first read the screensize and then install a SIGWINCH handler.
2235	// some window managers resize the window early, and these programs	2216	// some window managers resize the window early, and these programs
…		…
2248	wchar_t *str = buf;	2229	wchar_t *str = buf;
2249	wchar_t *eol = str + min (ncol, UBUFSIZ);	2230	wchar_t *eol = str + min (ncol, UBUFSIZ);
2250		2231
2251	for (;;)	2232	for (;;)
2252	{	2233	{
2253	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2234	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254	break;	2235	break;
2255		2236
2256	*str++ = ch;	2237	*str++ = ch;
2257		2238
2258	if (ch == C0_LF \|\| str >= eol)	2239	if (expect_false (ch == C0_LF \|\| str >= eol))
2259	{	2240	{
2260	if (ch == C0_LF)	2241	if (ch == C0_LF)
2261	nlines++;	2242	nlines++;
2262		2243
2263	refresh_count++;	2244	refresh_count++;
…		…
2312	* What the heck we'll cheat and only refresh less than every page-full.	2293	* What the heck we'll cheat and only refresh less than every page-full.
2313	* if skipScroll is enabled.	2294	* if skipScroll is enabled.
2314	*/	2295	*/
2315	if (refreshnow)	2296	if (refreshnow)
2316	{	2297	{
2317	flag = true;
2318	scr_refresh ();	2298	scr_refresh ();
2319	want_refresh = 1;	2299	want_refresh = 1;
2320	}	2300	}
2321
2322	}	2301	}
2323	else	2302	else
2324	{	2303	{
2325	try	2304	try
2326	{	2305	{
…		…
2334	}	2313	}
2335		2314
2336	ch = NOCHAR;	2315	ch = NOCHAR;
2337	}	2316	}
2338	}	2317	}
2339
2340	return flag;
2341	}	2318	}
2342		2319
2343	// read the next character	2320	// read the next character
2344	wchar_t	2321	wchar_t
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	mbstate.reset (); // 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;
…		…
2712	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2691	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713	case C1_SCI: /* ESC Z */	2692	case C1_SCI: /* ESC Z */
2714	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2693	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715	break; /* steal obsolete ESC [ c */	2694	break; /* steal obsolete ESC [ c */
2716		2695
2717	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2696	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718	case C1_CSI: /* ESC [ */	2697	case C1_CSI: /* ESC [ */
2719	process_csi_seq ();	2698	process_csi_seq ();
2720	break;	2699	break;
2721		2700
2722	/* 8.3.90: OPERATING SYSTEM COMMAND */	2701	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723	case C1_OSC: /* ESC ] */	2702	case C1_OSC: /* ESC ] */
2724	process_osc_seq ();	2703	process_osc_seq ();
2725	break;	2704	break;
2726		2705
2727	/* 8.3.106: RESET TO INITIAL STATE */	2706	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
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);
…		…
2787		2766
2788	nargs = 0;	2767	nargs = 0;
2789		2768
2790	priv = 0;	2769	priv = 0;
2791	ch = cmd_getc ();	2770	ch = cmd_getc ();
2792	if (ch >= '<' && ch <= '?')	2771	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2793	{	2772	{
2794	/* '<' '=' '>' '?' */	2773	/* '<' '=' '>' '?' '!' */
2795	priv = ch;	2774	priv = ch;
2796	ch = cmd_getc ();	2775	ch = cmd_getc ();
2797	}	2776	}
2798		2777
2799	/* read any numerical arguments */	2778	/* read any numerical arguments */
…		…
2853		2832
2854	case '?':	2833	case '?':
2855	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2834	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2856	process_terminal_mode (ch, priv, nargs, arg);	2835	process_terminal_mode (ch, priv, nargs, arg);
2857	break;	2836	break;
		2837
		2838	case '!':
		2839	if (ch == CSI_70)
		2840	{
		2841	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2842	scr_soft_reset ();
		2843
		2844	static const int pm_h[] = { 7, 25 };
		2845	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2846
		2847	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2848	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2858	}	2849	}
		2850	break;
		2851	}
		2852
2859	return;	2853	return;
2860	}	2854	}
2861		2855
2862	switch (ch)	2856	switch (ch)
2863	{	2857	{
…		…
3292		3286
3293	/*	3287	/*
3294	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3288	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3295	*/	3289	*/
3296	void	3290	void
3297	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3291	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3298	{	3292	{
3299	int color;	3293	int color;
3300	char buf, name;	3294	char buf, name;
3301	bool query = str[0] == '?' && !str[1];	3295	bool query = str[0] == '?' && !str[1];
3302	int saveop = op;	3296	int saveop = op;
…		…
3343		3337
3344	XFree (value);	3338	XFree (value);
3345	}	3339	}
3346	else	3340	else
3347	{	3341	{
3348	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3342	char *eq = strchr (str, '=');
3349		3343
3350	if (eq)	3344	if (eq)
3351	{	3345	{
3352	*eq = 0;	3346	*eq = 0;
3353	set_utf8_property (display->atom (str), eq + 1);	3347	set_utf8_property (display->atom (str), eq + 1);
…		…
3409	break;	3403	break;
3410	case URxvt_Color_IT:	3404	case URxvt_Color_IT:
3411	process_color_seq (op, Color_IT, str, resp);	3405	process_color_seq (op, Color_IT, str, resp);
3412	break;	3406	break;
3413	#endif	3407	#endif
		3408	case URxvt_Color_border:
		3409	process_color_seq (op, Color_border, str, resp);
		3410	break;
3414	#if ENABLE_TRANSPARENCY	3411	#if ENABLE_TRANSPARENCY
3415	case URxvt_Color_tint:	3412	case URxvt_Color_tint:
3416	process_color_seq (op, Color_tint, str, resp);	3413	process_color_seq (op, Color_tint, str, resp);
3417	{	3414	{
3418	bool changed = false;	3415	bool changed = false;
…		…
3433	case Rxvt_Pixmap:	3430	case Rxvt_Pixmap:
3434	if (!strcmp (str, "?"))	3431	if (!strcmp (str, "?"))
3435	{	3432	{
3436	char str[256];	3433	char str[256];
3437		3434
3438	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3435	sprintf (str, "[%dx%d+%d+%d]",
3439	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3436	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3440	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3437	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3441	process_xterm_seq (XTerm_title, str, CHAR_ST);	3438	process_xterm_seq (XTerm_title, str, CHAR_ST);
3442	}	3439	}
3443	else	3440	else
…		…
3542	break;	3539	break;
3543	#endif	3540	#endif
3544		3541
3545	#if ENABLE_PERL	3542	#if ENABLE_PERL
3546	case URxvt_perl:	3543	case URxvt_perl:
3547	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3544	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3548	; // no responses yet
3549	break;	3545	break;
3550	#endif	3546	#endif
3551	}	3547	}
3552	}	3548	}
3553	/----------------------------------------------------------------------/	3549	/----------------------------------------------------------------------/
…		…
3576	{	3572	{
3577	if (mode == 'r')	3573	if (mode == 'r')
3578	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3574	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579	else	3575	else
3580	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3576	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581	PrivMode (state, bit);	3577	set_privmode (bit, state);
3582	}	3578	}
3583		3579
3584	return state;	3580	return state;
3585	}	3581	}
3586		3582
…		…
3594	static const struct	3590	static const struct
3595	{	3591	{
3596	const int argval;	3592	const int argval;
3597	const unsigned long bit;	3593	const unsigned long bit;
3598	} argtopriv[] = {	3594	} argtopriv[] = {
3599	{ 1, PrivMode_aplCUR },	3595	{ 1, PrivMode_aplCUR }, // DECCKM
3600	{ 2, PrivMode_vt52 },	3596	{ 2, PrivMode_vt52 },
3601	{ 3, PrivMode_132 },	3597	{ 3, PrivMode_132 }, // DECCOLM
3602	{ 4, PrivMode_smoothScroll },	3598	{ 4, PrivMode_smoothScroll }, // DECSCLM
3603	{ 5, PrivMode_rVideo },	3599	{ 5, PrivMode_rVideo }, // DECSCNM
3604	{ 6, PrivMode_relOrigin },	3600	{ 6, PrivMode_relOrigin }, // DECOM
3605	{ 7, PrivMode_Autowrap },	3601	{ 7, PrivMode_Autowrap }, // DECAWM
3606	// 8, bi-directional support mode	3602	// 8, auto-repeat keys // DECARM
3607	{ 9, PrivMode_MouseX10 },	3603	{ 9, PrivMode_MouseX10 },
3608	// 18, 19 printing-related	3604	// 18 end FF to printer after print screen
		3605	// 19 Print screen prints full screen/scorll region
3609	{ 25, PrivMode_VisibleCursor },	3606	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3610	#ifdef scrollBar_esc	3607	#ifdef scrollBar_esc
3611	{ scrollBar_esc, PrivMode_scrollBar },	3608	{ scrollBar_esc, PrivMode_scrollBar },
3612	#endif	3609	#endif
3613	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3610	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3611	// 38, tektronix mode // DECTEK
3614	{ 40, PrivMode_132OK },	3612	{ 40, PrivMode_132OK },
3615	// 41 xterm more fixes NYI	3613	// 41 xterm more fixes NYI
3616	// 45 margin bell NYI	3614	// 45 margin bell NYI
3617	// 46 start logging	3615	// 46 start logging
3618	{ 47, PrivMode_Screen },	3616	{ 47, PrivMode_Screen },
3619	{ 66, PrivMode_aplKP },	3617	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3620	#ifndef NO_BACKSPACE_KEY	3618	#ifndef NO_BACKSPACE_KEY
3621	{ 67, PrivMode_BackSpace },	3619	{ 67, PrivMode_BackSpace }, // DECBKM
3622	#endif	3620	#endif
3623	{ 1000, PrivMode_MouseX11 },	3621	{ 1000, PrivMode_MouseX11 },
3624	{ 1002, PrivMode_MouseBtnEvent },	3622	{ 1002, PrivMode_MouseBtnEvent },
3625	{ 1003, PrivMode_MouseAnyEvent },	3623	{ 1003, PrivMode_MouseAnyEvent },
3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3624	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3665		3663
3666	scr_touch (true);	3664	scr_touch (true);
3667	break;	3665	break;
3668	#endif	3666	#endif
3669	case 1048: /* alternative cursor save */	3667	case 1048: /* alternative cursor save */
3670	case 1049:
3671	if (option (Opt_secondaryScreen))	3668	if (option (Opt_secondaryScreen))
3672	if (mode == 0)	3669	if (mode == 0)
3673	scr_cursor (RESTORE);	3670	scr_cursor (RESTORE);
3674	else if (mode == 1)	3671	else if (mode == 1)
3675	scr_cursor (SAVE);	3672	scr_cursor (SAVE);
…		…
3684	case 2: /* VT52 mode */	3681	case 2: /* VT52 mode */
3685	/* oddball mode. should be set regardless of set/reset	3682	/* oddball mode. should be set regardless of set/reset
3686	* parameter. Return from VT52 mode with an ESC < from	3683	* parameter. Return from VT52 mode with an ESC < from
3687	* within VT52 mode	3684	* within VT52 mode
3688	*/	3685	*/
3689	PrivMode (1, PrivMode_vt52);	3686	set_privmode (PrivMode_vt52, 1);
3690	break;	3687	break;
3691	case 3: /* 80/132 */	3688	case 3: /* 80/132 */
3692	if (priv_modes & PrivMode_132OK)	3689	if (priv_modes & PrivMode_132OK)
3693	{
3694	scr_poweron ();
3695	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3690	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3696	}
3697	break;	3691	break;
3698	case 4: /* smooth scrolling */	3692	case 4: /* smooth scrolling */
3699	set_option (Opt_jumpScroll, !state);	3693	set_option (Opt_jumpScroll, !state);
3700	break;	3694	break;
3701	case 5: /* reverse video */	3695	case 5: /* reverse video */
…		…
3712	if (state) /* orthogonal */	3706	if (state) /* orthogonal */
3713	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3707	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3714	break;	3708	break;
3715	#ifdef scrollBar_esc	3709	#ifdef scrollBar_esc
3716	case scrollBar_esc:	3710	case scrollBar_esc:
3717	if (scrollbar_mapping (state))	3711	if (scrollBar.map (state))
3718	{	3712	{
3719	resize_all_windows (0, 0, 0);	3713	resize_all_windows (0, 0, 0);
3720	scr_touch (true);	3714	scr_touch (true);
3721	}	3715	}
3722	break;	3716	break;
…		…
3743	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3737	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3744	vt_emask_mouse = PointerMotionMask;	3738	vt_emask_mouse = PointerMotionMask;
3745	}	3739	}
3746	else	3740	else
3747	vt_emask_mouse = NoEventMask;	3741	vt_emask_mouse = NoEventMask;
		3742
3748	vt_select_input ();	3743	vt_select_input ();
3749	break;	3744	break;
3750	case 1010: /* scroll to bottom on TTY output inhibit */	3745	case 1010: /* scroll to bottom on TTY output inhibit */
3751	set_option (Opt_scrollTtyOutput, !state);	3746	set_option (Opt_scrollTtyOutput, !state);
3752	break;	3747	break;
3753	case 1011: /* scroll to bottom on key press */	3748	case 1011: /* scroll to bottom on key press */
3754	set_option (Opt_scrollTtyKeypress, state);	3749	set_option (Opt_scrollTtyKeypress, state);
3755	break;	3750	break;
3756	case 1047: /* secondary screen w/ clearing last */	3751	case 1047: /* secondary screen w/ clearing last */
3757	if (option (Opt_secondaryScreen))	3752	if (option (Opt_secondaryScreen))
3758	if (current_screen != PRIMARY)	3753	if (!state)
3759	scr_erase_screen (2);	3754	scr_erase_screen (2);
		3755
3760	scr_change_screen (state);	3756	scr_change_screen (state);
3761	break;	3757	break;
3762	case 1049: /* secondary screen w/ clearing first */	3758	case 1049: /* secondary screen w/ clearing first */
		3759	if (option (Opt_secondaryScreen))
		3760	if (state)
		3761	scr_cursor (SAVE);
		3762
3763	scr_change_screen (state);	3763	scr_change_screen (state);
		3764
3764	if (option (Opt_secondaryScreen))	3765	if (option (Opt_secondaryScreen))
3765	if (current_screen != PRIMARY)	3766	if (state)
3766	scr_erase_screen (2);	3767	scr_erase_screen (2);
		3768	else
		3769	scr_cursor (RESTORE);
3767	break;	3770	break;
3768	default:	3771	default:
3769	break;	3772	break;
3770	}	3773	}
3771	}	3774	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.397 by root, Sat Jan 26 11:40:47 2008 UTC vs. Revision 1.437 by sf-exg, Fri Jan 29 17:27:36 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.397 by root, Sat Jan 26 11:40:47 2008 UTC vs.
Revision 1.437 by sf-exg, Fri Jan 29 17:27:36 2010 UTC