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.383 by root, Fri Dec 14 06:29:28 2007 UTC vs.
Revision 1.478 by root, Thu Feb 24 12:42:41 2011 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
		31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31	*	32	*
32	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	36	* (at your option) any later version.
…		…
161		162
162	void	163	void
163	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)
164	{	165	{
165	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
166	rxvt_font *f = (*fs)[fs->find_font (ch)];
167	wchar_t *chr, *alloc, ch2, *fname;	167	wchar_t *chr, *alloc, ch2, **fname;
168	int len;	168	int len;
169
170	fname = rxvt_utf8towcs (f->name);
171		169
172	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
173	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
174	{	172	{
175	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
196	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
197	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
198	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
199	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
200		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);
201	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
202		207
203	max_it (width, 8+5); // for char + hey	208	max_it (width, 8+5); // for char + hex
204	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
205		210
206	if (y >= 0)	211	if (y >= 0)
207	{	212	{
208	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209	x = 0;	214	x = 0;
210	}	215	}
211		216
212	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
213		218
214	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215		220
216	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
217	{	222	{
…		…
220	ch = *chr++;	225	ch = *chr++;
221		226
222	sprintf (buf, "%8x", ch);	227	sprintf (buf, "%8x", ch);
223	scr_overlay_set (0, y, buf);	228	scr_overlay_set (0, y, buf);
224	scr_overlay_set (9, y, '=');	229	scr_overlay_set (9, y, '=');
225	# if !UNICODE3	230	# if !UNICODE_3
226	if (ch >= 0x10000)	231	if (ch >= 0x10000)
227	ch = 0xfffd;	232	ch = 0xfffd;
228	# endif	233	# endif
229	scr_overlay_set (11, y, ch, r);	234	scr_overlay_set (11, y, ch, r);
230		235
…		…
236	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
237	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
239	// }	244	// }
240	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
241	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
242
243	free (fname);	249	free (fname[i]);
		250	}
244		251
245	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
246	if (alloc)	253	if (alloc)
247	delete [] alloc;	254	delete [] alloc;
248	# endif	255	# endif
…		…
278	}	285	}
279		286
280	iso14755buf = 0;	287	iso14755buf = 0;
281	}	288	}
282		289
283	int	290	static int
284	rxvt_term::hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
285	{	292	{
286	// check wether this event corresponds to a hex digit	293	// check whether this event corresponds to a hex digit
287	// if the modifiers had not been pressed.	294	// if the modifiers had not been pressed.
288	for (int index = 0; index < 8; index++)	295	for (int index = 0; index < 8; index++)
289	{	296	{
290	KeySym k = XLookupKeysym (&ev, index);	297	KeySym k = XLookupKeysym (&ev, index);
291		298
…		…
297		304
298	return -1;	305	return -1;
299	}	306	}
300	#endif	307	#endif
301		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
302	void	404	void
303	rxvt_term::key_press (XKeyEvent &ev)	405	rxvt_term::key_press (XKeyEvent &ev)
304	{	406	{
305	int ctrl, meta, shft, len;	407	int ctrl, meta, shft, len;
306	unsigned int newlen;
307	KeySym keysym;	408	KeySym keysym;
308	int valid_keysym;	409	int valid_keysym;
309	char kbuf[KBUFSZ];	410	char kbuf[KBUFSZ];
310		411
311	#if ISO_14755	412	#if ISO_14755
…		…
320	* Always permit `shift' to override the current setting	421	* Always permit `shift' to override the current setting
321	*/	422	*/
322	shft = ev.state & ShiftMask;	423	shft = ev.state & ShiftMask;
323	ctrl = ev.state & ControlMask;	424	ctrl = ev.state & ControlMask;
324	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
325
326	if (numlock_state || (ev.state & ModNumLockMask))
327	{
328	numlock_state = (ev.state & ModNumLockMask);
329	PrivMode ((!numlock_state), PrivMode_aplKP);
330	}
331		426
332	kbuf[0] = 0;	427	kbuf[0] = 0;
333		428
334	#ifdef USE_XIM	429	#ifdef USE_XIM
335	if (Input_Context)	430	if (Input_Context)
…		…
410	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
411	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
412	#else	507	#else
413	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
414	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
415	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
416	{	513	{
417	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
418	return;	515	return;
419	}	516	}
…		…
484	}	581	}
485	}	582	}
486		583
487	#if ENABLE_FRILLS || ISO_14755	584	#if ENABLE_FRILLS || ISO_14755
488	// ISO 14755 support	585	// ISO 14755 support
489	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490	{	587	{
491	int hv;	588	int hv;
492		589
493	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
494	&& (keysym == XK_space || keysym == XK_KP_Space	591	&& (keysym == XK_space || keysym == XK_KP_Space
…		…
524	scr_overlay_off ();	621	scr_overlay_off ();
525	# endif	622	# endif
526	iso14755buf = 0;	623	iso14755buf = 0;
527	}	624	}
528	}	625	}
		626	else if (option (Opt_iso14755) &&
529	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	628	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
532	{	630	{
533	iso14755buf |= ISO_14755_STARTED;	631	iso14755buf |= ISO_14755_STARTED;
534	# if ISO_14755	632	# if ISO_14755
535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
546	}	644	}
547	#endif	645	#endif
548		646
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	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
		655	keysym = translate_keypad (keysym, kp);
		656
		657	switch (keysym)
551	{	658	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	659	#ifndef NO_BACKSPACE_KEY
553	newlen = 1;	660	case XK_BackSpace:
554	#ifdef XK_KP_Home	661	if (priv_modes & PrivMode_HaveBackSpace)
555	static const KeySym keypadtrans[] = {	662	{
556	XK_KP_7, // XK_KP_Home	663	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557	XK_KP_4, // XK_KP_Left	664	^ !!ctrl) ? '\b' : '\177';
558	XK_KP_8, // XK_KP_Up	665	kbuf[1] = '\0';
559	XK_KP_6, // XK_KP_Right
560	XK_KP_2, // XK_KP_Down
561	#ifndef UNSHIFTED_SCROLLKEYS
562	XK_KP_9, // XK_KP_Prior
563	XK_KP_3, // XK_KP_Next
564	#else
565	XK_Prior,
566	XK_Next,
567	#endif
568	XK_KP_1, // XK_KP_End
569	XK_KP_5, // XK_KP_Begin
570	};	666	}
		667	else
		668	strcpy (kbuf, rs[Rs_backspace_key]);
		669	break;
		670	#endif
		671	#ifndef NO_DELETE_KEY
		672	case XK_Delete:
		673	strcpy (kbuf, rs[Rs_delete_key]);
		674	break;
		675	#endif
		676	case XK_Tab:
		677	if (shft)
		678	strcpy (kbuf, "\033[Z");
		679	else
		680	{
		681	#ifdef CTRL_TAB_MAKES_META
		682	if (ctrl)
		683	meta = 1;
		684	#endif
		685	#ifdef MOD4_TAB_MAKES_META
		686	if (ev.state & Mod4Mask)
		687	meta = 1;
		688	#endif
		689	newlen = 0;
		690	}
		691	break;
571		692
572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	693	case XK_Up: /* "\033[A" */
		694	case XK_Down: /* "\033[B" */
		695	case XK_Right: /* "\033[C" */
		696	case XK_Left: /* "\033[D" */
		697	strcpy (kbuf, "\033[Z");
		698	kbuf[2] = "DACB"[keysym - XK_Left];
		699	/* do Shift first */
		700	if (shft)
		701	kbuf[2] = "dacb"[keysym - XK_Left];
		702	else if (ctrl)
		703	{
		704	kbuf[1] = 'O';
		705	kbuf[2] = "dacb"[keysym - XK_Left];
		706	}
		707	else if (priv_modes & PrivMode_aplCUR)
		708	kbuf[1] = 'O';
		709	break;
		710
		711	case XK_KP_Enter:
		712	/* allow shift to override */
		713	if (kp)
		714	{
		715	strcpy (kbuf, "\033OM");
		716	break;
		717	}
		718
		719	/* FALLTHROUGH */
		720
		721	case XK_Return:
		722	if (priv_modes & PrivMode_LFNL)
		723	{
		724	kbuf[0] = '\015';
		725	kbuf[1] = '\012';
		726	kbuf[2] = '\0';
		727	}
		728	else
		729	{
		730	kbuf[0] = '\015';
		731	kbuf[1] = '\0';
		732	}
		733	break;
		734
		735	case XK_KP_F1: /* "\033OP" */
		736	case XK_KP_F2: /* "\033OQ" */
		737	case XK_KP_F3: /* "\033OR" */
		738	case XK_KP_F4: /* "\033OS" */
		739	strcpy (kbuf, "\033OP");
		740	kbuf[2] += (keysym - XK_KP_F1);
		741	break;
		742
		743	case XK_KP_Multiply: /* "\033Oj" : "*" */
		744	case XK_KP_Add: /* "\033Ok" : "+" */
		745	case XK_KP_Separator: /* "\033Ol" : "," */
		746	case XK_KP_Subtract: /* "\033Om" : "-" */
		747	case XK_KP_Decimal: /* "\033On" : "." */
		748	case XK_KP_Divide: /* "\033Oo" : "/" */
		749	case XK_KP_0: /* "\033Op" : "0" */
		750	case XK_KP_1: /* "\033Oq" : "1" */
		751	case XK_KP_2: /* "\033Or" : "2" */
		752	case XK_KP_3: /* "\033Os" : "3" */
		753	case XK_KP_4: /* "\033Ot" : "4" */
		754	case XK_KP_5: /* "\033Ou" : "5" */
		755	case XK_KP_6: /* "\033Ov" : "6" */
		756	case XK_KP_7: /* "\033Ow" : "7" */
		757	case XK_KP_8: /* "\033Ox" : "8" */
		758	case XK_KP_9: /* "\033Oy" : "9" */
		759	/* allow shift to override */
		760	if (kp)
		761	{
		762	strcpy (kbuf, "\033Oj");
		763	kbuf[2] += (keysym - XK_KP_Multiply);
		764	}
		765	else
		766	{
		767	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		768	kbuf[1] = '\0';
		769	}
		770	break;
		771
		772	default:
573	{	773	{
574	unsigned int index = keysym - XK_KP_Home;	774	int param = map_function_key (keysym);
575	keysym = kp ? keypadtrans[index] : XK_Home + index;	775	if (param > 0)
		776	sprintf (kbuf,"\033[%d~", param);
		777	else
		778	newlen = 0;
576	}	779	}
577	else if (keysym == XK_KP_Insert)
578	keysym = kp ? XK_KP_0 : XK_Insert;
579	#ifndef NO_DELETE_KEY
580	else if (keysym == XK_KP_Delete)
581	keysym = kp ? XK_KP_Decimal : XK_Delete;
582	#endif
583	#endif
584	switch (keysym)
585	{
586	#ifndef NO_BACKSPACE_KEY
587	case XK_BackSpace:
588	if (priv_modes & PrivMode_HaveBackSpace)
589	{
590	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591	^ !!ctrl) ? '\b' : '\177';
592	kbuf[1] = '\0';
593	}
594	else
595	strcpy (kbuf, rs[Rs_backspace_key]);
596	break;	780	break;
597	#endif
598	#ifndef NO_DELETE_KEY
599	case XK_Delete:
600	strcpy (kbuf, rs[Rs_delete_key]);
601	break;
602	#endif
603	case XK_Tab:
604	if (shft)
605	strcpy (kbuf, "\033[Z");
606	else
607	{
608	#ifdef CTRL_TAB_MAKES_META
609	if (ctrl)
610	meta = 1;
611	#endif
612	#ifdef MOD4_TAB_MAKES_META
613	if (ev.state & Mod4Mask)
614	meta = 1;
615	#endif
616	newlen = 0;
617	}
618	break;
619
620	case XK_Up: /* "\033[A" */
621	case XK_Down: /* "\033[B" */
622	case XK_Right: /* "\033[C" */
623	case XK_Left: /* "\033[D" */
624	strcpy (kbuf, "\033[Z");
625	kbuf[2] = "DACB"[keysym - XK_Left];
626	/* do Shift first */
627	if (shft)
628	kbuf[2] = "dacb"[keysym - XK_Left];
629	else if (ctrl)
630	{
631	kbuf[1] = 'O';
632	kbuf[2] = "dacb"[keysym - XK_Left];
633	}
634	else if (priv_modes & PrivMode_aplCUR)
635	kbuf[1] = 'O';
636	break;
637
638	#ifndef UNSHIFTED_SCROLLKEYS
639	case XK_Prior:
640	strcpy (kbuf, "\033[5~");
641	break;
642	case XK_Next:
643	strcpy (kbuf, "\033[6~");
644	break;
645	#endif
646	case XK_KP_Enter:
647	/* allow shift to override */
648	if (kp)
649	{
650	strcpy (kbuf, "\033OM");
651	break;
652	}
653
654	/* FALLTHROUGH */
655
656	case XK_Return:
657	if (priv_modes & PrivMode_LFNL)
658	{
659	kbuf[0] = '\015';
660	kbuf[1] = '\012';
661	kbuf[2] = '\0';
662	}
663	else
664	{
665	kbuf[0] = '\015';
666	kbuf[1] = '\0';
667	}
668	break;
669
670	case XK_KP_F1: /* "\033OP" */
671	case XK_KP_F2: /* "\033OQ" */
672	case XK_KP_F3: /* "\033OR" */
673	case XK_KP_F4: /* "\033OS" */
674	strcpy (kbuf, "\033OP");
675	kbuf[2] += (keysym - XK_KP_F1);
676	break;
677
678	case XK_KP_Multiply: /* "\033Oj" : "*" */
679	case XK_KP_Add: /* "\033Ok" : "+" */
680	case XK_KP_Separator: /* "\033Ol" : "," */
681	case XK_KP_Subtract: /* "\033Om" : "-" */
682	case XK_KP_Decimal: /* "\033On" : "." */
683	case XK_KP_Divide: /* "\033Oo" : "/" */
684	case XK_KP_0: /* "\033Op" : "0" */
685	case XK_KP_1: /* "\033Oq" : "1" */
686	case XK_KP_2: /* "\033Or" : "2" */
687	case XK_KP_3: /* "\033Os" : "3" */
688	case XK_KP_4: /* "\033Ot" : "4" */
689	case XK_KP_5: /* "\033Ou" : "5" */
690	case XK_KP_6: /* "\033Ov" : "6" */
691	case XK_KP_7: /* "\033Ow" : "7" */
692	case XK_KP_8: /* "\033Ox" : "8" */
693	case XK_KP_9: /* "\033Oy" : "9" */
694	/* allow shift to override */
695	if (kp)
696	{
697	strcpy (kbuf, "\033Oj");
698	kbuf[2] += (keysym - XK_KP_Multiply);
699	}
700	else
701	{
702	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703	kbuf[1] = '\0';
704	}
705	break;
706
707	case XK_Find:
708	strcpy (kbuf, "\033[1~");
709	break;
710
711	case XK_Insert:
712	strcpy (kbuf, "\033[2~");
713	break;
714	#ifdef DXK_Remove /* support for DEC remove like key */
715	case DXK_Remove:
716	/* FALLTHROUGH */
717	#endif
718	case XK_Execute:
719	strcpy (kbuf, "\033[3~");
720	break;
721	case XK_Select:
722	strcpy (kbuf, "\033[4~");
723	break;
724	case XK_End:
725	strcpy (kbuf, KS_END);
726	break;
727	case XK_Home:
728	strcpy (kbuf, KS_HOME);
729	break;
730
731	#define FKEY(n, fkey) \
732	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734	case XK_F1: /* "\033[11~" */
735	case XK_F2: /* "\033[12~" */
736	case XK_F3: /* "\033[13~" */
737	case XK_F4: /* "\033[14~" */
738	case XK_F5: /* "\033[15~" */
739	FKEY (11, XK_F1);
740	break;
741	case XK_F6: /* "\033[17~" */
742	case XK_F7: /* "\033[18~" */
743	case XK_F8: /* "\033[19~" */
744	case XK_F9: /* "\033[20~" */
745	case XK_F10: /* "\033[21~" */
746	FKEY (17, XK_F6);
747	break;
748	case XK_F11: /* "\033[23~" */
749	case XK_F12: /* "\033[24~" */
750	case XK_F13: /* "\033[25~" */
751	case XK_F14: /* "\033[26~" */
752	FKEY (23, XK_F11);
753	break;
754	case XK_F15: /* "\033[28~" */
755	case XK_F16: /* "\033[29~" */
756	FKEY (28, XK_F15);
757	break;
758	case XK_Help: /* "\033[28~" */
759	FKEY (28, XK_Help);
760	break;
761	case XK_Menu: /* "\033[29~" */
762	FKEY (29, XK_Menu);
763	break;
764	case XK_F17: /* "\033[31~" */
765	case XK_F18: /* "\033[32~" */
766	case XK_F19: /* "\033[33~" */
767	case XK_F20: /* "\033[34~" */
768	case XK_F21: /* "\033[35~" */
769	case XK_F22: /* "\033[36~" */
770	case XK_F23: /* "\033[37~" */
771	case XK_F24: /* "\033[38~" */
772	case XK_F25: /* "\033[39~" */
773	case XK_F26: /* "\033[40~" */
774	case XK_F27: /* "\033[41~" */
775	case XK_F28: /* "\033[42~" */
776	case XK_F29: /* "\033[43~" */
777	case XK_F30: /* "\033[44~" */
778	case XK_F31: /* "\033[45~" */
779	case XK_F32: /* "\033[46~" */
780	case XK_F33: /* "\033[47~" */
781	case XK_F34: /* "\033[48~" */
782	case XK_F35: /* "\033[49~" */
783	FKEY (31, XK_F17);
784	break;
785	#undef FKEY
786	default:
787	newlen = 0;
788	break;
789	}
790
791	if (newlen)
792	len = strlen (kbuf);
793	}	781	}
		782
		783	if (newlen)
		784	len = strlen (kbuf);
