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

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.438 by root, Thu Feb 4 21:55:12 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.438 by root, Thu Feb 4 21:55:12 2010 UTC