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.358 by sasha, Tue Sep 18 22:27:41 2007 UTC vs.
Revision 1.442 by sf-exg, Wed Mar 31 09:37:20 2010 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-2006 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
		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 (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
…		…
324	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
325		426
326	if (numlock_state || (ev.state & ModNumLockMask))	427	if (numlock_state || (ev.state & ModNumLockMask))
327	{	428	{
328	numlock_state = (ev.state & ModNumLockMask);	429	numlock_state = (ev.state & ModNumLockMask);
329	PrivMode ((!numlock_state), PrivMode_aplKP);	430	set_privmode (PrivMode_aplKP, !numlock_state);
330	}	431	}
331		432
332	kbuf[0] = 0;	433	kbuf[0] = 0;
333		434
334	#ifdef USE_XIM	435	#ifdef USE_XIM
…		…
410	#ifdef PAGING_CONTEXT_LINES	511	#ifdef PAGING_CONTEXT_LINES
411	lnsppg = nrow - PAGING_CONTEXT_LINES;	512	lnsppg = nrow - PAGING_CONTEXT_LINES;
412	#else	513	#else
413	lnsppg = nrow * 4 / 5;	514	lnsppg = nrow * 4 / 5;
414	#endif	515	#endif
		516	max_it (lnsppg, 1);
		517
415	if (keysym == XK_Prior)	518	if (keysym == XK_Prior)
416	{	519	{
417	scr_page (UP, lnsppg);	520	scr_page (UP, lnsppg);
418	return;	521	return;
419	}	522	}
…		…
484	}	587	}
485	}	588	}
486		589
487	#if ENABLE_FRILLS || ISO_14755	590	#if ENABLE_FRILLS || ISO_14755
488	// ISO 14755 support	591	// ISO 14755 support
489	if (shft && ctrl)	592	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490	{	593	{
491	int hv;	594	int hv;
492		595
493	if (iso14755buf & ISO_14755_51	596	if (iso14755buf & ISO_14755_51
494	&& (keysym == XK_space || keysym == XK_KP_Space	597	&& (keysym == XK_space || keysym == XK_KP_Space
…		…
524	scr_overlay_off ();	627	scr_overlay_off ();
525	# endif	628	# endif
526	iso14755buf = 0;	629	iso14755buf = 0;
527	}	630	}
528	}	631	}
		632	else if (option (Opt_iso14755) &&
529	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	633	((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	634	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531	if (!(iso14755buf & ISO_14755_STARTED))	635	if (!(iso14755buf & ISO_14755_STARTED))
532	{	636	{
533	iso14755buf |= ISO_14755_STARTED;	637	iso14755buf |= ISO_14755_STARTED;
534	# if ISO_14755	638	# if ISO_14755
535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	639	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
546	}	650	}
547	#endif	651	#endif
548		652
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	653	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	654	{
		655	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		656	unsigned int newlen = 1;
		657
		658	switch (translate_keypad (keysym, kp))
551	{	659	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	660	#ifndef NO_BACKSPACE_KEY
		661	case XK_BackSpace:
		662	if (priv_modes & PrivMode_HaveBackSpace)
		663	{
		664	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		665	^ !!ctrl) ? '\b' : '\177';
		666	kbuf[1] = '\0';
		667	}
		668	else
		669	strcpy (kbuf, rs[Rs_backspace_key]);
		670	break;
		671	#endif
		672	#ifndef NO_DELETE_KEY
		673	case XK_Delete:
		674	strcpy (kbuf, rs[Rs_delete_key]);
		675	break;
		676	#endif
		677	case XK_Tab:
		678	if (shft)
		679	strcpy (kbuf, "\033[Z");
		680	else
		681	{
		682	#ifdef CTRL_TAB_MAKES_META
		683	if (ctrl)
		684	meta = 1;
		685	#endif
		686	#ifdef MOD4_TAB_MAKES_META
		687	if (ev.state & Mod4Mask)
		688	meta = 1;
		689	#endif
553	newlen = 1;	690	newlen = 0;
554	switch (keysym)	691	}
		692	break;
		693
		694	case XK_Up: /* "\033[A" */
		695	case XK_Down: /* "\033[B" */
		696	case XK_Right: /* "\033[C" */
		697	case XK_Left: /* "\033[D" */
		698	strcpy (kbuf, "\033[Z");
		699	kbuf[2] = "DACB"[keysym - XK_Left];
		700	/* do Shift first */
		701	if (shft)
		702	kbuf[2] = "dacb"[keysym - XK_Left];
		703	else if (ctrl)
		704	{
		705	kbuf[1] = 'O';
		706	kbuf[2] = "dacb"[keysym - XK_Left];
		707	}
		708	else if (priv_modes & PrivMode_aplCUR)
		709	kbuf[1] = 'O';
		710	break;
		711
		712	case XK_KP_Enter:
		713	/* allow shift to override */
		714	if (kp)
		715	{
		716	strcpy (kbuf, "\033OM");
		717	break;
		718	}
		719
		720	/* FALLTHROUGH */
		721
		722	case XK_Return:
		723	if (priv_modes & PrivMode_LFNL)
		724	{
		725	kbuf[0] = '\015';
		726	kbuf[1] = '\012';
		727	kbuf[2] = '\0';
		728	}
		729	else
		730	{
		731	kbuf[0] = '\015';
		732	kbuf[1] = '\0';
		733	}
		734	break;
		735
		736	case XK_KP_F1: /* "\033OP" */
		737	case XK_KP_F2: /* "\033OQ" */
		738	case XK_KP_F3: /* "\033OR" */
		739	case XK_KP_F4: /* "\033OS" */
		740	strcpy (kbuf, "\033OP");
		741	kbuf[2] += (keysym - XK_KP_F1);
		742	break;
		743
		744	case XK_KP_Multiply: /* "\033Oj" : "*" */
		745	case XK_KP_Add: /* "\033Ok" : "+" */
		746	case XK_KP_Separator: /* "\033Ol" : "," */
		747	case XK_KP_Subtract: /* "\033Om" : "-" */
		748	case XK_KP_Decimal: /* "\033On" : "." */
		749	case XK_KP_Divide: /* "\033Oo" : "/" */
		750	case XK_KP_0: /* "\033Op" : "0" */
		751	case XK_KP_1: /* "\033Oq" : "1" */
		752	case XK_KP_2: /* "\033Or" : "2" */
		753	case XK_KP_3: /* "\033Os" : "3" */
		754	case XK_KP_4: /* "\033Ot" : "4" */
		755	case XK_KP_5: /* "\033Ou" : "5" */
		756	case XK_KP_6: /* "\033Ov" : "6" */
		757	case XK_KP_7: /* "\033Ow" : "7" */
		758	case XK_KP_8: /* "\033Ox" : "8" */
		759	case XK_KP_9: /* "\033Oy" : "9" */
		760	/* allow shift to override */
		761	if (kp)
		762	{
		763	strcpy (kbuf, "\033Oj");
		764	kbuf[2] += (keysym - XK_KP_Multiply);
		765	}
		766	else
		767	{
		768	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		769	kbuf[1] = '\0';
		770	}
		771	break;
		772
		773	default:
555	{	774	{
556	#ifndef NO_BACKSPACE_KEY	775	int param = map_function_key (keysym);
557	case XK_BackSpace:	776	if (param > 0)
558	if (priv_modes & PrivMode_HaveBackSpace)	777	sprintf (kbuf,"\033[%d~", param);
559	{
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';
563	}
564	else	778	else
565	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;
567	#endif
568	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Delete
570	case XK_KP_Delete:
571	/* allow shift to override */
572	if (kp)
573	{
574	strcpy (kbuf, "\033On");
575	break;
576	}
577	/* FALLTHROUGH */
578	# endif
579	case XK_Delete:
580	strcpy (kbuf, rs[Rs_delete_key]);
581	break;
582	#endif
583	case XK_Tab:
584	if (shft)
585	strcpy (kbuf, "\033[Z");
586	else
587	{
588	#ifdef CTRL_TAB_MAKES_META
589	if (ctrl)
590	meta = 1;
591	#endif
592	#ifdef MOD4_TAB_MAKES_META
593	if (ev.state & Mod4Mask)
594	meta = 1;
595	#endif
596	newlen = 0;
597	}
598	break;
599
600	#ifdef XK_KP_Left
601	case XK_KP_Up: /* \033Ox or standard */
602	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */
605	if (kp)
606	{
607	strcpy (kbuf, "\033OZ");
608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
609	break;
610	}
611	else
612	/* translate to std. cursor key */
613	keysym = XK_Left + (keysym - XK_KP_Left);
614	/* FALLTHROUGH */
615	#endif
616	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");
621	kbuf[2] = "DACB"[keysym - XK_Left];
622	/* do Shift first */
623	if (shft)
624	kbuf[2] = "dacb"[keysym - XK_Left];
625	else if (ctrl)
626	{
627	kbuf[1] = 'O';
628	kbuf[2] = "dacb"[keysym - XK_Left];
629	}
630	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';
632	break;
633
634	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:
637	/* allow shift to override */
638	if (kp)
639	{
640	strcpy (kbuf, "\033Oy");
641	break;
642	}
643	/* FALLTHROUGH */
644	# endif
645	case XK_Prior:
646	strcpy (kbuf, "\033[5~");
647	break;
648	# ifdef XK_KP_Next
649	case XK_KP_Next:
650	/* allow shift to override */
651	if (kp)
652	{
653	strcpy (kbuf, "\033Os");
654	break;
655	}
656	/* FALLTHROUGH */
657	# endif
658	case XK_Next:
659	strcpy (kbuf, "\033[6~");
660	break;
661	#endif
662	case XK_KP_Enter:
663	/* allow shift to override */
664	if (kp)
665	{
666	strcpy (kbuf, "\033OM");
667	break;
668	}
669
670	/* FALLTHROUGH */
671
672	case XK_Return:
673	if (priv_modes & PrivMode_LFNL)
674	{
675	kbuf[0] = '\015';
676	kbuf[1] = '\012';
677	kbuf[2] = '\0';
678	}
679	else
680	{
681	kbuf[0] = '\015';
682	kbuf[1] = '\0';
683	}
684	break;
685
686	#ifdef XK_KP_Begin
687	case XK_KP_Begin:
688	strcpy (kbuf, "\033Ou");
689	break;
690
691	#endif
692	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");
697	kbuf[2] += (keysym - XK_KP_F1);
698	break;
699
700	case XK_KP_Multiply: /* "\033Oj" : "*" */
701	case XK_KP_Add: /* "\033Ok" : "+" */
702	case XK_KP_Separator: /* "\033Ol" : "," */
703	case XK_KP_Subtract: /* "\033Om" : "-" */
704	case XK_KP_Decimal: /* "\033On" : "." */
705	case XK_KP_Divide: /* "\033Oo" : "/" */
706	case XK_KP_0: /* "\033Op" : "0" */
707	case XK_KP_1: /* "\033Oq" : "1" */
708	case XK_KP_2: /* "\033Or" : "2" */
709	case XK_KP_3: /* "\033Os" : "3" */
710	case XK_KP_4: /* "\033Ot" : "4" */
711	case XK_KP_5: /* "\033Ou" : "5" */
712	case XK_KP_6: /* "\033Ov" : "6" */
713	case XK_KP_7: /* "\033Ow" : "7" */
714	case XK_KP_8: /* "\033Ox" : "8" */
715	case XK_KP_9: /* "\033Oy" : "9" */
716	/* allow shift to override */
717	if (kp)
718	{
719	strcpy (kbuf, "\033Oj");
720	kbuf[2] += (keysym - XK_KP_Multiply);
721	}
722	else
723	{
724	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725	kbuf[1] = '\0';
726	}
727	break;
728
729	case XK_Find:
730	strcpy (kbuf, "\033[1~");
731	break;
732
733	#ifdef XK_KP_Insert
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if (kp)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:
744	strcpy (kbuf, "\033[2~");
745	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:
748	/* FALLTHROUGH */
749	#endif
750	case XK_Execute:
751	strcpy (kbuf, "\033[3~");
752	break;
753	case XK_Select:
754	strcpy (kbuf, "\033[4~");
755	break;
756	#ifdef XK_KP_End
757	case XK_KP_End:
758	/* allow shift to override */
759	if (kp)
760	{
761	strcpy (kbuf, "\033Oq");
762	break;
763	}
764	/* FALLTHROUGH */
765	#endif
766	case XK_End:
767	strcpy (kbuf, KS_END);
768	break;
769	#ifdef XK_KP_Home
770	case XK_KP_Home:
771	/* allow shift to override */
772	if (kp)
773	{
774	strcpy (kbuf, "\033Ow");
775	break;
776	}
777	/* FALLTHROUGH */
778	#endif
779	case XK_Home:
780	strcpy (kbuf, KS_HOME);
781	break;
782
783	#define FKEY(n, fkey) \
784	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786	case XK_F1: /* "\033[11~" */
787	case XK_F2: /* "\033[12~" */
788	case XK_F3: /* "\033[13~" */
789	case XK_F4: /* "\033[14~" */
790	case XK_F5: /* "\033[15~" */
791	FKEY (11, XK_F1);
792	break;
793	case XK_F6: /* "\033[17~" */
794	case XK_F7: /* "\033[18~" */
795	case XK_F8: /* "\033[19~" */
796	case XK_F9: /* "\033[20~" */
797	case XK_F10: /* "\033[21~" */
798	FKEY (17, XK_F6);
799	break;
800	case XK_F11: /* "\033[23~" */
801	case XK_F12: /* "\033[24~" */
802	case XK_F13: /* "\033[25~" */
803	case XK_F14: /* "\033[26~" */
804	FKEY (23, XK_F11);
805	break;
806	case XK_F15: /* "\033[28~" */
807	case XK_F16: /* "\033[29~" */
808	FKEY (28, XK_F15);
809	break;
810	case XK_Help: /* "\033[28~" */
811	FKEY (28, XK_Help);
812	break;
813	case XK_Menu: /* "\033[29~" */
814	FKEY (29, XK_Menu);
815	break;
816	case XK_F17: /* "\033[31~" */
817	case XK_F18: /* "\033[32~" */
818	case XK_F19: /* "\033[33~" */
819	case XK_F20: /* "\033[34~" */
820	case XK_F21: /* "\033[35~" */
821	case XK_F22: /* "\033[36~" */
822	case XK_F23: /* "\033[37~" */
823	case XK_F24: /* "\033[38~" */
824	case XK_F25: /* "\033[39~" */
825	case XK_F26: /* "\033[40~" */
826	case XK_F27: /* "\033[41~" */
827	case XK_F28: /* "\033[42~" */
828	case XK_F29: /* "\033[43~" */
829	case XK_F30: /* "\033[44~" */
830	case XK_F31: /* "\033[45~" */
831	case XK_F32: /* "\033[46~" */
832	case XK_F33: /* "\033[47~" */
833	case XK_F34: /* "\033[48~" */
834	case XK_F35: /* "\033[49~" */
835	FKEY (31, XK_F17);
836	break;
837	#undef FKEY
838	default:
839	newlen = 0;	779	newlen = 0;
840	break;
841	}	780	}
842		781	break;
843	if (newlen)
844	len = strlen (kbuf);
845	}	782	}
		783
		784	if (newlen)
		785	len = strlen (kbuf);
846		786
847	/*	787	/*
848	* Pass meta for all function keys, if 'meta' option set	788	* Pass meta for all function keys, if 'meta' option set
849	*/	789	*/
850	#ifdef META8_OPTION	790	#ifdef META8_OPTION
…		…
1034		974
1035	void	975	void
1036	rxvt_term::flush ()	976	rxvt_term::flush ()
1037	{	977	{
1038	flush_ev.stop ();	978	flush_ev.stop ();
1039		979
1040	#ifdef HAVE_BG_PIXMAP	980	#ifdef HAVE_BG_PIXMAP
1041	if (bgPixmap.check_clearChanged ())	981	if (bgPixmap.check_clearChanged ())
1042	{	982	{
1043	// scr_clear (true); This needs to be researched further!	983	// scr_clear (true); This needs to be researched further!
1044	scr_touch (false);	984	scr_touch (false);
1045	}	985	}
…		…
1084	}	1024	}
1085	while (row < end_row);	1025	while (row < end_row);
1086	}	1026	}
1087		1027
1088	scr_refresh ();	1028	scr_refresh ();
1089	scrollbar_show (1);	1029	scrollBar.show (1);
1090	#ifdef USE_XIM	1030	#ifdef USE_XIM
1091	IMSendSpot ();	1031	IMSendSpot ();
1092	#endif	1032	#endif
1093	}	1033	}
1094		1034
1095	display->flush ();	1035	display->flush ();
1096	}	1036	}
1097		1037
		1038	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1039	void