794		785
795	/*	786	/*
796	* Pass meta for all function keys, if 'meta' option set	787	* Pass meta for all function keys, if 'meta' option set
797	*/	788	*/
798	#ifdef META8_OPTION	789	#ifdef META8_OPTION
…		…
898	commit_iso14755 ();	889	commit_iso14755 ();
899		890
900	return;	891	return;
901	}	892	}
902		893
903	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	894	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904	if (i[0] == keysym)	895	if (i[0] == keysym)
905	{	896	{
906	iso14755buf = ISO_14755_51 | i[1];	897	iso14755buf = ISO_14755_51 | i[1];
907	commit_iso14755 ();	898	commit_iso14755 ();
908		899
…		…
984	rxvt_term::flush ()	975	rxvt_term::flush ()
985	{	976	{
986	flush_ev.stop ();	977	flush_ev.stop ();
987		978
988	#ifdef HAVE_BG_PIXMAP	979	#ifdef HAVE_BG_PIXMAP
989	if (bgPixmap.check_clearChanged ())	980	if (bg_flags & BG_NEEDS_REFRESH)
990	{	981	{
991	// scr_clear (true); This needs to be researched further!	982	bg_flags &= ~BG_NEEDS_REFRESH;
992	scr_touch (false);	983	scr_touch (false);
993	}	984	}
994	#endif	985	#endif
995		986
996	if (want_refresh)	987	if (want_refresh)
…		…
1032	}	1023	}
1033	while (row < end_row);	1024	while (row < end_row);
1034	}	1025	}
1035		1026
1036	scr_refresh ();	1027	scr_refresh ();
1037	scrollbar_show (1);	1028	scrollBar.show (1);
1038	#ifdef USE_XIM	1029	#ifdef USE_XIM
1039	IMSendSpot ();	1030	IMSendSpot ();
1040	#endif	1031	#endif
1041	}	1032	}
1042		1033
1043	display->flush ();	1034	display->flush ();
1044	}	1035	}
1045		1036
1046	/* checks wether a refresh is requested and starts the refresh timer */	1037	/* checks whether a refresh is requested and starts the refresh timer */
1047	void	1038	void
1048	rxvt_term::refresh_check ()	1039	rxvt_term::refresh_check ()
1049	{	1040	{
1050	if (want_refresh && !flush_ev.is_active ())	1041	if (want_refresh && !flush_ev.is_active ())
1051	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1042	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1078	{	1069	{
1079	if (scr_refresh_rend (RS_Blink, RS_Blink))	1070	if (scr_refresh_rend (RS_Blink, RS_Blink))
1080	{	1071	{
1081	hidden_text = !hidden_text;	1072	hidden_text = !hidden_text;
1082	want_refresh = 1;	1073	want_refresh = 1;
1083	refresh_check ();	1074	refresh_check ();
1084	}	1075	}
1085	else	1076	else
1086	w.stop ();	1077	w.stop ();
1087	}	1078	}
1088	#endif	1079	#endif
1089		1080
1090	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1081	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091	void	1082	void
1092	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1083	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093	{	1084	{
1094	if ((scrollbar_isUp () || scrollbar_isDn ())	1085	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095	&& scr_page (scrollbar_isUp () ? UP : DN, 1))	1086	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096	{	1087	{
1097	want_refresh = 1;	1088	want_refresh = 1;
1098	refresh_check ();	1089	refresh_check ();
1099	}	1090	}
1100	else	1091	else
…		…
1144	{	1135	{
1145	// this should really be sched_yield(), but the linux guys thought	1136	// this should really be sched_yield(), but the linux guys thought
1146	// that giving a process calling sched_yield () less cpu time than	1137	// that giving a process calling sched_yield () less cpu time than
1147	// ones with high nice levels is a useful thing to do. It surely is is	1138	// ones with high nice levels is a useful thing to do. It surely is is
1148	// allowed by the sus... as is returning ENOSYS.	1139	// allowed by the sus... as is returning ENOSYS.
		1140	// since the linux guys additionally thought that breaking the only
		1141	// known workaround against their unusable sched_yield hack is cool,
		1142	// we just nanosleep a bit and hope for the best.
1149		1143
1150	struct timespec ts = { 0, 0 };	1144	struct timespec ts = { 0, 1000 };
1151	nanosleep (&ts, 0);	1145	nanosleep (&ts, 0);
1152		1146
1153	w.stop ();	1147	w.stop ();
1154	}	1148	}
1155		1149
…		…
1164	rxvt_term::pty_fill ()	1158	rxvt_term::pty_fill ()
1165	{	1159	{
1166	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1160	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1167		1161
1168	if (CBUFSIZ == n)	1162	if (CBUFSIZ == n)
1169	{	1163	n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1170	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1171	n = 0;
1172	}
1173		1164
1174	memmove (cmdbuf_base, cmdbuf_ptr, n);	1165	memmove (cmdbuf_base, cmdbuf_ptr, n);
1175	cmdbuf_ptr = cmdbuf_base;	1166	cmdbuf_ptr = cmdbuf_base;
1176	cmdbuf_endp = cmdbuf_ptr + n;	1167	cmdbuf_endp = cmdbuf_ptr + n;
1177		1168
…		…
1205	{	1196	{
1206	make_current ();	1197	make_current ();
1207		1198
1208	if (revents & ev::READ)	1199	if (revents & ev::READ)
1209	// loop, but don't allow a single term to monopolize us	1200	// loop, but don't allow a single term to monopolize us
1210	while (pty_fill ())	1201	for (int i = CBUFCNT; i-- && pty_fill (); )
1211	if (cmd_parse ())	1202	cmd_parse ();
1212	break;
1213		1203
1214	if (revents & ev::WRITE)	1204	if (revents & ev::WRITE)
1215	pty_write ();	1205	pty_write ();
1216		1206
1217	refresh_check ();	1207	refresh_check ();
…		…
1258	{	1248	{
1259	int button_number, key_state = 0;	1249	int button_number, key_state = 0;
1260	int x, y;	1250	int x, y;
1261	int code = 32;	1251	int code = 32;
1262		1252
1263	x = Pixel2Col (ev.x);	1253	x = Pixel2Col (ev.x) + 1;
1264	y = Pixel2Row (ev.y);	1254	y = Pixel2Row (ev.y) + 1;
		1255
1265	if (ev.type == MotionNotify)	1256	if (ev.type == MotionNotify)
1266	{	1257	{
1267	if (x == mouse_row && y == mouse_col)	1258	if (x == mouse_row && y == mouse_col)
1268	return;	1259	return;
		1260
1269	mouse_row = x;	1261	mouse_row = x;
1270	mouse_col = y;	1262	mouse_col = y;
1271	code += 32;	1263	code += 32;
1272	}	1264	}
1273		1265
…		…
1276	else	1268	else
1277	{	1269	{
1278	button_number = MEvent.button - Button1;	1270	button_number = MEvent.button - Button1;
1279	/* add 0x3D for wheel events, like xterm does */	1271	/* add 0x3D for wheel events, like xterm does */
1280	if (button_number >= 3)	1272	if (button_number >= 3)
1281	button_number += (64 - 3);	1273	button_number += 64 - 3;
1282	}	1274	}
1283		1275
1284	if (priv_modes & PrivMode_MouseX10)	1276	if (priv_modes & PrivMode_MouseX10)
1285	{	1277	{
1286	/*	1278	/*
…		…
1318	fputc ('A', stderr);	1310	fputc ('A', stderr);
1319	if (key_state & 32)	1311	if (key_state & 32)
1320	fputc ('2', stderr);	1312	fputc ('2', stderr);
1321	fprintf (stderr, "]: <%d>, %d/%d\n",	1313	fprintf (stderr, "]: <%d>, %d/%d\n",
1322	button_number,	1314	button_number,
1323	x + 1,	1315	x,
1324	y + 1);	1316	y);
1325	#endif	1317	#endif
1326		1318
		1319	#if ENABLE_FRILLS
		1320	if (priv_modes & PrivMode_ExtMouseRight)
		1321	tt_printf ("\033[%d;%d;%dM",
		1322	code + button_number + key_state,
		1323	x,
		1324	y);
		1325	else if (priv_modes & PrivMode_ExtModeMouse)
		1326	tt_printf ("\033[M%c%lc%lc",
		1327	code + button_number + key_state,
		1328	wint_t (32 + x),
		1329	wint_t (32 + y));
		1330	else
		1331	#endif
1327	tt_printf ("\033[M%c%c%c",	1332	tt_printf ("\033[M%c%c%c",
1328	(code + button_number + key_state),	1333	code + button_number + key_state,
1329	(32 + x + 1),	1334	32 + x,
1330	(32 + y + 1));	1335	32 + y);
1331	}	1336	}
1332		1337
1333	/*{{{ process an X event */	1338	/*{{{ process an X event */
1334	void	1339	void
1335	rxvt_term::x_cb (XEvent &ev)	1340	rxvt_term::x_cb (XEvent &ev)
…		…
1437	&& ev.xfocus.mode != NotifyGrab)	1442	&& ev.xfocus.mode != NotifyGrab)
1438	focus_out ();	1443	focus_out ();
1439	break;	1444	break;
1440		1445
1441	case ConfigureNotify:	1446	case ConfigureNotify:
1442	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444	szHint.width, szHint.height); */
1445	if (ev.xconfigure.window == parent[0])	1447	if (ev.xconfigure.window == parent[0])
1446	{	1448	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1449	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1450	;
		1451
		1452	#ifdef HAVE_BG_PIXMAP
		1453	bool moved = false;
		1454	if (bg_window_position_sensitive ())
		1455	{
		1456	int x, y;
		1457	if (ev.xconfigure.send_event)
		1458	{
		1459	x = ev.xconfigure.x;
		1460	y = ev.xconfigure.y;
		1461	}
		1462	else
		1463	get_window_origin (x, y);
		1464
		1465	if (bg_set_position (x, y)
		1466	|| !(bg_flags & BG_IS_VALID))
		1467	moved = true;
		1468	}
		1469	#endif
1449		1470
1450	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1471	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1451	{	1472	{
1452	seen_resize = 1;	1473	seen_resize = 1;
1453	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1454	}	1475	}
1455	else	1476	else
1456	{	1477	{
1457	#ifdef HAVE_BG_PIXMAP	1478	#ifdef HAVE_BG_PIXMAP
1458	if (bgPixmap.window_position_sensitive ())	1479	if (moved)
		1480	{
		1481	if (mapped)
1459	update_background ();	1482	update_background ();
		1483	else
		1484	bg_invalidate ();
		1485	}
1460	#endif	1486	#endif
1461	}	1487	}
		1488
1462	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1489	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463	}	1490	}
1464	break;	1491	break;
1465		1492
1466	case PropertyNotify:	1493	case PropertyNotify:
1467	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1494	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1468	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469	&& ev.xproperty.state == PropertyNewValue)
1470	selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472	break;	1495	break;
1473		1496
1474	case SelectionClear:	1497	case SelectionClear:
1475	selection_clear ();	1498	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476	break;
1477
1478	case SelectionNotify:
1479	if (selection_wait == Sel_normal)
1480	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481	break;	1499	break;
1482		1500
1483	case SelectionRequest:	1501	case SelectionRequest:
1484	selection_send (ev.xselectionrequest);	1502	selection_send (ev.xselectionrequest);
1485	break;	1503	break;
1486		1504
1487	case MapNotify:	1505	case MapNotify:
		1506	#ifdef HAVE_BG_PIXMAP
		1507	/* This is needed specifically to fix the case of no window manager or a
		1508	* non-reparenting window manager. In those cases we never get first
		1509	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1510	* care of multiplicity of ConfigureNotify events arriving while WM does
		1511	* reparenting.
		1512	* We should not render background immediately, as there could be several
		1513	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1514	* by scheduling background redraw as soon as we can, but giving a short
		1515	* bit of time for ConfigureNotifies to arrive.
		1516	* We should render background PRIOR to drawing any text, but AFTER all
		1517	* of ConfigureNotifys for the best results.
		1518	*/
		1519	if (!(bg_flags & BG_IS_VALID))
		1520	update_background_ev.start (0.025);
		1521	#endif
1488	mapped = 1;	1522	mapped = 1;
1489	#ifdef TEXT_BLINK	1523	#ifdef TEXT_BLINK
1490	text_blink_ev.start ();	1524	text_blink_ev.start ();
1491	#endif	1525	#endif
1492	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1526	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
…		…
1505	if (ev.xany.window == vt)	1539	if (ev.xany.window == vt)
1506	{	1540	{
1507	do	1541	do
1508	{	1542	{
1509	scr_expose (ev.xexpose.x, ev.xexpose.y,	1543	scr_expose (ev.xexpose.x, ev.xexpose.y,
1510	ev.xexpose.width, ev.xexpose.height, False);	1544	ev.xexpose.width, ev.xexpose.height, false);
1511	}	1545	}
1512	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1546	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1513		1547
1514	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1548	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1515		1549
1516	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1550	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1517	{	1551	{
1518	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1519	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, false);
1520	}	1554	}
1521		1555
1522	want_refresh = 1;	1556	want_refresh = 1;
1523	}	1557	}
1524	else	1558	else
…		…
1528	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1562	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529	;	1563	;
1530	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1564	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531	;	1565	;
1532		1566
1533	if (isScrollbarWindow (ev.xany.window))	1567	if (scrollBar.state && ev.xany.window == scrollBar.win)
1534	{	1568	{
1535	scrollBar.setIdle ();	1569	scrollBar.state = STATE_IDLE;
1536	scrollbar_show (0);	1570	scrollBar.show (0);
1537	}	1571	}
1538	}	1572	}
1539	break;	1573	break;
1540		1574
1541	case MotionNotify:	1575	case MotionNotify:
…		…
1628	#ifdef MOUSE_THRESHOLD	1662	#ifdef MOUSE_THRESHOLD
1629	}	1663	}
1630	#endif	1664	#endif
1631	}	1665	}
1632	}	1666	}
1633	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1667	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1634	{	1668	{
1635	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1669	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636	MotionNotify, &ev))	1670	MotionNotify, &ev))
1637	;	1671	;
1638		1672
…		…
1640	&unused_root, &unused_child,	1674	&unused_root, &unused_child,
1641	&unused_root_x, &unused_root_y,	1675	&unused_root_x, &unused_root_y,
1642	&ev.xbutton.x, &ev.xbutton.y,	1676	&ev.xbutton.x, &ev.xbutton.y,
1643	&unused_mask);	1677	&unused_mask);
1644	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1645	scrollbar_size ());	1679	scrollBar.size ());
1646	want_refresh = 1;	1680	want_refresh = 1;
1647	scrollbar_show (1);	1681	scrollBar.show (1);
1648	}	1682	}
1649	break;	1683	break;
1650	}	1684	}
1651		1685
1652	#if defined(CURSOR_BLINK)	1686	#if defined(CURSOR_BLINK)
…		…
1677	#endif	1711	#endif
1678		1712
1679	refresh_check ();	1713	refresh_check ();
1680	}	1714	}
1681		1715
		1716	#if ENABLE_FRILLS
		1717	void
		1718	rxvt_term::set_urgency (bool enable)
		1719	{
		1720	if (enable == urgency_hint)
		1721	return;
		1722
		1723	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1724	{
		1725	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1726	XSetWMHints (dpy, parent[0], h);
		1727	urgency_hint = enable;
		1728	}
		1729	}
		1730	#endif
		1731
