ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.391 by root, Wed Jan 9 01:14:29 2008 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC

…		…
162		162
163	void	163	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font *f = (*fs)[fs->find_font (ch)];
168	wchar_t *chr, *alloc, ch2, *fname;	167	wchar_t *chr, *alloc, ch2, **fname;
169	int len;	168	int len;
170
171	fname = rxvt_utf8towcs (f->name);
172		169
173	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
174	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
175	{	172	{
176	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
197	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
198	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
199	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
201		198
		199	int width = 0;
		200	fname = rxvt_temp_buf<wchar_t *> (len);
		201	for (int i = 0; i < len; i++)
		202	{
		203	rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
		204	fname[i] = rxvt_utf8towcs (f->name);
202	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
203		207
204	max_it (width, 8+5); // for char + hex	208	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
206		210
207	if (y >= 0)	211	if (y >= 0)
208	{	212	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210	x = 0;	214	x = 0;
211	}	215	}
212		216
213	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
214		218
215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216		220
217	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
218	{	222	{
…		…
237	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
238	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
240	// }	244	// }
241	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
242	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
243
244	free (fname);	249	free (fname[i]);
		250	}
245		251
246	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
247	if (alloc)	253	if (alloc)
248	delete [] alloc;	254	delete [] alloc;
249	# endif	255	# endif
…		…
279	}	285	}
280		286
281	iso14755buf = 0;	287	iso14755buf = 0;
282	}	288	}
283		289
284	int	290	static int
285	rxvt_term::hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
286	{	292	{
287	// check wether this event corresponds to a hex digit	293	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	294	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	295	for (int index = 0; index < 8; index++)
290	{	296	{
291	KeySym k = XLookupKeysym (&ev, index);	297	KeySym k = XLookupKeysym (&ev, index);
292		298
…		…
298		304
299	return -1;	305	return -1;
300	}	306	}
301	#endif	307	#endif
302		308
		309	static inline KeySym
		310	translate_keypad (KeySym keysym, bool kp)
		311	{
		312	#ifdef XK_KP_Home
		313	static const KeySym keypadtrans[] = {
		314	XK_KP_7, // XK_KP_Home
		315	XK_KP_4, // XK_KP_Left
		316	XK_KP_8, // XK_KP_Up
		317	XK_KP_6, // XK_KP_Right
		318	XK_KP_2, // XK_KP_Down
		319	# ifndef UNSHIFTED_SCROLLKEYS
		320	XK_KP_9, // XK_KP_Prior
		321	XK_KP_3, // XK_KP_Next
		322	# else
		323	XK_Prior,
		324	XK_Next,
		325	# endif
		326	XK_KP_1, // XK_KP_End
		327	XK_KP_5, // XK_KP_Begin
		328	};
		329
		330	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		331	{
		332	unsigned int index = keysym - XK_KP_Home;
		333	keysym = kp ? keypadtrans[index] : XK_Home + index;
		334	}
		335	else if (keysym == XK_KP_Insert)
		336	keysym = kp ? XK_KP_0 : XK_Insert;
		337	# ifndef NO_DELETE_KEY
		338	else if (keysym == XK_KP_Delete)
		339	keysym = kp ? XK_KP_Decimal : XK_Delete;
		340	# endif
		341	#endif
		342	return keysym;
		343	}
		344
		345	static inline int
		346	map_function_key (KeySym keysym)
		347	{
		348	int param = 0;
		349
		350	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		351	{
		352	param = 11 + keysym - XK_F1;
		353	if (keysym >= XK_F17)
		354	param += 4;
		355	else if (keysym >= XK_F15)
		356	param += 3;
		357	else if (keysym >= XK_F11)
		358	param += 2;
		359	else if (keysym >= XK_F6)
		360	param += 1;
		361	}
		362	else
		363	switch (keysym)
		364	{
		365	case XK_Find:
		366	param = 1;
		367	break;
		368	case XK_Insert:
		369	param = 2;
		370	break;
		371	#ifdef DXK_Remove
		372	case DXK_Remove:
		373	#endif
		374	case XK_Execute:
		375	param = 3;
		376	break;
		377	case XK_Select:
		378	param = 4;
		379	break;
		380	#ifndef UNSHIFTED_SCROLLKEYS
		381	case XK_Prior:
		382	param = 5;
		383	break;
		384	case XK_Next:
		385	param = 6;
		386	break;
		387	case XK_Home:
		388	param = 7;
		389	break;
		390	case XK_End:
		391	param = 8;
		392	break;
		393	#endif
		394	case XK_Help:
		395	param = 28;
		396	break;
		397	case XK_Menu:
		398	param = 29;
		399	break;
		400	}
		401	return param;
		402	}
		403
303	void	404	void
304	rxvt_term::key_press (XKeyEvent &ev)	405	rxvt_term::key_press (XKeyEvent &ev)
305	{	406	{
306	int ctrl, meta, shft, len;	407	int ctrl, meta, shft, len;
307	unsigned int newlen;
308	KeySym keysym;	408	KeySym keysym;
309	int valid_keysym;	409	int valid_keysym;
310	char kbuf[KBUFSZ];	410	char kbuf[KBUFSZ];
311		411
312	#if ISO_14755	412	#if ISO_14755
…		…
321	* Always permit `shift' to override the current setting	421	* Always permit `shift' to override the current setting
322	*/	422	*/
323	shft = ev.state & ShiftMask;	423	shft = ev.state & ShiftMask;
324	ctrl = ev.state & ControlMask;	424	ctrl = ev.state & ControlMask;
325	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
326
327	if (numlock_state || (ev.state & ModNumLockMask))
328	{
329	numlock_state = (ev.state & ModNumLockMask);
330	PrivMode ((!numlock_state), PrivMode_aplKP);
331	}
332		426
333	kbuf[0] = 0;	427	kbuf[0] = 0;
334		428
335	#ifdef USE_XIM	429	#ifdef USE_XIM
336	if (Input_Context)	430	if (Input_Context)
…		…
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	if (ev.state & ModNumLockMask)
		653	kp = false;
		654	switch (translate_keypad (keysym, kp))
552	{	655	{
553	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	656	#ifndef NO_BACKSPACE_KEY
554	newlen = 1;	657	case XK_BackSpace:
555	#ifdef XK_KP_Home	658	if (priv_modes & PrivMode_HaveBackSpace)
556	static const KeySym keypadtrans[] = {	659	{
557	XK_KP_7, // XK_KP_Home	660	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558	XK_KP_4, // XK_KP_Left	661	^ !!ctrl) ? '\b' : '\177';
559	XK_KP_8, // XK_KP_Up	662	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	};	663	}
		664	else
		665	strcpy (kbuf, rs[Rs_backspace_key]);
		666	break;
		667	#endif
		668	#ifndef NO_DELETE_KEY
		669	case XK_Delete:
		670	strcpy (kbuf, rs[Rs_delete_key]);
		671	break;
		672	#endif
		673	case XK_Tab:
		674	if (shft)
		675	strcpy (kbuf, "\033[Z");
		676	else
		677	{
		678	#ifdef CTRL_TAB_MAKES_META
		679	if (ctrl)
		680	meta = 1;
		681	#endif
		682	#ifdef MOD4_TAB_MAKES_META
		683	if (ev.state & Mod4Mask)
		684	meta = 1;
		685	#endif
		686	newlen = 0;
		687	}
		688	break;
572		689
573	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	690	case XK_Up: /* "\033[A" */
		691	case XK_Down: /* "\033[B" */
		692	case XK_Right: /* "\033[C" */
		693	case XK_Left: /* "\033[D" */
		694	strcpy (kbuf, "\033[Z");
		695	kbuf[2] = "DACB"[keysym - XK_Left];
		696	/* do Shift first */
		697	if (shft)
		698	kbuf[2] = "dacb"[keysym - XK_Left];
		699	else if (ctrl)
		700	{
		701	kbuf[1] = 'O';
		702	kbuf[2] = "dacb"[keysym - XK_Left];
		703	}
		704	else if (priv_modes & PrivMode_aplCUR)
		705	kbuf[1] = 'O';
		706	break;
		707
		708	case XK_KP_Enter:
		709	/* allow shift to override */
		710	if (kp)
		711	{
		712	strcpy (kbuf, "\033OM");
		713	break;
		714	}
		715
		716	/* FALLTHROUGH */
		717
		718	case XK_Return:
		719	if (priv_modes & PrivMode_LFNL)
		720	{
		721	kbuf[0] = '\015';
		722	kbuf[1] = '\012';
		723	kbuf[2] = '\0';
		724	}
		725	else
		726	{
		727	kbuf[0] = '\015';
		728	kbuf[1] = '\0';
		729	}
		730	break;
		731
		732	case XK_KP_F1: /* "\033OP" */
		733	case XK_KP_F2: /* "\033OQ" */
		734	case XK_KP_F3: /* "\033OR" */
		735	case XK_KP_F4: /* "\033OS" */
		736	strcpy (kbuf, "\033OP");
		737	kbuf[2] += (keysym - XK_KP_F1);
		738	break;
		739
		740	case XK_KP_Multiply: /* "\033Oj" : "*" */
		741	case XK_KP_Add: /* "\033Ok" : "+" */
		742	case XK_KP_Separator: /* "\033Ol" : "," */
		743	case XK_KP_Subtract: /* "\033Om" : "-" */
		744	case XK_KP_Decimal: /* "\033On" : "." */
		745	case XK_KP_Divide: /* "\033Oo" : "/" */
		746	case XK_KP_0: /* "\033Op" : "0" */
		747	case XK_KP_1: /* "\033Oq" : "1" */
		748	case XK_KP_2: /* "\033Or" : "2" */
		749	case XK_KP_3: /* "\033Os" : "3" */
		750	case XK_KP_4: /* "\033Ot" : "4" */
		751	case XK_KP_5: /* "\033Ou" : "5" */
		752	case XK_KP_6: /* "\033Ov" : "6" */
		753	case XK_KP_7: /* "\033Ow" : "7" */
		754	case XK_KP_8: /* "\033Ox" : "8" */
		755	case XK_KP_9: /* "\033Oy" : "9" */
		756	/* allow shift to override */
		757	if (kp)
		758	{
		759	strcpy (kbuf, "\033Oj");
		760	kbuf[2] += (keysym - XK_KP_Multiply);
		761	}
		762	else
		763	{
		764	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		765	kbuf[1] = '\0';
		766	}
		767	break;
		768
		769	default:
574	{	770	{
575	unsigned int index = keysym - XK_KP_Home;	771	int param = map_function_key (keysym);
576	keysym = kp ? keypadtrans[index] : XK_Home + index;	772	if (param > 0)
		773	sprintf (kbuf,"\033[%d~", param);
		774	else
		775	newlen = 0;
577	}	776	}
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;	777	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	}	778	}
		779
		780	if (newlen)
		781	len = strlen (kbuf);
795		782
796	/*	783	/*
797	* Pass meta for all function keys, if 'meta' option set	784	* Pass meta for all function keys, if 'meta' option set
798	*/	785	*/
799	#ifdef META8_OPTION	786	#ifdef META8_OPTION
…		…
1033	}	1020	}
1034	while (row < end_row);	1021	while (row < end_row);
1035	}	1022	}
1036		1023
1037	scr_refresh ();	1024	scr_refresh ();
1038	scrollbar_show (1);	1025	scrollBar.show (1);
1039	#ifdef USE_XIM	1026	#ifdef USE_XIM
1040	IMSendSpot ();	1027	IMSendSpot ();
1041	#endif	1028	#endif
1042	}	1029	}
1043		1030
1044	display->flush ();	1031	display->flush ();
1045	}	1032	}
1046		1033
1047	/* checks wether a refresh is requested and starts the refresh timer */	1034	/* checks whether a refresh is requested and starts the refresh timer */
1048	void	1035	void
1049	rxvt_term::refresh_check ()	1036	rxvt_term::refresh_check ()
1050	{	1037	{
1051	if (want_refresh && !flush_ev.is_active ())	1038	if (want_refresh && !flush_ev.is_active ())
1052	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1039	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1079	{	1066	{
1080	if (scr_refresh_rend (RS_Blink, RS_Blink))	1067	if (scr_refresh_rend (RS_Blink, RS_Blink))
1081	{	1068	{
1082	hidden_text = !hidden_text;	1069	hidden_text = !hidden_text;
1083	want_refresh = 1;	1070	want_refresh = 1;
1084	refresh_check ();	1071	refresh_check ();
1085	}	1072	}
1086	else	1073	else
1087	w.stop ();	1074	w.stop ();
1088	}	1075	}
1089	#endif	1076	#endif
1090		1077
1091	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1078	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092	void	1079	void
1093	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1080	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094	{	1081	{
1095	if ((scrollbar_isUp () || scrollbar_isDn ())	1082	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096	&& scr_page (scrollbar_isUp () ? UP : DN, 1))	1083	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097	{	1084	{
1098	want_refresh = 1;	1085	want_refresh = 1;
1099	refresh_check ();	1086	refresh_check ();
1100	}	1087	}
1101	else	1088	else
…		…
1145	{	1132	{
1146	// this should really be sched_yield(), but the linux guys thought	1133	// this should really be sched_yield(), but the linux guys thought
1147	// that giving a process calling sched_yield () less cpu time than	1134	// 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	1135	// ones with high nice levels is a useful thing to do. It surely is is
1149	// allowed by the sus... as is returning ENOSYS.	1136	// allowed by the sus... as is returning ENOSYS.
		1137	// since the linux guys additionally thought that breaking the only
		1138	// known workaround against their unusable sched_yield hack is cool,
		1139	// we just nanosleep a bit and hope for the best.
1150		1140
1151	struct timespec ts = { 0, 0 };	1141	struct timespec ts = { 0, 1000 };
1152	nanosleep (&ts, 0);	1142	nanosleep (&ts, 0);
1153		1143
1154	w.stop ();	1144	w.stop ();
1155	}	1145	}
1156		1146
…		…
1206	{	1196	{
1207	make_current ();	1197	make_current ();
1208		1198
1209	if (revents & ev::READ)	1199	if (revents & ev::READ)
1210	// loop, but don't allow a single term to monopolize us	1200	// loop, but don't allow a single term to monopolize us
1211	while (pty_fill ())	1201	for (int i = CBUFCNT; i-- && pty_fill (); )
1212	if (cmd_parse ())	1202	cmd_parse ();
1213	break;
1214		1203
1215	if (revents & ev::WRITE)	1204	if (revents & ev::WRITE)
1216	pty_write ();	1205	pty_write ();
1217		1206
1218	refresh_check ();	1207	refresh_check ();
…		…
1438	&& ev.xfocus.mode != NotifyGrab)	1427	&& ev.xfocus.mode != NotifyGrab)
1439	focus_out ();	1428	focus_out ();
1440	break;	1429	break;
1441		1430
1442	case ConfigureNotify:	1431	case ConfigureNotify:
1443	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1432	/*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,	1433	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445	szHint.width, szHint.height); */	1434	szHint.width, szHint.height);*/
1446	if (ev.xconfigure.window == parent[0])	1435	if (ev.xconfigure.window == parent[0])
1447	{	1436	{
1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1437	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449	;	1438	;
1450		1439
…		…
1455	}	1444	}
1456	else	1445	else
1457	{	1446	{
1458	#ifdef HAVE_BG_PIXMAP	1447	#ifdef HAVE_BG_PIXMAP
1459	if (bgPixmap.window_position_sensitive ())	1448	if (bgPixmap.window_position_sensitive ())
		1449	{
		1450	if (mapped)
1460	update_background ();	1451	update_background ();
		1452	else
		1453	bgPixmap.invalidate ();
		1454	}
1461	#endif	1455	#endif
1462	}	1456	}
1463		1457
1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1458	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465	}	1459	}
…		…
1472	selection_property (ev.xproperty.window, ev.xproperty.atom);	1466	selection_property (ev.xproperty.window, ev.xproperty.atom);
1473		1467
1474	break;	1468	break;
1475		1469
1476	case SelectionClear:	1470	case SelectionClear:
1477	selection_clear ();	1471	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1478	break;	1472	break;
1479		1473
1480	case SelectionNotify:	1474	case SelectionNotify:
1481	if (selection_wait == Sel_normal)	1475	if (selection_wait == Sel_normal)
1482	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1476	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1485	case SelectionRequest:	1479	case SelectionRequest:
1486	selection_send (ev.xselectionrequest);	1480	selection_send (ev.xselectionrequest);
1487	break;	1481	break;
1488		1482
1489	case MapNotify:	1483	case MapNotify:
		1484	#ifdef HAVE_BG_PIXMAP
		1485	/* This is needed spcifically to fix the case of no window manager or a
		1486	* non-reparenting window manager. In those cases we never get first
		1487	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1488	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1489	* reparenting.
		1490	* We should not render background immidiately, as there could be several
		1491	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1492	* by scheduling background redraw as soon as we can, but giving a short
		1493	* bit of time for ConfigureNotifies to arrive.
		1494	* We should render background PRIOR to drawing any text, but AFTER all
		1495	* of ConfigureNotifys for the best results.
		1496	*/
		1497	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1498	update_background_ev.start (0.025);
		1499	#endif
1490	mapped = 1;	1500	mapped = 1;
1491	#ifdef TEXT_BLINK	1501	#ifdef TEXT_BLINK
1492	text_blink_ev.start ();	1502	text_blink_ev.start ();
1493	#endif	1503	#endif
1494	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1504	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
…		…
1532	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1542	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1533	;	1543	;
1534		1544
1535	if (scrollBar.state && ev.xany.window == scrollBar.win)	1545	if (scrollBar.state && ev.xany.window == scrollBar.win)
1536	{	1546	{
1537	scrollBar.setIdle ();	1547	scrollBar.state = STATE_IDLE;
1538	scrollbar_show (0);	1548	scrollBar.show (0);
1539	}	1549	}
1540	}	1550	}
1541	break;	1551	break;
1542		1552
1543	case MotionNotify:	1553	case MotionNotify:
…		…
1630	#ifdef MOUSE_THRESHOLD	1640	#ifdef MOUSE_THRESHOLD
1631	}	1641	}
1632	#endif	1642	#endif
1633	}	1643	}
1634	}	1644	}
1635	else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)	1645	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1636	{	1646	{
1637	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1647	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1638	MotionNotify, &ev))	1648	MotionNotify, &ev))
1639	;	1649	;
1640		1650
…		…
1642	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1643	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1644	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1645	&unused_mask);	1655	&unused_mask);
1646	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1647	scrollbar_size ());	1657	scrollBar.size ());
1648	want_refresh = 1;	1658	want_refresh = 1;
1649	scrollbar_show (1);	1659	scrollBar.show (1);
1650	}	1660	}
1651	break;	1661	break;
1652	}	1662	}
1653		1663
1654	#if defined(CURSOR_BLINK)	1664	#if defined(CURSOR_BLINK)
…		…
1679	#endif	1689	#endif
1680		1690
1681	refresh_check ();	1691	refresh_check ();
1682	}	1692	}
1683		1693
		1694	#if ENABLE_FRILLS
		1695	void
		1696	rxvt_term::set_urgency (bool enable)
		1697	{
		1698	if (enable == urgency_hint)
		1699	return;
		1700
		1701	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1702	{
		1703	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1704	XSetWMHints (dpy, parent[0], h);
		1705	urgency_hint = enable;
		1706	}
		1707	}
		1708	#endif
		1709