1099	rxvt_term::check_cb (check_watcher &w)	1040	rxvt_term::refresh_check ()
1100	{	1041	{
1101	make_current ();	1042	if (want_refresh && !flush_ev.is_active ())
		1043	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102		1044
1103	display->flush ();	1045	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107	}	1046	}
1108		1047
1109	void	1048	void
1110	rxvt_term::flush_cb (time_watcher &w)	1049	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1050	{
1112	make_current ();	1051	make_current ();
1113		1052
1114	refresh_count = 0;	1053	refresh_count = 0;
1115	flush ();	1054	flush ();
1116	}	1055	}
1117		1056
1118	#ifdef CURSOR_BLINK	1057	#ifdef CURSOR_BLINK
1119	void	1058	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1059	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1060	{
1122	hidden_cursor = !hidden_cursor;	1061	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1062	want_refresh = 1;
1124		1063	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1064	}
1127	#endif	1065	#endif
1128		1066
1129	#ifdef TEXT_BLINK	1067	#ifdef TEXT_BLINK
1130	void	1068	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1069	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1070	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1071	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1072	{
1135	hidden_text = !hidden_text;	1073	hidden_text = !hidden_text;
1136	want_refresh = 1;	1074	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1075	refresh_check ();
1138	}	1076	}
		1077	else
		1078	w.stop ();
1139	}	1079	}
1140	#endif	1080	#endif
1141		1081
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1082	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1083	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1084	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1085	{
1146	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1086	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1087	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148	{	1088	{
1149	want_refresh = 1;	1089	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1090	refresh_check ();
1151	}	1091	}
		1092	else
		1093	w.stop ();
1152	}	1094	}
1153	#endif	1095	#endif
1154		1096
1155	#ifdef SELECTION_SCROLLING	1097	#ifdef SELECTION_SCROLLING
1156	void	1098	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1099	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1100	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1101	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1102	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1103	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1104	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1105	refresh_check ();
1164	}	1106	}
		1107	else
		1108	w.stop ();