1682	void	1732	void
1683	rxvt_term::focus_in ()	1733	rxvt_term::focus_in ()
1684	{	1734	{
1685	if (!focus)	1735	if (!focus)
1686	{	1736	{
1687	focus = 1;	1737	focus = 1;
1688	want_refresh = 1;	1738	want_refresh = 1;
1689
1690	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1691		1739
1692	#if USE_XIM	1740	#if USE_XIM
1693	if (Input_Context != NULL)	1741	if (Input_Context != NULL)
1694	{	1742	{
1695	IMSetPosition ();	1743	IMSetPosition ();
…		…
1707	scr_recolour ();	1755	scr_recolour ();
1708	}	1756	}
1709	#endif	1757	#endif
1710	#if ENABLE_FRILLS	1758	#if ENABLE_FRILLS
1711	if (option (Opt_urgentOnBell))	1759	if (option (Opt_urgentOnBell))
1712	{	1760	set_urgency (0);
1713	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1714	{
1715	h->flags &= ~XUrgencyHint;
1716	XSetWMHints (dpy, parent[0], h);
1717	}
1718	}
1719	#endif	1761	#endif
		1762
		1763	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720	}	1764	}
1721	}	1765	}
1722		1766
1723	void	1767	void
1724	rxvt_term::focus_out ()	1768	rxvt_term::focus_out ()
…		…
1726	if (focus)	1770	if (focus)
1727	{	1771	{
1728	focus = 0;	1772	focus = 0;
1729	want_refresh = 1;	1773	want_refresh = 1;
1730		1774
1731	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1775	#if ENABLE_FRILLS
1732		1776	if (option (Opt_urgentOnBell))
		1777	set_urgency (0);
		1778	#endif
1733	#if ENABLE_FRILLS || ISO_14755	1779	#if ENABLE_FRILLS || ISO_14755
1734	if (iso14755buf)	1780	if (iso14755buf)
1735	{	1781	{
1736	iso14755buf = 0;	1782	iso14755buf = 0;
1737	# if ISO_14755	1783	# if ISO_14755
…		…
1754	{	1800	{
1755	pix_colors = pix_colors_unfocused;	1801	pix_colors = pix_colors_unfocused;
1756	scr_recolour ();	1802	scr_recolour ();
1757	}	1803	}
1758	#endif	1804	#endif
		1805
		1806	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759	}	1807	}
1760	}	1808	}
1761		1809
1762	void	1810	void
1763	rxvt_term::update_fade_color (unsigned int idx)	1811	rxvt_term::update_fade_color (unsigned int idx)
…		…
1791	* use the property to determine the pixmap. We use it later on.	1839	* use the property to determine the pixmap. We use it later on.
1792	*/	1840	*/
1793	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1841	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1842	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795	{	1843	{
1796	bgPixmap.set_root_pixmap ();	1844	bg_set_root_pixmap ();
1797	update_background ();	1845	update_background ();
1798	}	1846	}
		1847