1684	void	1710	void
1685	rxvt_term::focus_in ()	1711	rxvt_term::focus_in ()
1686	{	1712	{
1687	if (!focus)	1713	if (!focus)
1688	{	1714	{
1689	focus = 1;	1715	focus = 1;
1690	want_refresh = 1;	1716	want_refresh = 1;
1691
1692	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1693		1717
1694	#if USE_XIM	1718	#if USE_XIM
1695	if (Input_Context != NULL)	1719	if (Input_Context != NULL)
1696	{	1720	{
1697	IMSetPosition ();	1721	IMSetPosition ();
…		…
1709	scr_recolour ();	1733	scr_recolour ();
1710	}	1734	}
1711	#endif	1735	#endif
1712	#if ENABLE_FRILLS	1736	#if ENABLE_FRILLS
1713	if (option (Opt_urgentOnBell))	1737	if (option (Opt_urgentOnBell))
1714	{	1738	set_urgency (0);
1715	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1716	{
1717	h->flags &= ~XUrgencyHint;
1718	XSetWMHints (dpy, parent[0], h);
1719	}
1720	}
1721	#endif	1739	#endif
		1740
		1741	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722	}	1742	}
1723	}	1743	}
1724		1744
1725	void	1745	void
1726	rxvt_term::focus_out ()	1746	rxvt_term::focus_out ()
…		…
1728	if (focus)	1748	if (focus)
1729	{	1749	{
1730	focus = 0;	1750	focus = 0;
1731	want_refresh = 1;	1751	want_refresh = 1;
1732		1752
1733	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1753	#if ENABLE_FRILLS
1734		1754	if (option (Opt_urgentOnBell))
		1755	set_urgency (0);
		1756	#endif
1735	#if ENABLE_FRILLS || ISO_14755	1757	#if ENABLE_FRILLS || ISO_14755
1736	if (iso14755buf)	1758	if (iso14755buf)
1737	{	1759	{
1738	iso14755buf = 0;	1760	iso14755buf = 0;
1739	# if ISO_14755	1761	# if ISO_14755
…		…
1756	{	1778	{
1757	pix_colors = pix_colors_unfocused;	1779	pix_colors = pix_colors_unfocused;
1758	scr_recolour ();	1780	scr_recolour ();
1759	}	1781	}
1760	#endif	1782	#endif
		1783
		1784	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761	}	1785	}
1762	}	1786	}
1763		1787
1764	void	1788	void
1765	rxvt_term::update_fade_color (unsigned int idx)	1789	rxvt_term::update_fade_color (unsigned int idx)
…		…
1926	/*	1950	/*
1927	* Scrollbar window processing of button press	1951	* Scrollbar window processing of button press
1928	*/	1952	*/
1929	if (scrollBar.state && ev.window == scrollBar.win)	1953	if (scrollBar.state && ev.window == scrollBar.win)
1930	{	1954	{
1931	scrollBar.setIdle ();	1955	page_dirn direction = NO_DIR;
		1956
		1957	if (scrollBar.upButton (ev.y))
		1958	direction = UP; /* up */
		1959	else if (scrollBar.dnButton (ev.y))
		1960	direction = DN; /* down */
		1961
		1962	scrollBar.state = STATE_IDLE;
1932	/*	1963	/*
1933	* Rxvt-style scrollbar:	1964	* Rxvt-style scrollbar:
1934	* move up if mouse is above slider	1965	* move up if mouse is above slider
1935	* move dn if mouse is below slider	1966	* move dn if mouse is below slider
1936	*	1967	*
…		…
1945	/*	1976	/*
1946	* Mouse report disabled scrollbar:	1977	* Mouse report disabled scrollbar:
1947	* arrow buttons - send up/down	1978	* arrow buttons - send up/down
1948	* click on scrollbar - send pageup/down	1979	* click on scrollbar - send pageup/down
1949	*/	1980	*/
1950	if ((scrollBar.style == R_SB_NEXT	1981	if (direction == UP)
1951	&& scrollbarnext_upButton (ev.y))
1952	|| (scrollBar.style == R_SB_RXVT
1953	&& scrollbarrxvt_upButton (ev.y)))
1954	tt_printf ("\033[A");	1982	tt_printf ("\033[A");
1955	else if ((scrollBar.style == R_SB_NEXT	1983	else if (direction == DN)
1956	&& scrollbarnext_dnButton (ev.y))
1957	|| (scrollBar.style == R_SB_RXVT
1958	&& scrollbarrxvt_dnButton (ev.y)))
1959	tt_printf ("\033[B");	1984	tt_printf ("\033[B");
1960	else	1985	else
1961	switch (ev.button)	1986	switch (ev.button)
1962	{	1987	{
1963	case Button2:	1988	case Button2:
…		…
1971	break;	1996	break;
1972	}	1997	}
1973	}	1998	}
1974	else	1999	else
1975	#endif /* NO_SCROLLBAR_REPORT */	2000	#endif /* NO_SCROLLBAR_REPORT */
1976
1977	{
1978	char upordown = 0;
1979
1980	if (scrollBar.style == R_SB_NEXT)
1981	{	2001	{
1982	if (scrollbarnext_upButton (ev.y))	2002	if (direction != NO_DIR)
1983	upordown = -1; /* up */
1984	else if (scrollbarnext_dnButton (ev.y))
1985	upordown = 1; /* down */
1986	}
1987	else if (scrollBar.style == R_SB_RXVT)
1988	{
1989	if (scrollbarrxvt_upButton (ev.y))
1990	upordown = -1; /* up */
1991	else if (scrollbarrxvt_dnButton (ev.y))
1992	upordown = 1; /* down */
1993	}
1994
1995	if (upordown)
1996	{	2003	{
1997	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2004	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998	if (!cont_scroll_ev.is_active ())	2005	if (!cont_scroll_ev.is_active ())
1999	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2006	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000	#endif	2007	#endif
2001	if (scr_page (upordown < 0 ? UP : DN, 1))	2008	if (scr_page (direction, 1))
2002	{	2009	{
2003	if (upordown < 0)	2010	if (direction == UP)
2004	scrollBar.setUp ();	2011	scrollBar.state = STATE_UP;
2005	else	2012	else
2006	scrollBar.setDn ();	2013	scrollBar.state = STATE_DOWN;
2007	}	2014	}
2008	}	2015	}
2009	else	2016	else
2010	switch (ev.button)	2017	switch (ev.button)
2011	{	2018	{
…		…
2024	}	2031	}
2025		2032
2026	if (scrollBar.style == R_SB_XTERM	2033	if (scrollBar.style == R_SB_XTERM
2027	|| scrollbar_above_slider (ev.y)	2034	|| scrollbar_above_slider (ev.y)
2028	|| scrollbar_below_slider (ev.y))	2035	|| scrollbar_below_slider (ev.y))
2029	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2036	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2030		2037
2031	scrollBar.setMotion ();	2038	scrollBar.state = STATE_MOTION;
2032	break;	2039	break;
2033		2040
2034	case Button1:	2041	case Button1:
2035	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2042	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2036	csrO = ev.y - scrollBar.top;	2043	csrO = ev.y - scrollBar.top;
…		…
2050	scr_page (DN, nrow - 1);	2057	scr_page (DN, nrow - 1);
2051	# else	2058	# else
2052	scr_page (DN, nrow / 4);	2059	scr_page (DN, nrow / 4);
2053	# endif	2060	# endif
2054	else	2061	else
2055	scrollBar.setMotion ();	2062	scrollBar.state = STATE_MOTION;
2056	}	2063	}
2057	else	2064	else
2058	{	2065	{
2059	scr_page ((ev.button == Button1 ? DN : UP),	2066	scr_page ((ev.button == Button1 ? DN : UP),
2060	(nrow	2067	(nrow
2061	* scrollbar_position (ev.y)	2068	* scrollbar_position (ev.y)
2062	/ scrollbar_size ()));	2069	/ scrollBar.size ()));
2063	}	2070	}
2064		2071
2065	break;	2072	break;
2066	}	2073	}
2067	}	2074	}
…		…
2077		2084
2078	csrO = 0; /* reset csr Offset */	2085	csrO = 0; /* reset csr Offset */
2079	if (!bypass_keystate)	2086	if (!bypass_keystate)
2080	reportmode = !! (priv_modes & PrivMode_mouse_report);	2087	reportmode = !! (priv_modes & PrivMode_mouse_report);
2081		2088
2082	if (scrollbar_isUpDn ())	2089	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2083	{	2090	{
2084	scrollBar.setIdle ();	2091	scrollBar.state = STATE_IDLE;
2085	scrollbar_show (0);	2092	scrollBar.show (0);
2086	}	2093	}
2087		2094
2088	#ifdef SELECTION_SCROLLING	2095	#ifdef SELECTION_SCROLLING
2089	sel_scroll_ev.stop();	2096	sel_scroll_ev.stop();
2090	#endif	2097	#endif
…		…
2173	}	2180	}
2174	else	2181	else
2175	# endif	2182	# endif
2176	{	2183	{
2177	scr_page (v, i);	2184	scr_page (v, i);
2178	scrollbar_show (1);	2185	scrollBar.show (1);
2179	}	2186	}
2180	}	2187	}
2181	break;	2188	break;
2182	#endif	2189	#endif
2183	}	2190	}
2184	}	2191	}
2185	}	2192	}
2186		2193
2187	/*}}} */	2194	/*}}} */
2188		2195
2189	bool	2196	void
2190	rxvt_term::cmd_parse ()	2197	rxvt_term::cmd_parse ()
2191	{	2198	{
2192	bool flag = false;
2193	wchar_t ch = NOCHAR;	2199	wchar_t ch = NOCHAR;
2194	char *seq_begin; // remember start of esc-sequence here	2200	char *seq_begin; // remember start of esc-sequence here
2195		2201
2196	for (;;)	2202	for (;;)
2197	{	2203	{
2198	if (ch == NOCHAR)	2204	if (expect_false (ch == NOCHAR))
2199	{	2205	{
2200	seq_begin = cmdbuf_ptr;	2206	seq_begin = cmdbuf_ptr;
2201	ch = next_char ();	2207	ch = next_char ();
2202		2208
2203	if (ch == NOCHAR)	2209	if (ch == NOCHAR)
2204	break;	2210	break;
2205	}	2211	}
2206		2212
2207	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2213	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2208	{	2214	{
2209	if (!seen_input)	2215	if (expect_false (!seen_input))
2210	{	2216	{
2211	seen_input = 1;	2217	seen_input = 1;
2212	// many badly-written programs (e.g. jed) contain a race condition:	2218	// many badly-written programs (e.g. jed) contain a race condition:
2213	// they first read the screensize and then install a SIGWINCH handler.	2219	// they first read the screensize and then install a SIGWINCH handler.
2214	// some window managers resize the window early, and these programs	2220	// some window managers resize the window early, and these programs
…		…
2227	wchar_t *str = buf;	2233	wchar_t *str = buf;
2228	wchar_t *eol = str + min (ncol, UBUFSIZ);	2234	wchar_t *eol = str + min (ncol, UBUFSIZ);
2229		2235
2230	for (;;)	2236	for (;;)
2231	{	2237	{
2232	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2238	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2233	break;	2239	break;
2234		2240
2235	*str++ = ch;	2241	*str++ = ch;
2236		2242
2237	if (ch == C0_LF || str >= eol)	2243	if (expect_false (ch == C0_LF || str >= eol))
2238	{	2244	{
2239	if (ch == C0_LF)	2245	if (ch == C0_LF)
2240	nlines++;	2246	nlines++;
2241		2247
2242	refresh_count++;	2248	refresh_count++;
…		…
2291	* What the heck we'll cheat and only refresh less than every page-full.	2297	* What the heck we'll cheat and only refresh less than every page-full.
2292	* if skipScroll is enabled.	2298	* if skipScroll is enabled.
2293	*/	2299	*/
2294	if (refreshnow)	2300	if (refreshnow)
2295	{	2301	{
2296	flag = true;
2297	scr_refresh ();	2302	scr_refresh ();
2298	want_refresh = 1;	2303	want_refresh = 1;
2299	}	2304	}
2300
2301	}	2305	}
2302	else	2306	else
2303	{	2307	{
2304	try	2308	try
2305	{	2309	{
…		…
2313	}	2317	}
2314		2318
2315	ch = NOCHAR;	2319	ch = NOCHAR;
2316	}	2320	}
2317	}	2321	}
2318
2319	return flag;
2320	}	2322	}
2321		2323
2322	// read the next character	2324	// read the next character
2323	wchar_t	2325	wchar_t
2324	rxvt_term::next_char () NOTHROW	2326	rxvt_term::next_char () NOTHROW
2325	{	2327	{
2326	while (cmdbuf_ptr < cmdbuf_endp)	2328	while (cmdbuf_ptr < cmdbuf_endp)
2327	{	2329	{
2328	// assume 7-bit to be ascii ALWAYS	2330	// assume 7-bit to be ascii ALWAYS
2329	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2331	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2330	return *cmdbuf_ptr++;	2332	return *cmdbuf_ptr++;
2331		2333
2332	wchar_t wc;	2334	wchar_t wc;
2333	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2335	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2334		2336
…		…
2338	cmdbuf_ptr = cmdbuf_endp;	2340	cmdbuf_ptr = cmdbuf_endp;
2339	break;	2341	break;
2340	}	2342	}
2341		2343
2342	if (len == (size_t)-1)	2344	if (len == (size_t)-1)
		2345	{
		2346	mbstate.reset (); // reset now undefined conversion state
2343	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2347	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2348	}
2344		2349
2345	// assume wchar == unicode	2350	// assume wchar == unicode
2346	cmdbuf_ptr += len;	2351	cmdbuf_ptr += len;
2347	return wc & UNICODE_MASK;	2352	return wc & UNICODE_MASK;
2348	}	2353	}
…		…
2392	/*----------------------------------------------------------------------*/	2397	/*----------------------------------------------------------------------*/
2393	#ifdef PRINTPIPE	2398	#ifdef PRINTPIPE
2394	FILE *	2399	FILE *
2395	rxvt_term::popen_printer ()	2400	rxvt_term::popen_printer ()
2396	{	2401	{
2397	FILE *stream = popen (rs[Rs_print_pipe], "w");	2402	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2398		2403
2399	if (stream == NULL)	2404	if (stream == NULL)
2400	rxvt_warn ("can't open printer pipe, not printing.\n");	2405	rxvt_warn ("can't open printer pipe, not printing.\n");
2401		2406
2402	return stream;	2407	return stream;
…		…
2413	* simulate attached vt100 printer	2418	* simulate attached vt100 printer
2414	*/	2419	*/
2415	void	2420	void
2416	rxvt_term::process_print_pipe ()	2421	rxvt_term::process_print_pipe ()
2417	{	2422	{
2418	int done;	2423	FILE *fd = popen_printer ();
2419	FILE *fd;
2420		2424
2421	if ((fd = popen_printer ()) == NULL)	2425	if (!fd)
2422	return;	2426	return;
2423		2427
2424	/*	2428	/*
2425	* Send all input to the printer until either ESC[4i or ESC[?4i	2429	* Send all input to the printer until either ESC[4i or ESC[?4i
2426	* is received.	2430	* is received.
2427	*/	2431	*/
2428	for (done = 0; !done;)	2432	for (int done = 0; !done; )
2429	{	2433	{
2430	unsigned char buf[8];	2434	unsigned char buf[8];
2431	unicode_t ch;	2435	unicode_t ch;
2432	unsigned int i, len;	2436	unsigned int i, len;
2433		2437
…		…
2578	break;	2582	break;
2579	case 'Z': /* identify the terminal type */	2583	case 'Z': /* identify the terminal type */
2580	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2584	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581	break;	2585	break;
2582	case '<': /* turn off VT52 mode */	2586	case '<': /* turn off VT52 mode */
2583	PrivMode (0, PrivMode_vt52);	2587	set_privmode (PrivMode_vt52, 0);
2584	break;	2588	break;
2585	case 'F': /* use special graphics character set */	2589	case 'F': /* use special graphics character set */
2586	case 'G': /* use regular character set */	2590	case 'G': /* use regular character set */
2587	/* unimplemented */	2591	/* unimplemented */
2588	break;	2592	break;
…		…
2642	scr_forwardindex ();	2646	scr_forwardindex ();
2643	break;	2647	break;
2644	#endif	2648	#endif
2645	case '=':	2649	case '=':
2646	case '>':	2650	case '>':
2647	PrivMode ((ch == '='), PrivMode_aplKP);	2651	set_privmode (PrivMode_aplKP, ch == '=');
2648	break;	2652	break;
2649		2653
2650	case C1_40:	2654	case C1_40:
2651	cmd_getc ();	2655	cmd_getc ();
2652	break;	2656	break;
…		…
2691	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2695	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692	case C1_SCI: /* ESC Z */	2696	case C1_SCI: /* ESC Z */
2693	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2697	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694	break; /* steal obsolete ESC [ c */	2698	break; /* steal obsolete ESC [ c */
2695		2699
2696	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2700	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697	case C1_CSI: /* ESC [ */	2701	case C1_CSI: /* ESC [ */
2698	process_csi_seq ();	2702	process_csi_seq ();
2699	break;	2703	break;
2700		2704
2701	/* 8.3.90: OPERATING SYSTEM COMMAND */	2705	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702	case C1_OSC: /* ESC ] */	2706	case C1_OSC: /* ESC ] */
2703	process_osc_seq ();	2707	process_osc_seq ();
2704	break;	2708	break;
2705		2709
2706	/* 8.3.106: RESET TO INITIAL STATE */	2710	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707	case 'c':	2711	case 'c':
2708	mbstate.reset ();	2712	mbstate.reset ();
2709	scr_poweron ();	2713	scr_poweron ();
2710	scrollbar_show (1);	2714	scrollBar.show (1);
2711	break;	2715	break;
2712		2716
2713	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2717	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2714	case 'n':	2718	case 'n':
2715	scr_charset_choose (2);	2719	scr_charset_choose (2);
…		…
2766		2770
2767	nargs = 0;	2771	nargs = 0;
2768		2772
2769	priv = 0;	2773	priv = 0;
2770	ch = cmd_getc ();	2774	ch = cmd_getc ();
2771	if (ch >= '<' && ch <= '?')	2775	if ((ch >= '<' && ch <= '?') || ch == '!')
2772	{	2776	{
2773	/* '<' '=' '>' '?' */	2777	/* '<' '=' '>' '?' '!' */
2774	priv = ch;	2778	priv = ch;
2775	ch = cmd_getc ();	2779	ch = cmd_getc ();
2776	}	2780	}
2777		2781
2778	/* read any numerical arguments */	2782	/* read any numerical arguments */
…		…
2827	// versions.	2831	// versions.
2828	//	2832	//
2829	tt_printf ("\033[>%d;95;0c", 'U');	2833	tt_printf ("\033[>%d;95;0c", 'U');
2830	}	2834	}
2831	break;	2835	break;
		2836
2832	case '?':	2837	case '?':
2833	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2838	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834	process_terminal_mode (ch, priv, nargs, arg);	2839	process_terminal_mode (ch, priv, nargs, arg);
2835	break;	2840	break;
		2841
		2842	case '!':
		2843	if (ch == CSI_70)
		2844	{
		2845	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2846	scr_soft_reset ();
		2847
		2848	static const int pm_h[] = { 7, 25 };
		2849	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2850
		2851	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2852	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2836	}	2853	}
		2854	break;
		2855	}
		2856
2837	return;	2857	return;
2838	}	2858	}
2839		2859
2840	switch (ch)	2860	switch (ch)
2841	{	2861	{
…		…
3270		3290
3271	/*	3291	/*
3272	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3292	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3273	*/	3293	*/
3274	void	3294	void
3275	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3295	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3276	{	3296	{
3277	int color;	3297	int color;
3278	char *buf, *name;	3298	char *buf, *name;
3279	bool query = str[0] == '?' && !str[1];	3299	bool query = str[0] == '?' && !str[1];
3280	int saveop = op;	3300	int saveop = op;
…		…
3321		3341
3322	XFree (value);	3342	XFree (value);
3323	}	3343	}
3324	else	3344	else
3325	{	3345	{
3326	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3346	char *eq = strchr (str, '=');
3327		3347
3328	if (eq)	3348	if (eq)
3329	{	3349	{
3330	*eq = 0;	3350	*eq = 0;
3331	set_utf8_property (display->atom (str), eq + 1);	3351	set_utf8_property (display->atom (str), eq + 1);
…		…
3352	*buf++ = '\0';	3372	*buf++ = '\0';
3353		3373
3354	process_color_seq (op, color, name, resp);	3374	process_color_seq (op, color, name, resp);
3355	}	3375	}
3356	break;	3376	break;
		3377	case Rxvt_restoreFG:
3357	case XTerm_Color00:	3378	case XTerm_Color00:
3358	process_color_seq (op, Color_fg, str, resp);	3379	process_color_seq (op, Color_fg, str, resp);
3359	break;	3380	break;
		3381	case Rxvt_restoreBG:
3360	case XTerm_Color01:	3382	case XTerm_Color01:
3361	process_color_seq (op, Color_bg, str, resp);	3383	process_color_seq (op, Color_bg, str, resp);
3362	break;	3384	break;
3363	#ifndef NO_CURSORCOLOR	3385	#ifndef NO_CURSORCOLOR
3364	case XTerm_Color_cursor:	3386	case XTerm_Color_cursor:
…		…
3385	break;	3407	break;
3386	case URxvt_Color_IT:	3408	case URxvt_Color_IT:
3387	process_color_seq (op, Color_IT, str, resp);	3409	process_color_seq (op, Color_IT, str, resp);
3388	break;	3410	break;
3389	#endif	3411	#endif
		3412	case URxvt_Color_border:
		3413	process_color_seq (op, Color_border, str, resp);
		3414	break;
3390	#if ENABLE_TRANSPARENCY	3415	#if ENABLE_TRANSPARENCY
3391	case URxvt_Color_tint:	3416	case URxvt_Color_tint:
3392	process_color_seq (op, Color_tint, str, resp);	3417	process_color_seq (op, Color_tint, str, resp);
3393	{	3418	{
3394	bool changed = false;	3419	bool changed = false;
…		…
3409	case Rxvt_Pixmap:	3434	case Rxvt_Pixmap:
3410	if (!strcmp (str, "?"))	3435	if (!strcmp (str, "?"))
3411	{	3436	{
3412	char str[256];	3437	char str[256];
3413		3438
3414	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3439	sprintf (str, "[%dx%d+%d+%d]",
3415	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3440	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3416	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3441	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417	process_xterm_seq (XTerm_title, str, CHAR_ST);	3442	process_xterm_seq (XTerm_title, str, CHAR_ST);
3418	}	3443	}
3419	else	3444	else
…		…
3443	update_background ();	3468	update_background ();
3444	}	3469	}
3445	break;	3470	break;
3446	#endif	3471	#endif
3447		3472
3448	case Rxvt_restoreFG:
3449	set_window_color (Color_fg, str);
3450	break;
3451	case Rxvt_restoreBG:
3452	set_window_color (Color_bg, str);
3453	break;
3454
3455	case XTerm_logfile:	3473	case XTerm_logfile:
3456	// TODO, when secure mode?	3474	// TODO, when secure mode?
3457	break;	3475	break;
3458		3476
3459	#if 0	3477	#if 0
…		…
3525	break;	3543	break;
3526	#endif	3544	#endif
3527		3545
3528	#if ENABLE_PERL	3546	#if ENABLE_PERL
3529	case URxvt_perl:	3547	case URxvt_perl:
3530	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3548	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3531	; // no responses yet
3532	break;	3549	break;
3533	#endif	3550	#endif
3534	}	3551	}
3535	}	3552	}
3536	/*----------------------------------------------------------------------*/	3553	/*----------------------------------------------------------------------*/
…		…
3559	{	3576	{
3560	if (mode == 'r')	3577	if (mode == 'r')
3561	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3578	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562	else	3579	else
3563	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3580	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564	PrivMode (state, bit);	3581	set_privmode (bit, state);
3565	}	3582	}
3566		3583
3567	return state;	3584	return state;
3568	}	3585	}
3569		3586
…		…
3577	static const struct	3594	static const struct
3578	{	3595	{
3579	const int argval;	3596	const int argval;
3580	const unsigned long bit;	3597	const unsigned long bit;
3581	} argtopriv[] = {	3598	} argtopriv[] = {
3582	{ 1, PrivMode_aplCUR },	3599	{ 1, PrivMode_aplCUR }, // DECCKM
3583	{ 2, PrivMode_vt52 },	3600	{ 2, PrivMode_vt52 },
3584	{ 3, PrivMode_132 },	3601	{ 3, PrivMode_132 }, // DECCOLM
3585	{ 4, PrivMode_smoothScroll },	3602	{ 4, PrivMode_smoothScroll }, // DECSCLM
3586	{ 5, PrivMode_rVideo },	3603	{ 5, PrivMode_rVideo }, // DECSCNM
3587	{ 6, PrivMode_relOrigin },	3604	{ 6, PrivMode_relOrigin }, // DECOM
3588	{ 7, PrivMode_Autowrap },	3605	{ 7, PrivMode_Autowrap }, // DECAWM
3589	// 8, bi-directional support mode	3606	// 8, auto-repeat keys // DECARM
3590	{ 9, PrivMode_MouseX10 },	3607	{ 9, PrivMode_MouseX10 },
3591	// 18, 19 printing-related	3608	// 18 end FF to printer after print screen
		3609	// 19 Print screen prints full screen/scorll region
3592	{ 25, PrivMode_VisibleCursor },	3610	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3593	#ifdef scrollBar_esc	3611	#ifdef scrollBar_esc
3594	{ scrollBar_esc, PrivMode_scrollBar },	3612	{ scrollBar_esc, PrivMode_scrollBar },
3595	#endif	3613	#endif
3596	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3614	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3615	// 38, tektronix mode // DECTEK
3597	{ 40, PrivMode_132OK },	3616	{ 40, PrivMode_132OK },
3598	// 41 xterm more fixes NYI	3617	// 41 xterm more fixes NYI
3599	// 45 margin bell NYI	3618	// 45 margin bell NYI
3600	// 46 start logging	3619	// 46 start logging
3601	{ 47, PrivMode_Screen },	3620	{ 47, PrivMode_Screen },
3602	{ 66, PrivMode_aplKP },	3621	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3603	#ifndef NO_BACKSPACE_KEY	3622	#ifndef NO_BACKSPACE_KEY
3604	{ 67, PrivMode_BackSpace },	3623	{ 67, PrivMode_BackSpace }, // DECBKM
3605	#endif	3624	#endif
3606	{ 1000, PrivMode_MouseX11 },	3625	{ 1000, PrivMode_MouseX11 },
3607	{ 1002, PrivMode_MouseBtnEvent },	3626	{ 1002, PrivMode_MouseBtnEvent },
3608	{ 1003, PrivMode_MouseAnyEvent },	3627	{ 1003, PrivMode_MouseAnyEvent },
3609	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3628	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3613	// 1037 send DEL for keypad delete NYI	3632	// 1037 send DEL for keypad delete NYI
3614	{ 1047, PrivMode_Screen },	3633	{ 1047, PrivMode_Screen },
3615	// 1048 save and restore cursor	3634	// 1048 save and restore cursor
3616	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3635	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3617	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3636	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3637	{ 2004, PrivMode_BracketPaste },
3618	};	3638	};
3619		3639
3620	if (nargs == 0)	3640	if (nargs == 0)
3621	return;	3641	return;
3622		3642
…		…
3647		3667
3648	scr_touch (true);	3668	scr_touch (true);
3649	break;	3669	break;
3650	#endif	3670	#endif
3651	case 1048: /* alternative cursor save */	3671	case 1048: /* alternative cursor save */
3652	case 1049:
3653	if (option (Opt_secondaryScreen))	3672	if (option (Opt_secondaryScreen))
3654	if (mode == 0)	3673	if (mode == 0)
3655	scr_cursor (RESTORE);	3674	scr_cursor (RESTORE);
3656	else if (mode == 1)	3675	else if (mode == 1)
3657	scr_cursor (SAVE);	3676	scr_cursor (SAVE);
…		…
3666	case 2: /* VT52 mode */	3685	case 2: /* VT52 mode */
3667	/* oddball mode. should be set regardless of set/reset	3686	/* oddball mode. should be set regardless of set/reset
3668	* parameter. Return from VT52 mode with an ESC < from	3687	* parameter. Return from VT52 mode with an ESC < from
3669	* within VT52 mode	3688	* within VT52 mode
3670	*/	3689	*/
3671	PrivMode (1, PrivMode_vt52);	3690	set_privmode (PrivMode_vt52, 1);
3672	break;	3691	break;
3673	case 3: /* 80/132 */	3692	case 3: /* 80/132 */
3674	if (priv_modes & PrivMode_132OK)	3693	if (priv_modes & PrivMode_132OK)
3675	{
3676	scr_poweron ();
3677	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3694	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3678	}
3679	break;	3695	break;
3680	case 4: /* smooth scrolling */	3696	case 4: /* smooth scrolling */
3681	set_option (Opt_jumpScroll, !state);	3697	set_option (Opt_jumpScroll, !state);
3682	break;	3698	break;
3683	case 5: /* reverse video */	3699	case 5: /* reverse video */
…		…
3694	if (state) /* orthogonal */	3710	if (state) /* orthogonal */
3695	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3711	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696	break;	3712	break;
3697	#ifdef scrollBar_esc	3713	#ifdef scrollBar_esc
3698	case scrollBar_esc:	3714	case scrollBar_esc:
3699	if (scrollbar_mapping (state))	3715	if (scrollBar.map (state))
3700	{	3716	{
3701	resize_all_windows (0, 0, 0);	3717	resize_all_windows (0, 0, 0);
3702	scr_touch (true);	3718	scr_touch (true);
3703	}	3719	}
3704	break;	3720	break;
…		…
3725	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3741	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3726	vt_emask_mouse = PointerMotionMask;	3742	vt_emask_mouse = PointerMotionMask;
3727	}	3743	}
3728	else	3744	else
3729	vt_emask_mouse = NoEventMask;	3745	vt_emask_mouse = NoEventMask;
		3746
3730	vt_select_input ();	3747	vt_select_input ();
3731	break;	3748	break;
3732	case 1010: /* scroll to bottom on TTY output inhibit */	3749	case 1010: /* scroll to bottom on TTY output inhibit */
3733	set_option (Opt_scrollTtyOutput, !state);	3750	set_option (Opt_scrollTtyOutput, !state);
3734	break;	3751	break;
3735	case 1011: /* scroll to bottom on key press */	3752	case 1011: /* scroll to bottom on key press */
3736	set_option (Opt_scrollTtyKeypress, state);	3753	set_option (Opt_scrollTtyKeypress, state);
3737	break;	3754	break;
3738	case 1047: /* secondary screen w/ clearing last */	3755	case 1047: /* secondary screen w/ clearing last */
3739	if (option (Opt_secondaryScreen))	3756	if (option (Opt_secondaryScreen))
3740	if (current_screen != PRIMARY)	3757	if (!state)
3741	scr_erase_screen (2);	3758	scr_erase_screen (2);
		3759
3742	scr_change_screen (state);	3760	scr_change_screen (state);
3743	break;	3761	break;
3744	case 1049: /* secondary screen w/ clearing first */	3762	case 1049: /* secondary screen w/ clearing first */
		3763	if (option (Opt_secondaryScreen))
		3764	if (state)
		3765	scr_cursor (SAVE);
		3766
3745	scr_change_screen (state);	3767	scr_change_screen (state);
		3768
3746	if (option (Opt_secondaryScreen))	3769	if (option (Opt_secondaryScreen))
3747	if (current_screen != PRIMARY)	3770	if (state)
3748	scr_erase_screen (2);	3771	scr_erase_screen (2);
		3772	else
		3773	scr_cursor (RESTORE);
3749	break;	3774	break;
3750	default:	3775	default:
3751	break;	3776	break;
3752	}	3777	}
3753	}	3778	}

Diff Legend

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