1165	}	1109	}
1166	#endif	1110	#endif
1167		1111
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1112	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1113	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1114	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1115	{
1172	if (mouse_slip_wheel_speed == 0	1116	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174	: scr_page (UP, mouse_slip_wheel_speed))
1175	{	1117	{
1176	if (view_start == top_row || view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1118	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1119	refresh_check ();
		1120	}
		1121
		1122	if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
		1123	{
		1124	mouse_slip_wheel_speed = 0;
		1125	w.stop ();
1181	}	1126	}
1182	}	1127	}
1183	#endif	1128	#endif
1184		1129
1185	#if LINUX_YIELD_HACK	1130	#if LINUX_YIELD_HACK
1186	static struct event_handler	1131	static struct event_handler
1187	{	1132	{
1188	check_watcher yield_ev;	1133	ev::prepare yield_ev;
1189		1134
1190	void yield_cb (check_watcher &w)	1135	void yield_cb (ev::prepare &w, int revents)
1191	{	1136	{
1192	// this should really be sched_yield(), but the linux guys thought	1137	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1138	// that giving a process calling sched_yield () less cpu time than
1194	// ones with high nice levels is a useful thing to do. It surely is is	1139	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1140	// allowed by the sus... as is returning ENOSYS.
		1141	// since the linux guys additionally thought that breaking the only
		1142	// known workaround against their unusable sched_yield hack is cool,
		1143	// we just nanosleep a bit and hope for the best.
1196		1144
1197	struct timespec ts = { 0, 0 };	1145	struct timespec ts = { 0, 1000 };
1198	nanosleep (&ts, 0);	1146	nanosleep (&ts, 0);
1199		1147
1200	w.stop ();	1148	w.stop ();
1201	}	1149	}
1202		1150
…		…
1246		1194
1247	return false;	1195	return false;
1248	}	1196	}
1249		1197
1250	void	1198	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1199	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1200	{
1253	make_current ();	1201	make_current ();
1254		1202
1255	if (revents & EVENT_READ)	1203	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1205	for (int i = CBUFCNT; i-- && pty_fill (); )
1258	if (cmd_parse ())	1206	cmd_parse ();
1259	break;
1260		1207
1261	if (revents & EVENT_WRITE)	1208	if (revents & ev::WRITE)
1262	pty_write ();	1209	pty_write ();
		1210
		1211	refresh_check ();
1263	}	1212	}
1264		1213
1265	void	1214	void
1266	rxvt_term::pointer_unblank ()	1215	rxvt_term::pointer_unblank ()
1267	{	1216	{
…		…
1270		1219
1271	#ifdef POINTER_BLANK	1220	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1221	hidden_pointer = 0;
1273		1222
1274	if (option (Opt_pointerBlank))	1223	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1224	pointer_ev.start (pointerBlankDelay);
1276	#endif	1225	#endif
1277	}	1226	}
1278		1227
1279	#ifdef POINTER_BLANK	1228	#ifdef POINTER_BLANK
1280	void	1229	void
…		…
1288		1237
1289	hidden_pointer = 1;	1238	hidden_pointer = 1;
1290	}	1239	}
1291		1240
1292	void	1241	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1242	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1243	{
1295	make_current ();	1244	make_current ();
1296		1245
1297	pointer_blank ();	1246	pointer_blank ();
1298	}	1247	}
…		…
1301	void	1250	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1251	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1252	{
1304	int button_number, key_state = 0;	1253	int button_number, key_state = 0;
1305	int x, y;	1254	int x, y;
		1255	int code = 32;
1306		1256
1307	x = ev.x;	1257	x = Pixel2Col (ev.x);
1308	y = ev.y;	1258	y = Pixel2Row (ev.y);
1309	pixel_position (&x, &y);	1259	if (ev.type == MotionNotify)
		1260	{
		1261	if (x == mouse_row && y == mouse_col)
		1262	return;
		1263	mouse_row = x;
		1264	mouse_col = y;
		1265	code += 32;
		1266	}
1310		1267
1311	if (MEvent.button == AnyButton)	1268	if (MEvent.button == AnyButton)
1312	button_number = 3;	1269	button_number = 3;
1313	else	1270	else
1314	{	1271	{
…		…
1360	x + 1,	1317	x + 1,
1361	y + 1);	1318	y + 1);
1362	#endif	1319	#endif
1363		1320
1364	tt_printf ("\033[M%c%c%c",	1321	tt_printf ("\033[M%c%c%c",
1365	(32 + button_number + key_state),	1322	(code + button_number + key_state),
1366	(32 + x + 1),	1323	(32 + x + 1),
1367	(32 + y + 1));	1324	(32 + y + 1));
1368	}	1325	}
1369		1326
1370	/*{{{ process an X event */	1327	/*{{{ process an X event */
…		…
1474	&& ev.xfocus.mode != NotifyGrab)	1431	&& ev.xfocus.mode != NotifyGrab)
1475	focus_out ();	1432	focus_out ();
1476	break;	1433	break;
1477		1434
1478	case ConfigureNotify:	1435	case ConfigureNotify:
1479	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1436	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1437	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481	szHint.width, szHint.height); */	1438	szHint.width, szHint.height);*/
1482	if (ev.xconfigure.window == parent[0])	1439	if (ev.xconfigure.window == parent[0])
1483	{	1440	{
1484	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1441	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485	;	1442	;
1486		1443
…		…
1491	}	1448	}
1492	else	1449	else
1493	{	1450	{
1494	#ifdef HAVE_BG_PIXMAP	1451	#ifdef HAVE_BG_PIXMAP
1495	if (bgPixmap.window_position_sensitive ())	1452	if (bgPixmap.window_position_sensitive ())
		1453	{
		1454	if (mapped)
1496	update_background ();	1455	update_background ();
		1456	else
		1457	bgPixmap.invalidate ();
		1458	}
1497	#endif	1459	#endif
1498	}	1460	}
		1461
1499	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1462	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500	}	1463	}
1501	break;	1464	break;
1502		1465
1503	case PropertyNotify:	1466	case PropertyNotify:
…		…
1507	selection_property (ev.xproperty.window, ev.xproperty.atom);	1470	selection_property (ev.xproperty.window, ev.xproperty.atom);
1508		1471
1509	break;	1472	break;
1510		1473
1511	case SelectionClear:	1474	case SelectionClear:
1512	selection_clear ();	1475	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1513	break;	1476	break;
1514		1477
1515	case SelectionNotify:	1478	case SelectionNotify:
1516	if (selection_wait == Sel_normal)	1479	if (selection_wait == Sel_normal)
1517	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1480	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1520	case SelectionRequest:	1483	case SelectionRequest:
1521	selection_send (ev.xselectionrequest);	1484	selection_send (ev.xselectionrequest);
1522	break;	1485	break;
1523		1486
1524	case MapNotify:	1487	case MapNotify:
		1488	#ifdef HAVE_BG_PIXMAP
		1489	/* This is needed spcifically to fix the case of no window manager or a
		1490	* non-reparenting window manager. In those cases we never get first
		1491	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1492	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1493	* reparenting.
		1494	* We should not render background immidiately, as there could be several
		1495	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1496	* by scheduling background redraw as soon as we can, but giving a short
		1497	* bit of time for ConfigureNotifies to arrive.
		1498	* We should render background PRIOR to drawing any text, but AFTER all
		1499	* of ConfigureNotifys for the best results.
		1500	*/
		1501	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1502	update_background_ev.start (0.025);
		1503	#endif
1525	mapped = 1;	1504	mapped = 1;
1526	#ifdef TEXT_BLINK	1505	#ifdef TEXT_BLINK
1527	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1506	text_blink_ev.start ();
1528	#endif	1507	#endif
1529	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1508	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530	break;	1509	break;
1531		1510
1532	case UnmapNotify:	1511	case UnmapNotify:
…		…
1553	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1532	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554	{	1533	{
1555	scr_expose (ev.xexpose.x, ev.xexpose.y,	1534	scr_expose (ev.xexpose.x, ev.xexpose.y,
1556	ev.xexpose.width, ev.xexpose.height, False);	1535	ev.xexpose.width, ev.xexpose.height, False);
1557	}	1536	}
		1537
1558	want_refresh = 1;	1538	want_refresh = 1;
1559	}	1539	}
1560	else	1540	else
1561	{	1541	{
1562	XEvent unused_event;	1542	XEvent unused_event;
…		…
1564	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1565	;	1545	;
1566	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1567	;	1547	;
1568		1548
1569	if (isScrollbarWindow (ev.xany.window))	1549	if (scrollBar.state && ev.xany.window == scrollBar.win)
1570	{	1550	{
1571	scrollBar.setIdle ();	1551	scrollBar.state = STATE_IDLE;
1572	scrollbar_show (0);	1552	scrollBar.show (0);
1573	}	1553	}
1574	}	1554	}
1575	break;	1555	break;
1576		1556
1577	case MotionNotify:	1557	case MotionNotify:
1578	#ifdef POINTER_BLANK	1558	#ifdef POINTER_BLANK
1579	if (hidden_pointer)	1559	if (hidden_pointer)
1580	pointer_unblank ();	1560	pointer_unblank ();
1581	#endif	1561	#endif
		1562	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
		1563	|| priv_modes & PrivMode_MouseAnyEvent)
		1564	mouse_report (ev.xbutton);