1799	break;	1848	break;
1800	}	1849	}
1801	# endif	1850	# endif
1802		1851
1803	refresh_check ();	1852	refresh_check ();
…		…
1839	/* save the xbutton state (for ButtonRelease) */	1888	/* save the xbutton state (for ButtonRelease) */
1840	MEvent.state = ev.state;	1889	MEvent.state = ev.state;
1841	#ifdef MOUSE_REPORT_DOUBLECLICK	1890	#ifdef MOUSE_REPORT_DOUBLECLICK
1842	if (ev.button == MEvent.button && clickintime)	1891	if (ev.button == MEvent.button && clickintime)
1843	{	1892	{
1844	/* same button, within alloted time */	1893	/* same button, within allowed time */
1845	MEvent.clicks++;	1894	MEvent.clicks++;
1846		1895
1847	if (MEvent.clicks > 1)	1896	if (MEvent.clicks > 1)
1848	{	1897	{
1849	/* only report double clicks */	1898	/* only report double clicks */
…		…
1921	}	1970	}
1922		1971
1923	/*	1972	/*
1924	* Scrollbar window processing of button press	1973	* Scrollbar window processing of button press
1925	*/	1974	*/
1926	if (isScrollbarWindow (ev.window))	1975	if (scrollBar.state && ev.window == scrollBar.win)
1927	{	1976	{
1928	scrollBar.setIdle ();	1977	page_dirn direction = NO_DIR;
		1978
		1979	if (scrollBar.upButton (ev.y))
		1980	direction = UP; /* up */
		1981	else if (scrollBar.dnButton (ev.y))
		1982	direction = DN; /* down */
		1983
		1984	scrollBar.state = STATE_IDLE;
1929	/*	1985	/*
1930	* Rxvt-style scrollbar:	1986	* Rxvt-style scrollbar:
1931	* move up if mouse is above slider	1987	* move up if mouse is above slider
1932	* move dn if mouse is below slider	1988	* move dn if mouse is below slider
1933	*	1989	*
…		…
1942	/*	1998	/*
1943	* Mouse report disabled scrollbar:	1999	* Mouse report disabled scrollbar:
1944	* arrow buttons - send up/down	2000	* arrow buttons - send up/down
1945	* click on scrollbar - send pageup/down	2001	* click on scrollbar - send pageup/down
1946	*/	2002	*/
1947	if ((scrollBar.style == R_SB_NEXT	2003	if (direction == UP)
1948	&& scrollbarnext_upButton (ev.y))
1949	|| (scrollBar.style == R_SB_RXVT
1950	&& scrollbarrxvt_upButton (ev.y)))
1951	tt_printf ("\033[A");	2004	tt_printf ("\033[A");
1952	else if ((scrollBar.style == R_SB_NEXT	2005	else if (direction == DN)
1953	&& scrollbarnext_dnButton (ev.y))
1954	|| (scrollBar.style == R_SB_RXVT
1955	&& scrollbarrxvt_dnButton (ev.y)))
1956	tt_printf ("\033[B");	2006	tt_printf ("\033[B");
1957	else	2007	else
1958	switch (ev.button)	2008	switch (ev.button)
1959	{	2009	{
1960	case Button2:	2010	case Button2:
…		…
1968	break;	2018	break;
1969	}	2019	}
1970	}	2020	}
1971	else	2021	else
1972	#endif /* NO_SCROLLBAR_REPORT */	2022	#endif /* NO_SCROLLBAR_REPORT */
1973
1974	{
1975	char upordown = 0;
1976
1977	if (scrollBar.style == R_SB_NEXT)
1978	{	2023	{
1979	if (scrollbarnext_upButton (ev.y))	2024	if (direction != NO_DIR)
1980	upordown = -1; /* up */
1981	else if (scrollbarnext_dnButton (ev.y))
1982	upordown = 1; /* down */
1983	}
1984	else if (scrollBar.style == R_SB_RXVT)
1985	{
1986	if (scrollbarrxvt_upButton (ev.y))
1987	upordown = -1; /* up */
1988	else if (scrollbarrxvt_dnButton (ev.y))
1989	upordown = 1; /* down */
1990	}
1991
1992	if (upordown)
1993	{	2025	{
1994	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2026	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995	if (!cont_scroll_ev.is_active ())	2027	if (!cont_scroll_ev.is_active ())
1996	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2028	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1997	#endif	2029	#endif
1998	if (scr_page (upordown < 0 ? UP : DN, 1))	2030	if (scr_page (direction, 1))
1999	{	2031	{
2000	if (upordown < 0)	2032	if (direction == UP)
2001	scrollBar.setUp ();	2033	scrollBar.state = STATE_UP;
2002	else	2034	else
2003	scrollBar.setDn ();	2035	scrollBar.state = STATE_DOWN;
2004	}	2036	}
2005	}	2037	}
2006	else	2038	else
2007	switch (ev.button)	2039	switch (ev.button)
2008	{	2040	{
2009	case Button2:	2041	case Button2:
2010	switch (scrollbar_align)	2042	switch (scrollBar.align)
2011	{	2043	{
2012	case R_SB_ALIGN_TOP:	2044	case R_SB_ALIGN_TOP:
2013	csrO = 0;	2045	csrO = 0;
2014	break;	2046	break;
2015	case R_SB_ALIGN_CENTRE:	2047	case R_SB_ALIGN_CENTRE:
…		…
2021	}	2053	}
2022		2054
2023	if (scrollBar.style == R_SB_XTERM	2055	if (scrollBar.style == R_SB_XTERM
2024	|| scrollbar_above_slider (ev.y)	2056	|| scrollbar_above_slider (ev.y)
2025	|| scrollbar_below_slider (ev.y))	2057	|| scrollbar_below_slider (ev.y))
2026	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2058	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2027		2059
2028	scrollBar.setMotion ();	2060	scrollBar.state = STATE_MOTION;
2029	break;	2061	break;
2030		2062
2031	case Button1:	2063	case Button1:
2032	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2064	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2033	csrO = ev.y - scrollBar.top;	2065	csrO = ev.y - scrollBar.top;
2034	/* FALLTHROUGH */	2066	/* FALLTHROUGH */
2035		2067
2036	case Button3:	2068	case Button3:
2037	if (scrollBar.style != R_SB_XTERM)	2069	if (scrollBar.style != R_SB_XTERM)
…		…
2047	scr_page (DN, nrow - 1);	2079	scr_page (DN, nrow - 1);
2048	# else	2080	# else
2049	scr_page (DN, nrow / 4);	2081	scr_page (DN, nrow / 4);
2050	# endif	2082	# endif
2051	else	2083	else
2052	scrollBar.setMotion ();	2084	scrollBar.state = STATE_MOTION;
2053	}	2085	}
2054	else	2086	else
2055	{	2087	{
2056	scr_page ((ev.button == Button1 ? DN : UP),	2088	scr_page ((ev.button == Button1 ? DN : UP),
2057	(nrow	2089	(nrow
2058	* scrollbar_position (ev.y)	2090	* scrollbar_position (ev.y)
2059	/ scrollbar_size ()));	2091	/ scrollBar.size ()));
2060	}	2092	}
2061		2093
2062	break;	2094	break;
2063	}	2095	}
2064	}	2096	}
…		…
2074		2106
2075	csrO = 0; /* reset csr Offset */	2107	csrO = 0; /* reset csr Offset */
2076	if (!bypass_keystate)	2108	if (!bypass_keystate)
2077	reportmode = !! (priv_modes & PrivMode_mouse_report);	2109	reportmode = !! (priv_modes & PrivMode_mouse_report);
2078		2110
2079	if (scrollbar_isUpDn ())	2111	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2080	{	2112	{
2081	scrollBar.setIdle ();	2113	scrollBar.state = STATE_IDLE;
2082	scrollbar_show (0);	2114	scrollBar.show (0);
2083	}	2115	}
2084		2116
2085	#ifdef SELECTION_SCROLLING	2117	#ifdef SELECTION_SCROLLING
2086	sel_scroll_ev.stop();	2118	sel_scroll_ev.stop();
2087	#endif	2119	#endif
…		…
2137	selection_make (ev.time);	2169	selection_make (ev.time);
2138	break;	2170	break;
2139		2171
2140	case Button2:	2172	case Button2:
2141	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2173	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2142	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2174	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2143	break;	2175	break;
2144		2176
2145	#ifdef MOUSE_WHEEL	2177	#ifdef MOUSE_WHEEL
2146	case Button4:	2178	case Button4:
2147	case Button5:	2179	case Button5:
…		…
2167		2199
2168	if (!slip_wheel_ev.is_active ())	2200	if (!slip_wheel_ev.is_active ())
2169	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2201	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2170	}	2202	}
2171	else	2203	else
		2204	# endif