1582	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1565	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583	break;	1566	break;
1584		1567
1585	if (ev.xany.window == vt)	1568	if (ev.xany.window == vt)
1586	{	1569	{
…		…
1620	int dist;	1603	int dist;
1621		1604
1622	/* don't clobber the current delay if we are	1605	/* don't clobber the current delay if we are
1623	* already in the middle of scrolling.	1606	* already in the middle of scrolling.
1624	*/	1607	*/
1625	if (!sel_scroll_ev.active)	1608	if (!sel_scroll_ev.is_active ())
1626	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1609	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627		1610
1628	/* save the event params so we can highlight	1611	/* save the event params so we can highlight
1629	* the selection in the pending-scroll loop	1612	* the selection in the pending-scroll loop
1630	*/	1613	*/
1631	selection_save_x = ev.xbutton.x;	1614	selection_save_x = ev.xbutton.x;
…		…
1653	else	1636	else
1654	{	1637	{
1655	/* we are within the text window, so we	1638	/* we are within the text window, so we
1656	* shouldn't be scrolling	1639	* shouldn't be scrolling
1657	*/	1640	*/
1658	if (sel_scroll_ev.active)
1659	sel_scroll_ev.stop();	1641	sel_scroll_ev.stop();
1660	}	1642	}
1661	#endif	1643	#endif
1662	#ifdef MOUSE_THRESHOLD	1644	#ifdef MOUSE_THRESHOLD
1663	}	1645	}
1664	#endif	1646	#endif
1665	}	1647	}
1666	}	1648	}
1667	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1649	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1668	{	1650	{
1669	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1651	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670	MotionNotify, &ev))	1652	MotionNotify, &ev))
1671	;	1653	;
1672		1654
…		…
1674	&unused_root, &unused_child,	1656	&unused_root, &unused_child,
1675	&unused_root_x, &unused_root_y,	1657	&unused_root_x, &unused_root_y,
1676	&ev.xbutton.x, &ev.xbutton.y,	1658	&ev.xbutton.x, &ev.xbutton.y,
1677	&unused_mask);	1659	&unused_mask);
1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1660	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679	scrollbar_size ());	1661	scrollBar.size ());
1680	want_refresh = 1;	1662	want_refresh = 1;
1681	scrollbar_show (1);	1663	scrollBar.show (1);
1682	}	1664	}
1683	break;	1665	break;
1684	}	1666	}
1685		1667
1686	#if defined(CURSOR_BLINK)	1668	#if defined(CURSOR_BLINK)
…		…
1690	{	1672	{
1691	hidden_cursor = 0;	1673	hidden_cursor = 0;
1692	want_refresh = 1;	1674	want_refresh = 1;
1693	}	1675	}
1694		1676
1695	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1677	cursor_blink_ev.again ();
1696	}	1678	}
1697	#endif	1679	#endif
1698		1680
1699	#if defined(POINTER_BLANK)	1681	#if defined(POINTER_BLANK)
1700	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1682	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1707		1689
1708	if (ev.type == KeyPress && hidden_pointer == 0)	1690	if (ev.type == KeyPress && hidden_pointer == 0)
1709	pointer_blank ();	1691	pointer_blank ();
1710	}	1692	}
1711	#endif	1693	#endif
		1694
		1695	refresh_check ();
1712	}	1696	}
		1697
		1698	#if ENABLE_FRILLS
		1699	void
		1700	rxvt_term::set_urgency (bool enable)
		1701	{
		1702	if (enable == urgency_hint)
		1703	return;
		1704
		1705	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1706	{
		1707	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1708	XSetWMHints (dpy, parent[0], h);
		1709	urgency_hint = enable;
		1710	}
		1711	}
		1712	#endif
1713		1713
1714	void	1714	void
1715	rxvt_term::focus_in ()	1715	rxvt_term::focus_in ()
1716	{	1716	{
1717	if (!focus)	1717	if (!focus)
1718	{	1718	{
1719	focus = 1;	1719	focus = 1;
1720	want_refresh = 1;	1720	want_refresh = 1;
1721		1721
1722	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723
1724	#if USE_XIM	1722	#if USE_XIM
1725	if (Input_Context != NULL)	1723	if (Input_Context != NULL)
1726	{	1724	{
1727	IMSetPosition ();	1725	IMSetPosition ();
1728	XSetICFocus (Input_Context);	1726	XSetICFocus (Input_Context);
1729	}	1727	}
1730	#endif	1728	#endif
1731	#if CURSOR_BLINK	1729	#if CURSOR_BLINK
1732	if (option (Opt_cursorBlink))	1730	if (option (Opt_cursorBlink))
1733	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1731	cursor_blink_ev.again ();
1734	#endif	1732	#endif
1735	#if OFF_FOCUS_FADING	1733	#if OFF_FOCUS_FADING
1736	if (rs[Rs_fade])	1734	if (rs[Rs_fade])
1737	{	1735	{
1738	pix_colors = pix_colors_focused;	1736	pix_colors = pix_colors_focused;
1739	scr_recolour ();	1737	scr_recolour ();
1740	}	1738	}
1741	#endif	1739	#endif
1742	#if ENABLE_FRILLS	1740	#if ENABLE_FRILLS
1743	if (option (Opt_urgentOnBell))	1741	if (option (Opt_urgentOnBell))
1744	{	1742	set_urgency (0);
1745	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1746	{
1747	h->flags &= ~XUrgencyHint;
1748	XSetWMHints (dpy, parent[0], h);
1749	}
1750	}
1751	#endif	1743	#endif
		1744
		1745	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1752	}	1746	}
1753	}	1747	}
1754		1748
1755	void	1749	void
1756	rxvt_term::focus_out ()	1750	rxvt_term::focus_out ()
…		…
1758	if (focus)	1752	if (focus)
1759	{	1753	{
1760	focus = 0;	1754	focus = 0;
1761	want_refresh = 1;	1755	want_refresh = 1;
1762		1756
1763	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1757	#if ENABLE_FRILLS
1764		1758	if (option (Opt_urgentOnBell))
		1759	set_urgency (0);
		1760	#endif
1765	#if ENABLE_FRILLS || ISO_14755	1761	#if ENABLE_FRILLS || ISO_14755
1766	if (iso14755buf)	1762	if (iso14755buf)
1767	{	1763	{
1768	iso14755buf = 0;	1764	iso14755buf = 0;
1769	# if ISO_14755	1765	# if ISO_14755
…		…
1776	XUnsetICFocus (Input_Context);	1772	XUnsetICFocus (Input_Context);
1777	#endif	1773	#endif
1778	#if CURSOR_BLINK	1774	#if CURSOR_BLINK
1779	if (option (Opt_cursorBlink))	1775	if (option (Opt_cursorBlink))
1780	cursor_blink_ev.stop ();	1776	cursor_blink_ev.stop ();
		1777
1781	hidden_cursor = 0;	1778	hidden_cursor = 0;
1782	#endif	1779	#endif
1783	#if OFF_FOCUS_FADING	1780	#if OFF_FOCUS_FADING
1784	if (rs[Rs_fade])	1781	if (rs[Rs_fade])
1785	{	1782	{
1786	pix_colors = pix_colors_unfocused;	1783	pix_colors = pix_colors_unfocused;
1787	scr_recolour ();	1784	scr_recolour ();
1788	}	1785	}
1789	#endif	1786	#endif
		1787
		1788	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790	}	1789	}
1791	}	1790	}
1792		1791
1793	void	1792	void
1794	rxvt_term::update_fade_color (unsigned int idx)	1793	rxvt_term::update_fade_color (unsigned int idx)
…		…
1825	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1824	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1826	{	1825	{
1827	bgPixmap.set_root_pixmap ();	1826	bgPixmap.set_root_pixmap ();
1828	update_background ();	1827	update_background ();
1829	}	1828	}
		1829
1830	break;	1830	break;
1831	}	1831	}
1832	# endif	1832	# endif
		1833
		1834	refresh_check ();
1833	}	1835	}
1834	#endif	1836	#endif
1835		1837
1836	void	1838	void
1837	rxvt_term::button_press (XButtonEvent &ev)	1839	rxvt_term::button_press (XButtonEvent &ev)
…		…
1892	mouse_report (ev);	1894	mouse_report (ev);
1893	}	1895	}
1894	#else	1896	#else
1895	MEvent.button = ev.button;	1897	MEvent.button = ev.button;
1896	mouse_report (ev);	1898	mouse_report (ev);
1897	#endif /* MOUSE_REPORT_DOUBLECLICK */	1899	#endif /* MOUSE_REPORT_DOUBLECLICK */
1898		1900
1899	}	1901	}
1900	else	1902	else
1901	{	1903	{
1902	if (ev.button != MEvent.button)	1904	if (ev.button != MEvent.button)
…		…
1950	}	1952	}
1951		1953
1952	/*	1954	/*
1953	* Scrollbar window processing of button press	1955	* Scrollbar window processing of button press
1954	*/	1956	*/
1955	if (isScrollbarWindow (ev.window))	1957	if (scrollBar.state && ev.window == scrollBar.win)
1956	{	1958	{
1957	scrollBar.setIdle ();	1959	page_dirn direction = NO_DIR;
		1960
		1961	if (scrollBar.upButton (ev.y))
		1962	direction = UP; /* up */
		1963	else if (scrollBar.dnButton (ev.y))
		1964	direction = DN; /* down */
		1965
		1966	scrollBar.state = STATE_IDLE;
1958	/*	1967	/*
1959	* Rxvt-style scrollbar:	1968	* Rxvt-style scrollbar:
1960	* move up if mouse is above slider	1969	* move up if mouse is above slider
1961	* move dn if mouse is below slider	1970	* move dn if mouse is below slider
1962	*	1971	*
…		…
1971	/*	1980	/*
1972	* Mouse report disabled scrollbar:	1981	* Mouse report disabled scrollbar:
1973	* arrow buttons - send up/down	1982	* arrow buttons - send up/down
1974	* click on scrollbar - send pageup/down	1983	* click on scrollbar - send pageup/down
1975	*/	1984	*/
1976	if ((scrollBar.style == R_SB_NEXT	1985	if (direction == UP)
1977	&& scrollbarnext_upButton (ev.y))
1978	|| (scrollBar.style == R_SB_RXVT
1979	&& scrollbarrxvt_upButton (ev.y)))
1980	tt_printf ("\033[A");	1986	tt_printf ("\033[A");
1981	else if ((scrollBar.style == R_SB_NEXT	1987	else if (direction == DN)
1982	&& scrollbarnext_dnButton (ev.y))
1983	|| (scrollBar.style == R_SB_RXVT
1984	&& scrollbarrxvt_dnButton (ev.y)))
1985	tt_printf ("\033[B");	1988	tt_printf ("\033[B");
1986	else	1989	else
1987	switch (ev.button)	1990	switch (ev.button)
1988	{	1991	{
1989	case Button2:	1992	case Button2:
…		…
1996	tt_printf ("\033[5~");	1999	tt_printf ("\033[5~");
1997	break;	2000	break;
1998	}	2001	}
1999	}	2002	}
2000	else	2003	else
2001	#endif /* NO_SCROLLBAR_REPORT */	2004	#endif /* NO_SCROLLBAR_REPORT */
2002
2003	{
2004	char upordown = 0;
2005
2006	if (scrollBar.style == R_SB_NEXT)
2007	{	2005	{
2008	if (scrollbarnext_upButton (ev.y))	2006	if (direction != NO_DIR)
2009	upordown = -1; /* up */
2010	else if (scrollbarnext_dnButton (ev.y))
2011	upordown = 1; /* down */
2012	}
2013	else if (scrollBar.style == R_SB_RXVT)
2014	{
2015	if (scrollbarrxvt_upButton (ev.y))
2016	upordown = -1; /* up */
2017	else if (scrollbarrxvt_dnButton (ev.y))
2018	upordown = 1; /* down */
2019	}
2020	if (upordown)
2021	{	2007	{
2022	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2008	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		2009	if (!cont_scroll_ev.is_active ())
2023	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2010	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2024	#endif	2011	#endif
2025	if (scr_page (upordown < 0 ? UP : DN, 1))	2012	if (scr_page (direction, 1))
2026	{	2013	{
2027	if (upordown < 0)	2014	if (direction == UP)
2028	scrollBar.setUp ();	2015	scrollBar.state = STATE_UP;
2029	else	2016	else
2030	scrollBar.setDn ();	2017	scrollBar.state = STATE_DOWN;
2031	}	2018	}
2032	}	2019	}
2033	else	2020	else
2034	switch (ev.button)	2021	switch (ev.button)
2035	{	2022	{
2036	case Button2:	2023	case Button2:
2037	switch (scrollbar_align)	2024	switch (scrollBar.align)
2038	{	2025	{
2039	case R_SB_ALIGN_TOP:	2026	case R_SB_ALIGN_TOP:
2040	csrO = 0;	2027	csrO = 0;
2041	break;	2028	break;
2042	case R_SB_ALIGN_CENTRE:	2029	case R_SB_ALIGN_CENTRE:
…		…
2048	}	2035	}
2049		2036
2050	if (scrollBar.style == R_SB_XTERM	2037	if (scrollBar.style == R_SB_XTERM
2051	|| scrollbar_above_slider (ev.y)	2038	|| scrollbar_above_slider (ev.y)
2052	|| scrollbar_below_slider (ev.y))	2039	|| scrollbar_below_slider (ev.y))
2053	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2040	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2054		2041
2055	scrollBar.setMotion ();	2042	scrollBar.state = STATE_MOTION;
2056	break;	2043	break;
2057		2044
2058	case Button1:	2045	case Button1:
2059	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2046	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2060	csrO = ev.y - scrollBar.top;	2047	csrO = ev.y - scrollBar.top;
2061	/* FALLTHROUGH */	2048	/* FALLTHROUGH */
2062		2049
2063	case Button3:	2050	case Button3:
2064	if (scrollBar.style != R_SB_XTERM)	2051	if (scrollBar.style != R_SB_XTERM)
…		…
2074	scr_page (DN, nrow - 1);	2061	scr_page (DN, nrow - 1);
2075	# else	2062	# else
2076	scr_page (DN, nrow / 4);	2063	scr_page (DN, nrow / 4);
2077	# endif	2064	# endif
2078	else	2065	else
2079	scrollBar.setMotion ();	2066	scrollBar.state = STATE_MOTION;
2080	}	2067	}
2081	else	2068	else
2082	{	2069	{
2083	scr_page ((ev.button == Button1 ? DN : UP),	2070	scr_page ((ev.button == Button1 ? DN : UP),
2084	(nrow	2071	(nrow
2085	* scrollbar_position (ev.y)	2072	* scrollbar_position (ev.y)
2086	/ scrollbar_size ()));	2073	/ scrollBar.size ()));
2087	}	2074	}
2088		2075
2089	break;	2076	break;
2090	}	2077	}
2091	}	2078	}
…		…
2101		2088
2102	csrO = 0; /* reset csr Offset */	2089	csrO = 0; /* reset csr Offset */
2103	if (!bypass_keystate)	2090	if (!bypass_keystate)
2104	reportmode = !! (priv_modes & PrivMode_mouse_report);	2091	reportmode = !! (priv_modes & PrivMode_mouse_report);
2105		2092
2106	if (scrollbar_isUpDn ())	2093	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2107	{	2094	{
2108	scrollBar.setIdle ();	2095	scrollBar.state = STATE_IDLE;
2109	scrollbar_show (0);	2096	scrollBar.show (0);
2110	}	2097	}
2111		2098
2112	#ifdef SELECTION_SCROLLING	2099	#ifdef SELECTION_SCROLLING
2113	if (sel_scroll_ev.active)
2114	sel_scroll_ev.stop();	2100	sel_scroll_ev.stop();
2115	#endif	2101	#endif
2116		2102
2117	if (ev.window == vt)	2103	if (ev.window == vt)
2118	{	2104	{
2119	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2105	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2143	mouse_report (ev);	2129	mouse_report (ev);
2144	}	2130	}
2145	#else /* MOUSE_REPORT_DOUBLECLICK */	2131	#else /* MOUSE_REPORT_DOUBLECLICK */
2146	MEvent.button = AnyButton;	2132	MEvent.button = AnyButton;
2147	mouse_report (ev);	2133	mouse_report (ev);
2148	#endif /* MOUSE_REPORT_DOUBLECLICK */	2134	#endif /* MOUSE_REPORT_DOUBLECLICK */
2149	return;	2135	return;
2150	}	2136	}
2151		2137
2152	/*	2138	/*
2153	* dumb hack to compensate for the failure of click-and-drag	2139	* dumb hack to compensate for the failure of click-and-drag
…		…
2191	{	2177	{
2192	mouse_slip_wheel_speed += v ? -1 : 1;	2178	mouse_slip_wheel_speed += v ? -1 : 1;
2193	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2179	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2194	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2180	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2195		2181
2196	if (slip_wheel_ev.at < NOW)	2182	if (!slip_wheel_ev.is_active ())
2197	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2183	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2198
2199	slip_wheel_ev.start ();
2200	}	2184	}
2201	else	2185	else
		2186	# endif
2202	{	2187	{
2203	# endif
2204	scr_page (v, i);	2188	scr_page (v, i);
2205	scrollbar_show (1);	2189	scrollBar.show (1);
2206	# ifdef MOUSE_SLIP_WHEELING
2207	}	2190	}
2208	# endif
2209	}	2191	}
2210	break;	2192	break;
2211	#endif	2193	#endif
2212	}	2194	}
2213	}	2195	}
2214	}	2196	}
2215		2197
2216	/*}}} */	2198	/*}}} */
2217		2199
2218	bool	2200	void
2219	rxvt_term::cmd_parse ()	2201	rxvt_term::cmd_parse ()
2220	{	2202	{
2221	bool flag = false;
2222	wchar_t ch = NOCHAR;	2203	wchar_t ch = NOCHAR;
2223	char *seq_begin; // remember start of esc-sequence here	2204	char *seq_begin; // remember start of esc-sequence here
2224		2205
2225	for (;;)	2206	for (;;)
2226	{	2207	{
2227	if (ch == NOCHAR)	2208	if (expect_false (ch == NOCHAR))
2228	{	2209	{
2229	seq_begin = cmdbuf_ptr;	2210	seq_begin = cmdbuf_ptr;
2230	ch = next_char ();	2211	ch = next_char ();
2231		2212
2232	if (ch == NOCHAR)	2213	if (ch == NOCHAR)
2233	break;	2214	break;
2234	}	2215	}
2235		2216
2236	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2217	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237	{	2218	{
2238	if (!seen_input)	2219	if (expect_false (!seen_input))
2239	{	2220	{
2240	seen_input = 1;	2221	seen_input = 1;
2241	// many badly-written programs (e.g. jed) contain a race condition:	2222	// many badly-written programs (e.g. jed) contain a race condition:
2242	// they first read the screensize and then install a SIGWINCH handler.	2223	// they first read the screensize and then install a SIGWINCH handler.
2243	// some window managers resize the window early, and these programs	2224	// some window managers resize the window early, and these programs
…		…
2256	wchar_t *str = buf;	2237	wchar_t *str = buf;
2257	wchar_t *eol = str + min (ncol, UBUFSIZ);	2238	wchar_t *eol = str + min (ncol, UBUFSIZ);
2258		2239
2259	for (;;)	2240	for (;;)
2260	{	2241	{
2261	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2242	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262	break;	2243	break;
2263		2244
2264	*str++ = ch;	2245	*str++ = ch;
2265		2246
2266	if (ch == C0_LF || str >= eol)	2247	if (expect_false (ch == C0_LF || str >= eol))
2267	{	2248	{
2268	if (ch == C0_LF)	2249	if (ch == C0_LF)
2269	nlines++;	2250	nlines++;
2270		2251
2271	refresh_count++;	2252	refresh_count++;
2272		2253
2273	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)	2254	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2274	{	2255	{
2275	refresh_count = 0;	2256	refresh_count = 0;
2276		2257
2277	if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)	2258	if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278	{	2259	{
2279	refreshnow = true;	2260	refreshnow = true;
2280	ch = NOCHAR;	2261	ch = NOCHAR;
2281	break;	2262	break;
2282	}	2263	}
…		…
2320	* What the heck we'll cheat and only refresh less than every page-full.	2301	* What the heck we'll cheat and only refresh less than every page-full.
2321	* if skipScroll is enabled.	2302	* if skipScroll is enabled.
2322	*/	2303	*/
2323	if (refreshnow)	2304	if (refreshnow)
2324	{	2305	{
2325	flag = true;
2326	scr_refresh ();	2306	scr_refresh ();
2327	want_refresh = 1;	2307	want_refresh = 1;
2328	}	2308	}
2329
2330	}	2309	}
2331	else	2310	else
2332	{	2311	{
2333	try	2312	try
2334	{	2313	{
…		…
2342	}	2321	}
2343		2322
2344	ch = NOCHAR;	2323	ch = NOCHAR;
2345	}	2324	}
2346	}	2325	}
2347
2348	return flag;
2349	}	2326	}
2350		2327
2351	// read the next character	2328	// read the next character
2352	wchar_t	2329	wchar_t
2353	rxvt_term::next_char () NOTHROW	2330	rxvt_term::next_char () NOTHROW
2354	{	2331	{
2355	while (cmdbuf_ptr < cmdbuf_endp)	2332	while (cmdbuf_ptr < cmdbuf_endp)
2356	{	2333	{
2357	// assume 7-bit to be ascii ALWAYS	2334	// assume 7-bit to be ascii ALWAYS
2358	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2335	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2359	return *cmdbuf_ptr++;	2336	return *cmdbuf_ptr++;
2360		2337
2361	wchar_t wc;	2338	wchar_t wc;
2362	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2339	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2363		2340
…		…
2367	cmdbuf_ptr = cmdbuf_endp;	2344	cmdbuf_ptr = cmdbuf_endp;
2368	break;	2345	break;
2369	}	2346	}
2370		2347
2371	if (len == (size_t)-1)	2348	if (len == (size_t)-1)
		2349	{
		2350	mbstate.reset (); // reset now undefined conversion state
2372	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2351	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2352	}
2373		2353
2374	// assume wchar == unicode	2354	// assume wchar == unicode
2375	cmdbuf_ptr += len;	2355	cmdbuf_ptr += len;
2376	return wc & UNICODE_MASK;	2356	return wc & UNICODE_MASK;
2377	}	2357	}
…		…
2421	/*----------------------------------------------------------------------*/	2401	/*----------------------------------------------------------------------*/
2422	#ifdef PRINTPIPE	2402	#ifdef PRINTPIPE
2423	FILE *	2403	FILE *
2424	rxvt_term::popen_printer ()	2404	rxvt_term::popen_printer ()
2425	{	2405	{
2426	FILE *stream = popen (rs[Rs_print_pipe], "w");	2406	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2427		2407
2428	if (stream == NULL)	2408	if (stream == NULL)
2429	rxvt_warn ("can't open printer pipe, not printing.\n");	2409	rxvt_warn ("can't open printer pipe, not printing.\n");
2430		2410
2431	return stream;	2411	return stream;
…		…
2442	* simulate attached vt100 printer	2422	* simulate attached vt100 printer
2443	*/	2423	*/
2444	void	2424	void
2445	rxvt_term::process_print_pipe ()	2425	rxvt_term::process_print_pipe ()
2446	{	2426	{
2447	int done;	2427	FILE *fd = popen_printer ();
2448	FILE *fd;
2449		2428
2450	if ((fd = popen_printer ()) == NULL)	2429	if (!fd)
2451	return;	2430	return;
2452		2431
2453	/*	2432	/*
2454	* Send all input to the printer until either ESC[4i or ESC[?4i	2433	* Send all input to the printer until either ESC[4i or ESC[?4i
2455	* is received.	2434	* is received.
2456	*/	2435	*/
2457	for (done = 0; !done;)	2436	for (int done = 0; !done; )
2458	{	2437	{
2459	unsigned char buf[8];	2438	unsigned char buf[8];
2460	unicode_t ch;	2439	unicode_t ch;
2461	unsigned int i, len;	2440	unsigned int i, len;
2462		2441
…		…
2493	}	2472	}
2494	}	2473	}
2495		2474
2496	pclose_printer (fd);	2475	pclose_printer (fd);
2497	}	2476	}
2498	#endif /* PRINTPIPE */	2477	#endif /* PRINTPIPE */
2499	/*}}} */	2478	/*}}} */
2500		2479
2501	/* *INDENT-OFF* */	2480	/* *INDENT-OFF* */
2502	enum {	2481	enum {
2503	C1_40 = 0x40,	2482	C1_40 = 0x40,
…		…
2607	break;	2586	break;
2608	case 'Z': /* identify the terminal type */	2587	case 'Z': /* identify the terminal type */
2609	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2588	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610	break;	2589	break;
2611	case '<': /* turn off VT52 mode */	2590	case '<': /* turn off VT52 mode */
2612	PrivMode (0, PrivMode_vt52);	2591	set_privmode (PrivMode_vt52, 0);
2613	break;	2592	break;
2614	case 'F': /* use special graphics character set */	2593	case 'F': /* use special graphics character set */
2615	case 'G': /* use regular character set */	2594	case 'G': /* use regular character set */
2616	/* unimplemented */	2595	/* unimplemented */
2617	break;	2596	break;
…		…
2671	scr_forwardindex ();	2650	scr_forwardindex ();
2672	break;	2651	break;
2673	#endif	2652	#endif
2674	case '=':	2653	case '=':
2675	case '>':	2654	case '>':
2676	PrivMode ((ch == '='), PrivMode_aplKP);	2655	set_privmode (PrivMode_aplKP, ch == '=');
2677	break;	2656	break;
2678		2657
2679	case C1_40:	2658	case C1_40:
2680	cmd_getc ();	2659	cmd_getc ();
2681	break;	2660	break;
…		…
2720	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2699	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2721	case C1_SCI: /* ESC Z */	2700	case C1_SCI: /* ESC Z */
2722	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2701	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2723	break; /* steal obsolete ESC [ c */	2702	break; /* steal obsolete ESC [ c */
2724		2703
2725	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2704	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2726	case C1_CSI: /* ESC [ */	2705	case C1_CSI: /* ESC [ */
2727	process_csi_seq ();	2706	process_csi_seq ();
2728	break;	2707	break;
2729		2708
2730	/* 8.3.90: OPERATING SYSTEM COMMAND */	2709	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2731	case C1_OSC: /* ESC ] */	2710	case C1_OSC: /* ESC ] */
2732	process_osc_seq ();	2711	process_osc_seq ();
2733	break;	2712	break;
2734		2713
2735	/* 8.3.106: RESET TO INITIAL STATE */	2714	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2736	case 'c':	2715	case 'c':
2737	mbstate.reset ();	2716	mbstate.reset ();
2738	scr_poweron ();	2717	scr_poweron ();
2739	scrollbar_show (1);	2718	scrollBar.show (1);
2740	break;	2719	break;
2741		2720
2742	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2721	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2743	case 'n':	2722	case 'n':
2744	scr_charset_choose (2);	2723	scr_charset_choose (2);
…		…
2795		2774
2796	nargs = 0;	2775	nargs = 0;
2797		2776
2798	priv = 0;	2777	priv = 0;
2799	ch = cmd_getc ();	2778	ch = cmd_getc ();
2800	if (ch >= '<' && ch <= '?')	2779	if ((ch >= '<' && ch <= '?') || ch == '!')
		2780	{
2801	{ /* '<' '=' '>' '?' */	2781	/* '<' '=' '>' '?' '!' */
2802	priv = ch;	2782	priv = ch;
2803	ch = cmd_getc ();	2783	ch = cmd_getc ();
2804	}	2784	}
2805		2785
2806	/* read any numerical arguments */	2786	/* read any numerical arguments */
…		…
2849	{	2829	{
2850	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2830	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2831	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852	//	2832	//
2853	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2833	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2834	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2855	// that we do not support xterm mouse reporting (should be 95 when we do).	2835	// versions.
2856	//	2836	//
2857	tt_printf ("\033[>%d;94;0c", 'U');	2837	tt_printf ("\033[>%d;95;0c", 'U');
2858	}	2838	}
2859	break;	2839	break;
		2840
2860	case '?':	2841	case '?':
2861	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2842	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2862	process_terminal_mode (ch, priv, nargs, arg);	2843	process_terminal_mode (ch, priv, nargs, arg);
2863	break;	2844	break;
		2845
		2846	case '!':
		2847	if (ch == CSI_70)
		2848	{
		2849	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2850	scr_soft_reset ();
		2851
		2852	static const int pm_h[] = { 7, 25 };
		2853	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2854
		2855	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2856	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2864	}	2857	}
		2858	break;
		2859	}
		2860
2865	return;	2861	return;
2866	}	2862	}
2867		2863
2868	switch (ch)	2864	switch (ch)
2869	{	2865	{
…		…
3298		3294
3299	/*	3295	/*
3300	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3296	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3301	*/	3297	*/
3302	void	3298	void
3303	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3299	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3304	{	3300	{
3305	int color;	3301	int color;
3306	char *buf, *name;	3302	char *buf, *name;
3307	bool query = str[0] == '?' && !str[1];	3303	bool query = str[0] == '?' && !str[1];
3308	int saveop = op;	3304	int saveop = op;
…		…
3349		3345
3350	XFree (value);	3346	XFree (value);
3351	}	3347	}
3352	else	3348	else
3353	{	3349	{
3354	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3350	char *eq = strchr (str, '=');
3355		3351
3356	if (eq)	3352	if (eq)
3357	{	3353	{
3358	*eq = 0;	3354	*eq = 0;
3359	set_utf8_property (display->atom (str), eq + 1);	3355	set_utf8_property (display->atom (str), eq + 1);
…		…
3380	*buf++ = '\0';	3376	*buf++ = '\0';
3381		3377
3382	process_color_seq (op, color, name, resp);	3378	process_color_seq (op, color, name, resp);
3383	}	3379	}
3384	break;	3380	break;
		3381	case Rxvt_restoreFG:
3385	case XTerm_Color00:	3382	case XTerm_Color00:
3386	process_color_seq (op, Color_fg, str, resp);	3383	process_color_seq (op, Color_fg, str, resp);
3387	break;	3384	break;
		3385	case Rxvt_restoreBG:
3388	case XTerm_Color01:	3386	case XTerm_Color01:
3389	process_color_seq (op, Color_bg, str, resp);	3387	process_color_seq (op, Color_bg, str, resp);
3390	break;	3388	break;
3391	#ifndef NO_CURSORCOLOR	3389	#ifndef NO_CURSORCOLOR
3392	case XTerm_Color_cursor:	3390	case XTerm_Color_cursor:
…		…
3413	break;	3411	break;
3414	case URxvt_Color_IT:	3412	case URxvt_Color_IT:
3415	process_color_seq (op, Color_IT, str, resp);	3413	process_color_seq (op, Color_IT, str, resp);
3416	break;	3414	break;
3417	#endif	3415	#endif
		3416	case URxvt_Color_border:
		3417	process_color_seq (op, Color_border, str, resp);
		3418	break;
3418	#if ENABLE_TRANSPARENCY	3419	#if ENABLE_TRANSPARENCY
3419	case URxvt_Color_tint:	3420	case URxvt_Color_tint:
3420	process_color_seq (op, Color_tint, str, resp);	3421	process_color_seq (op, Color_tint, str, resp);
3421	{	3422	{
3422	bool changed = false;	3423	bool changed = false;
		3424
3423	if (ISSET_PIXCOLOR (Color_tint))	3425	if (ISSET_PIXCOLOR (Color_tint))
3424	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3426	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3425	else	3427	else
3426	changed = bgPixmap.unset_tint ();	3428	changed = bgPixmap.unset_tint ();
		3429
3427	if (changed)	3430	if (changed)
3428	update_background ();	3431	update_background ();
3429	}	3432	}
3430		3433
3431	break;	3434	break;
…		…
3435	case Rxvt_Pixmap:	3438	case Rxvt_Pixmap:
3436	if (!strcmp (str, "?"))	3439	if (!strcmp (str, "?"))
3437	{	3440	{
3438	char str[256];	3441	char str[256];
3439		3442
3440	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3443	sprintf (str, "[%dx%d+%d+%d]",
3441	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3444	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3442	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3445	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3443	process_xterm_seq (XTerm_title, str, CHAR_ST);	3446	process_xterm_seq (XTerm_title, str, CHAR_ST);
3444	}	3447	}
3445	else	3448	else
…		…
3454	changed++;	3457	changed++;
3455	str = strchr (str, ';');	3458	str = strchr (str, ';');
3456	if (str == NULL)	3459	if (str == NULL)
3457	bgPixmap.set_defaultGeometry ();	3460	bgPixmap.set_defaultGeometry ();
3458	}	3461	}
		3462
3459	while (str)	3463	while (str)
3460	{	3464	{
3461	str++;	3465	str++;
3462	if (bgPixmap.set_geometry (str))	3466	if (bgPixmap.set_geometry (str))
3463	changed++;	3467	changed++;
3464	str = strchr (str, ';');	3468	str = strchr (str, ';');
3465	}	3469	}
		3470
3466	if (changed)	3471	if (changed)
3467	update_background ();	3472	update_background ();
3468	}	3473	}
3469	break;	3474	break;
3470	#endif	3475	#endif
3471
3472	case Rxvt_restoreFG:
3473	set_window_color (Color_fg, str);
3474	break;
3475	case Rxvt_restoreBG:
3476	set_window_color (Color_bg, str);
3477	break;
3478		3476
3479	case XTerm_logfile:	3477	case XTerm_logfile:
3480	// TODO, when secure mode?	3478	// TODO, when secure mode?
3481	break;	3479	break;
3482		3480
…		…
3549	break;	3547	break;
3550	#endif	3548	#endif
3551		3549
3552	#if ENABLE_PERL	3550	#if ENABLE_PERL
3553	case URxvt_perl:	3551	case URxvt_perl:
3554	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3552	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3555	; // no responses yet
3556	break;	3553	break;
3557	#endif	3554	#endif
3558	}	3555	}
3559	}	3556	}
3560	/*----------------------------------------------------------------------*/	3557	/*----------------------------------------------------------------------*/
…		…
3583	{	3580	{
3584	if (mode == 'r')	3581	if (mode == 'r')
3585	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3582	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3586	else	3583	else
3587	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3584	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588	PrivMode (state, bit);	3585	set_privmode (bit, state);
3589	}	3586	}
3590		3587
3591	return state;	3588	return state;
3592	}	3589	}
3593		3590
…		…
3601	static const struct	3598	static const struct
3602	{	3599	{
3603	const int argval;	3600	const int argval;
3604	const unsigned long bit;	3601	const unsigned long bit;
3605	} argtopriv[] = {	3602	} argtopriv[] = {
3606	{ 1, PrivMode_aplCUR },	3603	{ 1, PrivMode_aplCUR }, // DECCKM
3607	{ 2, PrivMode_vt52 },	3604	{ 2, PrivMode_vt52 },
3608	{ 3, PrivMode_132 },	3605	{ 3, PrivMode_132 }, // DECCOLM
3609	{ 4, PrivMode_smoothScroll },	3606	{ 4, PrivMode_smoothScroll }, // DECSCLM
3610	{ 5, PrivMode_rVideo },	3607	{ 5, PrivMode_rVideo }, // DECSCNM
3611	{ 6, PrivMode_relOrigin },	3608	{ 6, PrivMode_relOrigin }, // DECOM
3612	{ 7, PrivMode_Autowrap },	3609	{ 7, PrivMode_Autowrap }, // DECAWM
3613	// 8, bi-directional support mode	3610	// 8, auto-repeat keys // DECARM
3614	{ 9, PrivMode_MouseX10 },	3611	{ 9, PrivMode_MouseX10 },
3615	// 18, 19 printing-related	3612	// 18 end FF to printer after print screen
		3613	// 19 Print screen prints full screen/scorll region
3616	{ 25, PrivMode_VisibleCursor },	3614	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3617	#ifdef scrollBar_esc	3615	#ifdef scrollBar_esc
3618	{ scrollBar_esc, PrivMode_scrollBar },	3616	{ scrollBar_esc, PrivMode_scrollBar },
3619	#endif	3617	#endif
3620	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3618	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3619	// 38, tektronix mode // DECTEK
3621	{ 40, PrivMode_132OK },	3620	{ 40, PrivMode_132OK },
3622	// 41 xterm more fixes NYI	3621	// 41 xterm more fixes NYI
3623	// 45 margin bell NYI	3622	// 45 margin bell NYI
3624	// 46 start logging	3623	// 46 start logging
3625	{ 47, PrivMode_Screen },	3624	{ 47, PrivMode_Screen },
3626	{ 66, PrivMode_aplKP },	3625	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3627	#ifndef NO_BACKSPACE_KEY	3626	#ifndef NO_BACKSPACE_KEY
3628	{ 67, PrivMode_BackSpace },	3627	{ 67, PrivMode_BackSpace }, // DECBKM
3629	#endif	3628	#endif
3630	{ 1000, PrivMode_MouseX11 },	3629	{ 1000, PrivMode_MouseX11 },
3631	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3630	{ 1002, PrivMode_MouseBtnEvent },
3632	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3631	{ 1003, PrivMode_MouseAnyEvent },
3633	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3634	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3632	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635	{ 1011, PrivMode_Keypress }, // rxvt extension	3633	{ 1011, PrivMode_Keypress }, // rxvt extension
3636	// 1035 enable modifiers for alt, numlock NYI	3634	// 1035 enable modifiers for alt, numlock NYI
3637	// 1036 send ESC for meta keys NYI	3635	// 1036 send ESC for meta keys NYI
3638	// 1037 send DEL for keypad delete NYI	3636	// 1037 send DEL for keypad delete NYI
3639	{ 1047, PrivMode_Screen },	3637	{ 1047, PrivMode_Screen },
3640	// 1048 save and restore cursor	3638	// 1048 save and restore cursor
3641	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3639	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3640	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3641	{ 2004, PrivMode_BracketPaste },
3643	};	3642	};
3644		3643
3645	if (nargs == 0)	3644	if (nargs == 0)
3646	return;	3645	return;
3647		3646
…		…
3672		3671
3673	scr_touch (true);	3672	scr_touch (true);
3674	break;	3673	break;
3675	#endif	3674	#endif
3676	case 1048: /* alternative cursor save */	3675	case 1048: /* alternative cursor save */
3677	case 1049:
3678	if (option (Opt_secondaryScreen))	3676	if (option (Opt_secondaryScreen))
3679	if (mode == 0)	3677	if (mode == 0)
3680	scr_cursor (RESTORE);	3678	scr_cursor (RESTORE);
3681	else if (mode == 1)	3679	else if (mode == 1)
3682	scr_cursor (SAVE);	3680	scr_cursor (SAVE);
…		…
3691	case 2: /* VT52 mode */	3689	case 2: /* VT52 mode */
3692	/* oddball mode. should be set regardless of set/reset	3690	/* oddball mode. should be set regardless of set/reset
3693	* parameter. Return from VT52 mode with an ESC < from	3691	* parameter. Return from VT52 mode with an ESC < from
3694	* within VT52 mode	3692	* within VT52 mode
3695	*/	3693	*/
3696	PrivMode (1, PrivMode_vt52);	3694	set_privmode (PrivMode_vt52, 1);
3697	break;	3695	break;
3698	case 3: /* 80/132 */	3696	case 3: /* 80/132 */
3699	if (priv_modes & PrivMode_132OK)	3697	if (priv_modes & PrivMode_132OK)
3700	set_widthheight (((state ? 132 : 80) * fwidth), height);	3698	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3701	break;	3699	break;
3702	case 4: /* smooth scrolling */	3700	case 4: /* smooth scrolling */
3703	set_option (Opt_jumpScroll, !state);	3701	set_option (Opt_jumpScroll, !state);
3704	break;	3702	break;
3705	case 5: /* reverse video */	3703	case 5: /* reverse video */
…		…
3712	scr_autowrap (state);	3710	scr_autowrap (state);
3713	break;	3711	break;
3714	/* case 8: - auto repeat, can't do on a per window basis */	3712	/* case 8: - auto repeat, can't do on a per window basis */
3715	case 9: /* X10 mouse reporting */	3713	case 9: /* X10 mouse reporting */
3716	if (state) /* orthogonal */	3714	if (state) /* orthogonal */
3717	priv_modes &= ~PrivMode_MouseX11;	3715	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718	break;	3716	break;
3719	#ifdef scrollBar_esc	3717	#ifdef scrollBar_esc
3720	case scrollBar_esc:	3718	case scrollBar_esc:
3721	if (scrollbar_mapping (state))	3719	if (scrollBar.map (state))
3722	{	3720	{
3723	resize_all_windows (0, 0, 0);	3721	resize_all_windows (0, 0, 0);
3724	scr_touch (true);	3722	scr_touch (true);
3725	}	3723	}
3726	break;	3724	break;
…		…
3735	break;	3733	break;
3736	/* case 66: - application key pad */	3734	/* case 66: - application key pad */
3737	/* case 67: - backspace key */	3735	/* case 67: - backspace key */
3738	case 1000: /* X11 mouse reporting */	3736	case 1000: /* X11 mouse reporting */
3739	if (state) /* orthogonal */	3737	if (state) /* orthogonal */
3740	priv_modes &= ~PrivMode_MouseX10;	3738	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741	break;	3739	break;
3742	#if 0
3743	case 1001:	3740	case 1002:
3744	break; /* X11 mouse highlighting */	3741	case 1003:
3745	#endif	3742	if (state)
		3743	{
		3744	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
		3745	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3746	vt_emask_mouse = PointerMotionMask;
		3747	}
		3748	else
		3749	vt_emask_mouse = NoEventMask;
		3750
		3751	vt_select_input ();
		3752	break;