2172	{	2205	{
2173	# endif
2174	scr_page (v, i);	2206	scr_page (v, i);
2175	scrollbar_show (1);	2207	scrollBar.show (1);
2176	# ifdef MOUSE_SLIP_WHEELING
2177	}	2208	}
2178	# endif
2179	}	2209	}
2180	break;	2210	break;
2181	#endif	2211	#endif
2182	}	2212	}
2183	}	2213	}
2184	}	2214	}
2185		2215
2186	/*}}} */	2216	/*}}} */
2187		2217
2188	bool	2218	void
2189	rxvt_term::cmd_parse ()	2219	rxvt_term::cmd_parse ()
2190	{	2220	{
2191	bool flag = false;
2192	wchar_t ch = NOCHAR;	2221	wchar_t ch = NOCHAR;
2193	char *seq_begin; // remember start of esc-sequence here	2222	char *seq_begin; // remember start of esc-sequence here
2194		2223
2195	for (;;)	2224	for (;;)
2196	{	2225	{
2197	if (ch == NOCHAR)	2226	if (expect_false (ch == NOCHAR))
2198	{	2227	{
2199	seq_begin = cmdbuf_ptr;	2228	seq_begin = cmdbuf_ptr;
2200	ch = next_char ();	2229	ch = next_char ();
2201		2230
2202	if (ch == NOCHAR)	2231	if (ch == NOCHAR)
2203	break;	2232	break;
2204	}	2233	}
2205		2234
2206	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2235	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207	{	2236	{
2208	if (!seen_input)	2237	if (expect_false (!seen_input))
2209	{	2238	{
2210	seen_input = 1;	2239	seen_input = 1;
2211	// many badly-written programs (e.g. jed) contain a race condition:	2240	// many badly-written programs (e.g. jed) contain a race condition:
2212	// they first read the screensize and then install a SIGWINCH handler.	2241	// they first read the screensize and then install a SIGWINCH handler.
2213	// some window managers resize the window early, and these programs	2242	// some window managers resize the window early, and these programs
…		…
2226	wchar_t *str = buf;	2255	wchar_t *str = buf;
2227	wchar_t *eol = str + min (ncol, UBUFSIZ);	2256	wchar_t *eol = str + min (ncol, UBUFSIZ);
2228		2257
2229	for (;;)	2258	for (;;)
2230	{	2259	{
2231	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2260	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232	break;	2261	break;
2233		2262
2234	*str++ = ch;	2263	*str++ = ch;
2235		2264
2236	if (ch == C0_LF || str >= eol)	2265	if (expect_false (ch == C0_LF || str >= eol))
2237	{	2266	{
2238	if (ch == C0_LF)	2267	if (ch == C0_LF)
2239	nlines++;	2268	nlines++;
2240		2269
2241	refresh_count++;	2270	refresh_count++;
…		…
2290	* What the heck we'll cheat and only refresh less than every page-full.	2319	* What the heck we'll cheat and only refresh less than every page-full.
2291	* if skipScroll is enabled.	2320	* if skipScroll is enabled.
2292	*/	2321	*/
2293	if (refreshnow)	2322	if (refreshnow)
2294	{	2323	{
2295	flag = true;
2296	scr_refresh ();	2324	scr_refresh ();
2297	want_refresh = 1;	2325	want_refresh = 1;
2298	}	2326	}
2299
2300	}	2327	}
2301	else	2328	else
2302	{	2329	{
2303	try	2330	try
2304	{	2331	{
…		…
2312	}	2339	}
2313		2340
2314	ch = NOCHAR;	2341	ch = NOCHAR;
2315	}	2342	}
2316	}	2343	}
2317
2318	return flag;
2319	}	2344	}
2320		2345
2321	// read the next character	2346	// read the next character
2322	wchar_t	2347	wchar_t
2323	rxvt_term::next_char () NOTHROW	2348	rxvt_term::next_char () NOTHROW
2324	{	2349	{
2325	while (cmdbuf_ptr < cmdbuf_endp)	2350	while (cmdbuf_ptr < cmdbuf_endp)
2326	{	2351	{
2327	// assume 7-bit to be ascii ALWAYS	2352	// assume 7-bit to be ascii ALWAYS
2328	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2353	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2329	return *cmdbuf_ptr++;	2354	return *cmdbuf_ptr++;
2330		2355
2331	wchar_t wc;	2356	wchar_t wc;
2332	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2357	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2333		2358
…		…
2337	cmdbuf_ptr = cmdbuf_endp;	2362	cmdbuf_ptr = cmdbuf_endp;
2338	break;	2363	break;
2339	}	2364	}
2340		2365
2341	if (len == (size_t)-1)	2366	if (len == (size_t)-1)
		2367	{
		2368	mbstate.reset (); // reset now undefined conversion state
2342	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2369	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2370	}
2343		2371
2344	// assume wchar == unicode	2372	// assume wchar == unicode
2345	cmdbuf_ptr += len;	2373	cmdbuf_ptr += len;
2346	return wc & UNICODE_MASK;	2374	return wc & UNICODE_MASK;
2347	}	2375	}
…		…
2391	/*----------------------------------------------------------------------*/	2419	/*----------------------------------------------------------------------*/
2392	#ifdef PRINTPIPE	2420	#ifdef PRINTPIPE
2393	FILE *	2421	FILE *
2394	rxvt_term::popen_printer ()	2422	rxvt_term::popen_printer ()
2395	{	2423	{
2396	FILE *stream = popen (rs[Rs_print_pipe], "w");	2424	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2397		2425
2398	if (stream == NULL)	2426	if (stream == NULL)
2399	rxvt_warn ("can't open printer pipe, not printing.\n");	2427	rxvt_warn ("can't open printer pipe, not printing.\n");
2400		2428
2401	return stream;	2429	return stream;
…		…
2412	* simulate attached vt100 printer	2440	* simulate attached vt100 printer
2413	*/	2441	*/
2414	void	2442	void
2415	rxvt_term::process_print_pipe ()	2443	rxvt_term::process_print_pipe ()
2416	{	2444	{
2417	int done;	2445	FILE *fd = popen_printer ();
2418	FILE *fd;
2419		2446
2420	if ((fd = popen_printer ()) == NULL)	2447	if (!fd)
2421	return;	2448	return;
2422		2449
2423	/*	2450	/*
2424	* Send all input to the printer until either ESC[4i or ESC[?4i	2451	* Send all input to the printer until either ESC[4i or ESC[?4i
2425	* is received.	2452	* is received.
2426	*/	2453	*/
2427	for (done = 0; !done;)	2454	for (int done = 0; !done; )
2428	{	2455	{
2429	unsigned char buf[8];	2456	unsigned char buf[8];
2430	unicode_t ch;	2457	unicode_t ch;
2431	unsigned int i, len;	2458	unsigned int i, len;
2432		2459
…		…
2577	break;	2604	break;
2578	case 'Z': /* identify the terminal type */	2605	case 'Z': /* identify the terminal type */
2579	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2606	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580	break;	2607	break;
2581	case '<': /* turn off VT52 mode */	2608	case '<': /* turn off VT52 mode */
2582	PrivMode (0, PrivMode_vt52);	2609	set_privmode (PrivMode_vt52, 0);
2583	break;	2610	break;
2584	case 'F': /* use special graphics character set */	2611	case 'F': /* use special graphics character set */
2585	case 'G': /* use regular character set */	2612	case 'G': /* use regular character set */
2586	/* unimplemented */	2613	/* unimplemented */
2587	break;	2614	break;
…		…
2641	scr_forwardindex ();	2668	scr_forwardindex ();
2642	break;	2669	break;
2643	#endif	2670	#endif
2644	case '=':	2671	case '=':
2645	case '>':	2672	case '>':
2646	PrivMode ((ch == '='), PrivMode_aplKP);	2673	set_privmode (PrivMode_aplKP, ch == '=');
2647	break;	2674	break;
2648		2675
2649	case C1_40:	2676	case C1_40:
2650	cmd_getc ();	2677	cmd_getc ();
2651	break;	2678	break;
…		…
2655		2682
2656	/* 8.3.87: NEXT LINE */	2683	/* 8.3.87: NEXT LINE */
2657	case C1_NEL: /* ESC E */	2684	case C1_NEL: /* ESC E */
2658	{	2685	{
2659	wchar_t nlcr[] = { C0_LF, C0_CR };	2686	wchar_t nlcr[] = { C0_LF, C0_CR };
2660	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2687	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2661	}	2688	}
2662	break;	2689	break;
2663		2690
2664	/* kidnapped escape sequence: Should be 8.3.48 */	2691	/* kidnapped escape sequence: Should be 8.3.48 */
2665	case C1_ESA: /* ESC G */	2692	case C1_ESA: /* ESC G */
…		…
2690	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2717	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2691	case C1_SCI: /* ESC Z */	2718	case C1_SCI: /* ESC Z */
2692	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2719	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2693	break; /* steal obsolete ESC [ c */	2720	break; /* steal obsolete ESC [ c */
2694		2721
2695	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2722	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2696	case C1_CSI: /* ESC [ */	2723	case C1_CSI: /* ESC [ */
2697	process_csi_seq ();	2724	process_csi_seq ();
2698	break;	2725	break;
2699		2726
2700	/* 8.3.90: OPERATING SYSTEM COMMAND */	2727	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2701	case C1_OSC: /* ESC ] */	2728	case C1_OSC: /* ESC ] */
2702	process_osc_seq ();	2729	process_osc_seq ();
2703	break;	2730	break;
2704		2731
2705	/* 8.3.106: RESET TO INITIAL STATE */	2732	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2706	case 'c':	2733	case 'c':
2707	mbstate.reset ();	2734	mbstate.reset ();
2708	scr_poweron ();	2735	scr_poweron ();
2709	scrollbar_show (1);	2736	scrollBar.show (1);
2710	break;	2737	break;
2711		2738
2712	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2739	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2713	case 'n':	2740	case 'n':
2714	scr_charset_choose (2);	2741	scr_charset_choose (2);
…		…
2734	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2761	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2762	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2763	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737	};	2764	};
2738		2765
2739	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2766	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \	2767	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))	2768	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742	#define get_byte_array_bit(array, bit) \	2769	#define get_byte_array_bit(array, bit) \
2743	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2770	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744		2771
2745	const unsigned char csi_defaults[] =	2772	static const unsigned char csi_defaults[] =
2746	{	2773	{
2747	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2774	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2775	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2776	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2777	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
…		…
2765		2792
2766	nargs = 0;	2793	nargs = 0;
2767		2794
2768	priv = 0;	2795	priv = 0;
2769	ch = cmd_getc ();	2796	ch = cmd_getc ();
2770	if (ch >= '<' && ch <= '?')	2797	if ((ch >= '<' && ch <= '?') || ch == '!')
2771	{	2798	{
2772	/* '<' '=' '>' '?' */	2799	/* '<' '=' '>' '?' '!' */
2773	priv = ch;	2800	priv = ch;
2774	ch = cmd_getc ();	2801	ch = cmd_getc ();
2775	}	2802	}
2776		2803
2777	/* read any numerical arguments */	2804	/* read any numerical arguments */
…		…
2826	// versions.	2853	// versions.
2827	//	2854	//
2828	tt_printf ("\033[>%d;95;0c", 'U');	2855	tt_printf ("\033[>%d;95;0c", 'U');
2829	}	2856	}
2830	break;	2857	break;
		2858
2831	case '?':	2859	case '?':
2832	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2860	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833	process_terminal_mode (ch, priv, nargs, arg);	2861	process_terminal_mode (ch, priv, nargs, arg);
2834	break;	2862	break;
		2863
		2864	case '!':
		2865	if (ch == CSI_70)
		2866	{
		2867	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2868	scr_soft_reset ();
		2869
		2870	static const int pm_h[] = { 7, 25 };
		2871	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
		2872
		2873	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
		2874	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2835	}	2875	}
		2876	break;
		2877	}
		2878
2836	return;	2879	return;
2837	}	2880	}
2838		2881
2839	switch (ch)	2882	switch (ch)
2840	{	2883	{
…		…
3207	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3250	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3208	*/	3251	*/
3209	void	3252	void
3210	rxvt_term::process_dcs_seq ()	3253	rxvt_term::process_dcs_seq ()
3211	{	3254	{
3212	char *s;
3213	unicode_t eh;
3214
3215	/*	3255	/*
3216	* Not handled yet	3256	* Not handled yet
3217	*/	3257	*/
		3258
		3259	unicode_t eh;
3218	s = get_to_st (eh);	3260	char *s = get_to_st (eh);
3219	if (s)	3261	if (s)
3220	free (s);	3262	free (s);
3221		3263
3222	return;	3264	return;
3223	}	3265	}
…		…
3227	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'	3269	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3228	*/	3270	*/
3229	void	3271	void
3230	rxvt_term::process_osc_seq ()	3272	rxvt_term::process_osc_seq ()
3231	{	3273	{
3232	unicode_t ch, eh;
3233	int arg;	3274	int arg;
3234		3275
3235	ch = cmd_getc ();	3276	unicode_t ch = cmd_getc ();
3236	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3277	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3237	arg = arg * 10 + (ch - '0');	3278	arg = arg * 10 + (ch - '0');
3238		3279
3239	if (ch == ';')	3280	if (ch == ';')
3240	{	3281	{
		3282	unicode_t eh;
3241	char *s = get_to_st (eh);	3283	char *s = get_to_st (eh);
3242		3284
3243	if (s)	3285	if (s)
3244	{	3286	{
3245	process_xterm_seq (arg, s, eh);	3287	process_xterm_seq (arg, s, eh);
…		…
3269		3311
3270	/*	3312	/*
3271	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3313	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3272	*/	3314	*/
3273	void	3315	void
3274	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3316	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3275	{	3317	{
3276	int color;	3318	int color;
3277	char *buf, *name;	3319	char *buf, *name;
3278	bool query = str[0] == '?' && !str[1];	3320	bool query = str[0] == '?' && !str[1];
3279	int saveop = op;	3321	int saveop = op;
…		…
3320		3362
3321	XFree (value);	3363	XFree (value);
3322	}	3364	}
3323	else	3365	else
3324	{	3366	{
3325	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3367	char *eq = strchr (str, '=');
3326		3368
3327	if (eq)	3369	if (eq)
3328	{	3370	{
3329	*eq = 0;	3371	*eq = 0;
3330	set_utf8_property (display->atom (str), eq + 1);	3372	set_utf8_property (display->atom (str), eq + 1);
…		…
3351	*buf++ = '\0';	3393	*buf++ = '\0';
3352		3394
3353	process_color_seq (op, color, name, resp);	3395	process_color_seq (op, color, name, resp);
3354	}	3396	}
3355	break;	3397	break;
		3398	case Rxvt_restoreFG:
3356	case XTerm_Color00:	3399	case XTerm_Color00:
3357	process_color_seq (op, Color_fg, str, resp);	3400	process_color_seq (op, Color_fg, str, resp);
3358	break;	3401	break;
		3402	case Rxvt_restoreBG:
3359	case XTerm_Color01:	3403	case XTerm_Color01:
3360	process_color_seq (op, Color_bg, str, resp);	3404	process_color_seq (op, Color_bg, str, resp);
3361	break;	3405	break;
3362	#ifndef NO_CURSORCOLOR	3406	#ifndef NO_CURSORCOLOR
3363	case XTerm_Color_cursor:	3407	case XTerm_Color_cursor:
…		…
3368	process_color_seq (op, Color_pointer_fg, str, resp);	3412	process_color_seq (op, Color_pointer_fg, str, resp);
3369	break;	3413	break;
3370	case XTerm_Color_pointer_bg:	3414	case XTerm_Color_pointer_bg:
3371	process_color_seq (op, Color_pointer_bg, str, resp);	3415	process_color_seq (op, Color_pointer_bg, str, resp);
3372	break;	3416	break;
		3417	#ifdef OPTION_HC
		3418	case XTerm_Color_HC:
		3419	process_color_seq (op, Color_HC, str, resp);
		3420	break;
		3421	case XTerm_Color_HTC:
		3422	process_color_seq (op, Color_HTC, str, resp);
		3423	break;
		3424	#endif
3373	#ifndef NO_BOLD_UNDERLINE_REVERSE	3425	#ifndef NO_BOLD_UNDERLINE_REVERSE
3374	case XTerm_Color_RV:
3375	process_color_seq (op, Color_RV, str, resp);
3376	break;
3377	case Rxvt_Color_BD:
3378	case URxvt_Color_BD:	3426	case URxvt_Color_BD:
3379	process_color_seq (op, Color_BD, str, resp);	3427	process_color_seq (op, Color_BD, str, resp);
3380	break;	3428	break;
3381	case Rxvt_Color_UL:
3382	case URxvt_Color_UL:	3429	case URxvt_Color_UL:
3383	process_color_seq (op, Color_UL, str, resp);	3430	process_color_seq (op, Color_UL, str, resp);
3384	break;	3431	break;
3385	case URxvt_Color_IT:	3432	case URxvt_Color_IT:
3386	process_color_seq (op, Color_IT, str, resp);	3433	process_color_seq (op, Color_IT, str, resp);
3387	break;	3434	break;
3388	#endif	3435	#endif
		3436	case URxvt_Color_border:
		3437	process_color_seq (op, Color_border, str, resp);
		3438	break;
3389	#if ENABLE_TRANSPARENCY	3439	#if ENABLE_TRANSPARENCY
3390	case URxvt_Color_tint:	3440	case URxvt_Color_tint:
3391	process_color_seq (op, Color_tint, str, resp);	3441	process_color_seq (op, Color_tint, str, resp);
3392	{	3442	{
3393	bool changed = false;	3443	bool changed = false;
		3444
3394	if (ISSET_PIXCOLOR (Color_tint))	3445	if (ISSET_PIXCOLOR (Color_tint))
3395	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3446	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3396	else	3447
3397	changed = bgPixmap.unset_tint ();
3398	if (changed)	3448	if (changed)
3399	update_background ();	3449	update_background ();
3400	}	3450	}
3401		3451
3402	break;	3452	break;
…		…
3406	case Rxvt_Pixmap:	3456	case Rxvt_Pixmap:
3407	if (!strcmp (str, "?"))	3457	if (!strcmp (str, "?"))
3408	{	3458	{
3409	char str[256];	3459	char str[256];
3410		3460
3411	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3461	sprintf (str, "[%dx%d+%d+%d]",
3412	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3462	min (h_scale, 32767), min (v_scale, 32767),
3413	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3463	min (h_align, 32767), min (v_align, 32767));
3414	process_xterm_seq (XTerm_title, str, CHAR_ST);	3464	process_xterm_seq (XTerm_title, str, CHAR_ST);
3415	}	3465	}
3416	else	3466	else
3417	{	3467	{
3418	int changed = 0;	3468	int changed = 0;
3419		3469
3420	if (*str != ';')	3470	if (*str != ';')
3421	{	3471	{
3422	/* reset to default scaling :*/
3423	bgPixmap.unset_geometry ();
3424	if (bgPixmap.set_file (str)) /* change pixmap */	3472	if (bg_set_file (str)) /* change pixmap */
		3473	{
3425	changed++;	3474	changed++;
3426	str = strchr (str, ';');	3475	str = strchr (str, ';');
3427	if (str == NULL)	3476	if (str == NULL)
3428	bgPixmap.set_defaultGeometry ();	3477	bg_set_default_geometry ();
		3478	else
		3479	bg_set_geometry (str+1);
		3480	}
3429	}	3481	}
3430	while (str)	3482	else
3431	{	3483	{
3432	str++;	3484	str++;
3433	if (bgPixmap.set_geometry (str))	3485	if (bg_set_geometry (str, true))
3434	changed++;	3486	changed++;
3435	str = strchr (str, ';');
3436	}	3487	}
		3488
3437	if (changed)	3489	if (changed)
		3490	{
		3491	if (bg_window_position_sensitive ())
		3492	{
		3493	int x, y;
		3494	get_window_origin (x, y);
		3495	bg_set_position (x, y);
		3496	}
3438	update_background ();	3497	update_background ();
		3498	}
3439	}	3499	}
3440	break;	3500	break;
3441	#endif	3501	#endif
3442
3443	case Rxvt_restoreFG:
3444	set_window_color (Color_fg, str);
3445	break;
3446	case Rxvt_restoreBG:
3447	set_window_color (Color_bg, str);
3448	break;
3449		3502
3450	case XTerm_logfile:	3503	case XTerm_logfile:
3451	// TODO, when secure mode?	3504	// TODO, when secure mode?
3452	break;	3505	break;
3453		3506
…		…
3520	break;	3573	break;
3521	#endif	3574	#endif
3522		3575
3523	#if ENABLE_PERL	3576	#if ENABLE_PERL
3524	case URxvt_perl:	3577	case URxvt_perl:
3525	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3578	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3526	; // no responses yet
3527	break;	3579	break;
3528	#endif	3580	#endif
3529	}	3581	}
3530	}	3582	}
3531	/*----------------------------------------------------------------------*/	3583	/*----------------------------------------------------------------------*/
…		…
3554	{	3606	{
3555	if (mode == 'r')	3607	if (mode == 'r')
3556	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3608	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557	else	3609	else
3558	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3610	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559	PrivMode (state, bit);	3611
		3612	set_privmode (bit, state);
3560	}	3613	}
3561		3614
3562	return state;	3615	return state;
3563	}	3616	}
3564		3617
…		…
3572	static const struct	3625	static const struct
3573	{	3626	{
3574	const int argval;	3627	const int argval;
3575	const unsigned long bit;	3628	const unsigned long bit;
3576	} argtopriv[] = {	3629	} argtopriv[] = {
3577	{ 1, PrivMode_aplCUR },	3630	{ 1, PrivMode_aplCUR }, // DECCKM
3578	{ 2, PrivMode_vt52 },	3631	{ 2, PrivMode_vt52 },
3579	{ 3, PrivMode_132 },	3632	{ 3, PrivMode_132 }, // DECCOLM
3580	{ 4, PrivMode_smoothScroll },	3633	{ 4, PrivMode_smoothScroll }, // DECSCLM
3581	{ 5, PrivMode_rVideo },	3634	{ 5, PrivMode_rVideo }, // DECSCNM
3582	{ 6, PrivMode_relOrigin },	3635	{ 6, PrivMode_relOrigin }, // DECOM
3583	{ 7, PrivMode_Autowrap },	3636	{ 7, PrivMode_Autowrap }, // DECAWM
3584	// 8, bi-directional support mode	3637	// 8, auto-repeat keys // DECARM
3585	{ 9, PrivMode_MouseX10 },	3638	{ 9, PrivMode_MouseX10 },
3586	// 18, 19 printing-related	3639	// 18 end FF to printer after print screen
		3640	// 19 Print screen prints full screen/scroll region
3587	{ 25, PrivMode_VisibleCursor },	3641	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588	#ifdef scrollBar_esc	3642	#ifdef scrollBar_esc
3589	{ scrollBar_esc, PrivMode_scrollBar },	3643	{ scrollBar_esc, PrivMode_scrollBar },
3590	#endif	3644	#endif
3591	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3645	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3646	// 38, tektronix mode // DECTEK
3592	{ 40, PrivMode_132OK },	3647	{ 40, PrivMode_132OK },
3593	// 41 xterm more fixes NYI	3648	// 41 xterm more fixes NYI
3594	// 45 margin bell NYI	3649	// 45 margin bell NYI
3595	// 46 start logging	3650	// 46 start logging
3596	{ 47, PrivMode_Screen },	3651	{ 47, PrivMode_Screen },
3597	{ 66, PrivMode_aplKP },	3652	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598	#ifndef NO_BACKSPACE_KEY	3653	#ifndef NO_BACKSPACE_KEY
3599	{ 67, PrivMode_BackSpace },	3654	{ 67, PrivMode_BackSpace }, // DECBKM
3600	#endif	3655	#endif
3601	{ 1000, PrivMode_MouseX11 },	3656	{ 1000, PrivMode_MouseX11 },
3602	{ 1002, PrivMode_MouseBtnEvent },	3657	{ 1002, PrivMode_MouseBtnEvent },
3603	{ 1003, PrivMode_MouseAnyEvent },	3658	{ 1003, PrivMode_MouseAnyEvent },
		3659	#if ENABLE_FRILLS
		3660	{ 1005, PrivMode_ExtModeMouse },
		3661	#endif
3604	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3662	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605	{ 1011, PrivMode_Keypress }, // rxvt extension	3663	{ 1011, PrivMode_Keypress }, // rxvt extension
		3664	#if ENABLE_FRILLS
		3665	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3666	#endif
3606	// 1035 enable modifiers for alt, numlock NYI	3667	// 1035 enable modifiers for alt, numlock NYI
3607	// 1036 send ESC for meta keys NYI	3668	// 1036 send ESC for meta keys NYI
3608	// 1037 send DEL for keypad delete NYI	3669	// 1037 send DEL for keypad delete NYI
3609	{ 1047, PrivMode_Screen },	3670	{ 1047, PrivMode_Screen },
3610	// 1048 save and restore cursor	3671	// 1048 save and restore cursor, implemented in code
3611	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3672	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3673	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3674	{ 2004, PrivMode_BracketPaste },
3613	};	3675	};
3614		3676
3615	if (nargs == 0)	3677	if (nargs == 0)
3616	return;	3678	return;
3617		3679
…		…
3624	for (i = 0; i < nargs; i++)	3686	for (i = 0; i < nargs; i++)
3625	{	3687	{
3626	state = -1;	3688	state = -1;
3627		3689
3628	/* basic handling */	3690	/* basic handling */
3629	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3691	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3630	if (argtopriv[j].argval == arg[i])	3692	if (argtopriv[j].argval == arg[i])
3631	{	3693	{
3632	state = privcases (mode, argtopriv[j].bit);	3694	state = privcases (mode, argtopriv[j].bit);
3633	break;	3695	break;
3634	}	3696	}
…		…
3642		3704
3643	scr_touch (true);	3705	scr_touch (true);
3644	break;	3706	break;
3645	#endif	3707	#endif
3646	case 1048: /* alternative cursor save */	3708	case 1048: /* alternative cursor save */
3647	case 1049:
3648	if (option (Opt_secondaryScreen))	3709	if (option (Opt_secondaryScreen))
3649	if (mode == 0)	3710	if (mode == 0)
3650	scr_cursor (RESTORE);	3711	scr_cursor (RESTORE);
3651	else if (mode == 1)	3712	else if (mode == 1)
3652	scr_cursor (SAVE);	3713	scr_cursor (SAVE);
…		…
3661	case 2: /* VT52 mode */	3722	case 2: /* VT52 mode */
3662	/* oddball mode. should be set regardless of set/reset	3723	/* oddball mode. should be set regardless of set/reset
3663	* parameter. Return from VT52 mode with an ESC < from	3724	* parameter. Return from VT52 mode with an ESC < from
3664	* within VT52 mode	3725	* within VT52 mode
3665	*/	3726	*/
3666	PrivMode (1, PrivMode_vt52);	3727	set_privmode (PrivMode_vt52, 1);
3667	break;	3728	break;
3668	case 3: /* 80/132 */	3729	case 3: /* 80/132 */
3669	if (priv_modes & PrivMode_132OK)	3730	if (priv_modes & PrivMode_132OK)
3670	set_widthheight (((state ? 132 : 80) * fwidth), height);	3731	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671	break;	3732	break;
3672	case 4: /* smooth scrolling */	3733	case 4: /* smooth scrolling */
3673	set_option (Opt_jumpScroll, !state);	3734	set_option (Opt_jumpScroll, !state);
3674	break;	3735	break;
3675	case 5: /* reverse video */	3736	case 5: /* reverse video */
…		…
3686	if (state) /* orthogonal */	3747	if (state) /* orthogonal */
3687	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3748	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3688	break;	3749	break;
3689	#ifdef scrollBar_esc	3750	#ifdef scrollBar_esc
3690	case scrollBar_esc:	3751	case scrollBar_esc:
3691	if (scrollbar_mapping (state))	3752	if (scrollBar.map (state))
3692	{	3753	{
3693	resize_all_windows (0, 0, 0);	3754	resize_all_windows (0, 0, 0);
3694	scr_touch (true);	3755	scr_touch (true);
3695	}	3756	}
3696	break;	3757	break;
…		…
3713	case 1003:	3774	case 1003:
3714	if (state)	3775	if (state)
3715	{	3776	{
3716	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);	3777	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3778	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3779	mouse_row = mouse_col = 0;
3718	vt_emask_mouse = PointerMotionMask;	3780	vt_emask_mouse = PointerMotionMask;
3719	}	3781	}
3720	else	3782	else
3721	vt_emask_mouse = NoEventMask;	3783	vt_emask_mouse = NoEventMask;
		3784
3722	vt_select_input ();	3785	vt_select_input ();
3723	break;	3786	break;
3724	case 1010: /* scroll to bottom on TTY output inhibit */	3787	case 1010: /* scroll to bottom on TTY output inhibit */
3725	set_option (Opt_scrollTtyOutput, !state);	3788	set_option (Opt_scrollTtyOutput, !state);
3726	break;	3789	break;
3727	case 1011: /* scroll to bottom on key press */	3790	case 1011: /* scroll to bottom on key press */
3728	set_option (Opt_scrollTtyKeypress, state);	3791	set_option (Opt_scrollTtyKeypress, state);
3729	break;	3792	break;
3730	case 1047: /* secondary screen w/ clearing last */	3793	case 1047: /* secondary screen w/ clearing last */
3731	if (option (Opt_secondaryScreen))	3794	if (option (Opt_secondaryScreen))
3732	if (current_screen != PRIMARY)	3795	if (!state)
3733	scr_erase_screen (2);	3796	scr_erase_screen (2);
		3797
3734	scr_change_screen (state);	3798	scr_change_screen (state);
3735	break;	3799	break;
3736	case 1049: /* secondary screen w/ clearing first */	3800	case 1049: /* secondary screen w/ clearing first */
		3801	if (option (Opt_secondaryScreen))
		3802	if (state)
		3803	scr_cursor (SAVE);
		3804
3737	scr_change_screen (state);	3805	scr_change_screen (state);
		3806
3738	if (option (Opt_secondaryScreen))	3807	if (option (Opt_secondaryScreen))
3739	if (current_screen != PRIMARY)	3808	if (state)
3740	scr_erase_screen (2);	3809	scr_erase_screen (2);
		3810	else
		3811	scr_cursor (RESTORE);
3741	break;	3812	break;
3742	default:	3813	default:
3743	break;	3814	break;
3744	}	3815	}
3745	}	3816	}
…		…
3939		4010
3940	/* ---------------------------------------------------------------------- */	4011	/* ---------------------------------------------------------------------- */
3941	/* Write data to the pty as typed by the user, pasted with the mouse,	4012	/* Write data to the pty as typed by the user, pasted with the mouse,
3942	* or generated by us in response to a query ESC sequence.	4013	* or generated by us in response to a query ESC sequence.
3943	*/	4014	*/
3944	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4015	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3945		4016
3946	void	4017	void
3947	rxvt_term::tt_write (const char *data, unsigned int len)	4018	rxvt_term::tt_write (const char *data, unsigned int len)
3948	{	4019	{
3949	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4020	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3961		4032
3962	data += written;	4033	data += written;
3963	len -= written;	4034	len -= written;
3964	}	4035	}
3965		4036
3966	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4037	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3967		4038
3968	memcpy (v_buffer + v_buflen, data, len);	4039	memcpy (v_buffer + v_buflen, data, len);
3969	v_buflen += len;	4040	v_buflen += len;
3970		4041
3971	pty_ev.set (ev::READ | ev::WRITE);	4042	pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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