3746	case 1010: /* scroll to bottom on TTY output inhibit */	3753	case 1010: /* scroll to bottom on TTY output inhibit */
3747	set_option (Opt_scrollTtyOutput, !state);	3754	set_option (Opt_scrollTtyOutput, !state);
3748	break;	3755	break;
3749	case 1011: /* scroll to bottom on key press */	3756	case 1011: /* scroll to bottom on key press */
3750	set_option (Opt_scrollTtyKeypress, state);	3757	set_option (Opt_scrollTtyKeypress, state);
3751	break;	3758	break;
3752	case 1047: /* secondary screen w/ clearing last */	3759	case 1047: /* secondary screen w/ clearing last */
3753	if (option (Opt_secondaryScreen))	3760	if (option (Opt_secondaryScreen))
3754	if (current_screen != PRIMARY)	3761	if (!state)
3755	scr_erase_screen (2);	3762	scr_erase_screen (2);
		3763
3756	scr_change_screen (state);	3764	scr_change_screen (state);
3757	break;	3765	break;
3758	case 1049: /* secondary screen w/ clearing first */	3766	case 1049: /* secondary screen w/ clearing first */
		3767	if (option (Opt_secondaryScreen))
		3768	if (state)
		3769	scr_cursor (SAVE);
		3770
3759	scr_change_screen (state);	3771	scr_change_screen (state);
		3772
3760	if (option (Opt_secondaryScreen))	3773	if (option (Opt_secondaryScreen))
3761	if (current_screen != PRIMARY)	3774	if (state)
3762	scr_erase_screen (2);	3775	scr_erase_screen (2);
		3776	else
		3777	scr_cursor (RESTORE);
3763	break;	3778	break;
3764	default:	3779	default:
3765	break;	3780	break;
3766	}	3781	}
3767	}	3782	}
…		…
3927	rxvt_term::process_graphics ()	3942	rxvt_term::process_graphics ()
3928	{	3943	{
3929	unicode_t ch, cmd = cmd_getc ();	3944	unicode_t ch, cmd = cmd_getc ();
3930		3945
3931	if (cmd == 'Q')	3946	if (cmd == 'Q')
		3947	{
3932	{ /* query graphics */	3948	/* query graphics */
3933	tt_printf ("\033G0\012"); /* no graphics */	3949	tt_printf ("\033G0\012"); /* no graphics */
3934	return;	3950	return;
3935	}	3951	}
3936	/* swallow other graphics sequences until terminating ':' */	3952	/* swallow other graphics sequences until terminating ':' */
3937	do	3953	do
…		…
3987	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4003	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3988		4004
3989	memcpy (v_buffer + v_buflen, data, len);	4005	memcpy (v_buffer + v_buflen, data, len);
3990	v_buflen += len;	4006	v_buflen += len;
3991		4007
3992	pty_ev.set (EVENT_READ | EVENT_WRITE);	4008	pty_ev.set (ev::READ | ev::WRITE);
3993	}	4009	}
3994		4010
3995	void rxvt_term::pty_write ()	4011	void rxvt_term::pty_write ()
3996	{	4012	{
3997	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4013	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4003	if (v_buflen == 0)	4019	if (v_buflen == 0)
4004	{	4020	{
4005	free (v_buffer);	4021	free (v_buffer);
4006	v_buffer = 0;	4022	v_buffer = 0;
4007		4023
4008	pty_ev.set (EVENT_READ);	4024	pty_ev.set (ev::READ);
4009	return;	4025	return;
4010	}	4026	}
4011		4027
4012	memmove (v_buffer, v_buffer + written, v_buflen);	4028	memmove (v_buffer, v_buffer + written, v_buflen);
4013	}	4029	}
4014	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4030	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4015	pty_ev.set (EVENT_READ);	4031	pty_ev.set (ev::READ);
4016	}	4032	}
4017		4033
4018	/*----------------------- end-of-file (C source) -----------------------*/	4034	/*----------------------- end-of-file (C source) -----------------------*/
4019		4035

Diff Legend

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