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.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 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.
…		…
198	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
199	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
200		201
201	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
202		203
203	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
204	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
205		206
206	if (y >= 0)	207	if (y >= 0)
207	{	208	{
208	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
220	ch = *chr++;	221	ch = *chr++;
221		222
222	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
223	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
224	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
225	# if !UNICODE3	226	# if !UNICODE_3
226	if (ch >= 0x10000)	227	if (ch >= 0x10000)
227	ch = 0xfffd;	228	ch = 0xfffd;
228	# endif	229	# endif
229	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
230		231
…		…
278	}	279	}
279		280
280	iso14755buf = 0;	281	iso14755buf = 0;
281	}	282	}
282		283
283	int	284	static int
284	rxvt_term::hex_keyval (XKeyEvent &ev)	285	hex_keyval (XKeyEvent &ev)
285	{	286	{
286	// check wether this event corresponds to a hex digit	287	// check wether this event corresponds to a hex digit
287	// if the modifiers had not been pressed.	288	// if the modifiers had not been pressed.
288	for (int index = 0; index < 8; index++)	289	for (int index = 0; index < 8; index++)
289	{	290	{
…		…
297		298
298	return -1;	299	return -1;
299	}	300	}
300	#endif	301	#endif
301		302
		303	static inline KeySym
		304	translate_keypad (KeySym keysym, bool kp)
		305	{
		306	#ifdef XK_KP_Home
		307	static const KeySym keypadtrans[] = {
		308	XK_KP_7, // XK_KP_Home
		309	XK_KP_4, // XK_KP_Left
		310	XK_KP_8, // XK_KP_Up
		311	XK_KP_6, // XK_KP_Right
		312	XK_KP_2, // XK_KP_Down
		313	# ifndef UNSHIFTED_SCROLLKEYS
		314	XK_KP_9, // XK_KP_Prior
		315	XK_KP_3, // XK_KP_Next
		316	# else
		317	XK_Prior,
		318	XK_Next,
		319	# endif
		320	XK_KP_1, // XK_KP_End
		321	XK_KP_5, // XK_KP_Begin
		322	};
		323
		324	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		325	{
		326	unsigned int index = keysym - XK_KP_Home;
		327	keysym = kp ? keypadtrans[index] : XK_Home + index;
		328	}
		329	else if (keysym == XK_KP_Insert)
		330	keysym = kp ? XK_KP_0 : XK_Insert;
		331	# ifndef NO_DELETE_KEY
		332	else if (keysym == XK_KP_Delete)
		333	keysym = kp ? XK_KP_Decimal : XK_Delete;
		334	# endif
		335	#endif
		336	return keysym;
		337	}
		338
		339	static inline int
		340	map_function_key (KeySym keysym)
		341	{
		342	int param = 0;
		343
		344	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		345	{
		346	param = 11 + keysym - XK_F1;
		347	if (keysym >= XK_F17)
		348	param += 4;
		349	else if (keysym >= XK_F15)
		350	param += 3;
		351	else if (keysym >= XK_F11)
		352	param += 2;
		353	else if (keysym >= XK_F6)
		354	param += 1;
		355	}
		356	else
		357	switch (keysym)
		358	{
		359	case XK_Find:
		360	param = 1;
		361	break;
		362	case XK_Insert:
		363	param = 2;
		364	break;
		365	#ifdef DXK_Remove
		366	case DXK_Remove:
		367	#endif
		368	case XK_Execute:
		369	param = 3;
		370	break;
		371	case XK_Select:
		372	param = 4;
		373	break;
		374	#ifndef UNSHIFTED_SCROLLKEYS
		375	case XK_Prior:
		376	param = 5;
		377	break;
		378	case XK_Next:
		379	param = 6;
		380	break;
		381	case XK_Home:
		382	param = 7;
		383	break;
		384	case XK_End:
		385	param = 8;
		386	break;
		387	#endif
		388	case XK_Help:
		389	param = 28;
		390	break;
		391	case XK_Menu:
		392	param = 29;
		393	break;
		394	}
		395	return param;
		396	}
		397
302	void	398	void
303	rxvt_term::key_press (XKeyEvent &ev)	399	rxvt_term::key_press (XKeyEvent &ev)
304	{	400	{
305	int ctrl, meta, shft, len;	401	int ctrl, meta, shft, len;
306	unsigned int newlen;
307	KeySym keysym;	402	KeySym keysym;
308	int valid_keysym;	403	int valid_keysym;
309	char kbuf[KBUFSZ];	404	char kbuf[KBUFSZ];
310		405
311	#if ISO_14755	406	#if ISO_14755
…		…
324	meta = ev.state & ModMetaMask;	419	meta = ev.state & ModMetaMask;
325		420
326	if (numlock_state || (ev.state & ModNumLockMask))	421	if (numlock_state || (ev.state & ModNumLockMask))
327	{	422	{
328	numlock_state = (ev.state & ModNumLockMask);	423	numlock_state = (ev.state & ModNumLockMask);
329	PrivMode ((!numlock_state), PrivMode_aplKP);	424	set_privmode (PrivMode_aplKP, !numlock_state);
330	}	425	}
331		426
332	kbuf[0] = 0;	427	kbuf[0] = 0;
333		428
334	#ifdef USE_XIM	429	#ifdef USE_XIM
…		…
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	switch (translate_keypad (keysym, kp))
551	{	653	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	654	#ifndef NO_BACKSPACE_KEY
		655	case XK_BackSpace:
		656	if (priv_modes & PrivMode_HaveBackSpace)
		657	{
		658	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		659	^ !!ctrl) ? '\b' : '\177';
		660	kbuf[1] = '\0';
		661	}
		662	else
		663	strcpy (kbuf, rs[Rs_backspace_key]);
		664	break;
		665	#endif
		666	#ifndef NO_DELETE_KEY
		667	case XK_Delete:
		668	strcpy (kbuf, rs[Rs_delete_key]);
		669	break;
		670	#endif
		671	case XK_Tab:
		672	if (shft)
		673	strcpy (kbuf, "\033[Z");
		674	else
		675	{
		676	#ifdef CTRL_TAB_MAKES_META
		677	if (ctrl)
		678	meta = 1;
		679	#endif
		680	#ifdef MOD4_TAB_MAKES_META
		681	if (ev.state & Mod4Mask)
		682	meta = 1;
		683	#endif
553	newlen = 1;	684	newlen = 0;
554	switch (keysym)	685	}
		686	break;
		687
		688	case XK_Up: /* "\033[A" */
		689	case XK_Down: /* "\033[B" */
		690	case XK_Right: /* "\033[C" */
		691	case XK_Left: /* "\033[D" */
		692	strcpy (kbuf, "\033[Z");
		693	kbuf[2] = "DACB"[keysym - XK_Left];
		694	/* do Shift first */
		695	if (shft)
		696	kbuf[2] = "dacb"[keysym - XK_Left];
		697	else if (ctrl)
		698	{
		699	kbuf[1] = 'O';
		700	kbuf[2] = "dacb"[keysym - XK_Left];
		701	}
		702	else if (priv_modes & PrivMode_aplCUR)
		703	kbuf[1] = 'O';
		704	break;
		705
		706	case XK_KP_Enter:
		707	/* allow shift to override */
		708	if (kp)
		709	{
		710	strcpy (kbuf, "\033OM");
		711	break;
		712	}
		713
		714	/* FALLTHROUGH */
		715
		716	case XK_Return:
		717	if (priv_modes & PrivMode_LFNL)
		718	{
		719	kbuf[0] = '\015';
		720	kbuf[1] = '\012';
		721	kbuf[2] = '\0';
		722	}
		723	else
		724	{
		725	kbuf[0] = '\015';
		726	kbuf[1] = '\0';
		727	}
		728	break;
		729
		730	case XK_KP_F1: /* "\033OP" */
		731	case XK_KP_F2: /* "\033OQ" */
		732	case XK_KP_F3: /* "\033OR" */
		733	case XK_KP_F4: /* "\033OS" */
		734	strcpy (kbuf, "\033OP");
		735	kbuf[2] += (keysym - XK_KP_F1);
		736	break;
		737
		738	case XK_KP_Multiply: /* "\033Oj" : "*" */
		739	case XK_KP_Add: /* "\033Ok" : "+" */
		740	case XK_KP_Separator: /* "\033Ol" : "," */
		741	case XK_KP_Subtract: /* "\033Om" : "-" */
		742	case XK_KP_Decimal: /* "\033On" : "." */
		743	case XK_KP_Divide: /* "\033Oo" : "/" */
		744	case XK_KP_0: /* "\033Op" : "0" */
		745	case XK_KP_1: /* "\033Oq" : "1" */
		746	case XK_KP_2: /* "\033Or" : "2" */
		747	case XK_KP_3: /* "\033Os" : "3" */
		748	case XK_KP_4: /* "\033Ot" : "4" */
		749	case XK_KP_5: /* "\033Ou" : "5" */
		750	case XK_KP_6: /* "\033Ov" : "6" */
		751	case XK_KP_7: /* "\033Ow" : "7" */
		752	case XK_KP_8: /* "\033Ox" : "8" */
		753	case XK_KP_9: /* "\033Oy" : "9" */
		754	/* allow shift to override */
		755	if (kp)
		756	{
		757	strcpy (kbuf, "\033Oj");
		758	kbuf[2] += (keysym - XK_KP_Multiply);
		759	}
		760	else
		761	{
		762	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		763	kbuf[1] = '\0';
		764	}
		765	break;
		766
		767	default:
555	{	768	{
556	#ifndef NO_BACKSPACE_KEY	769	int param = map_function_key (keysym);
557	case XK_BackSpace:	770	if (param > 0)
558	if (priv_modes & PrivMode_HaveBackSpace)	771	sprintf (kbuf,"\033[%d~", param);
559	{
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';
563	}
564	else	772	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;	773	newlen = 0;
840	break;
841	}	774	}
842		775	break;
843	if (newlen)
844	len = strlen (kbuf);
845	}	776	}
		777
		778	if (newlen)
		779	len = strlen (kbuf);
846		780
847	/*	781	/*
848	* Pass meta for all function keys, if 'meta' option set	782	* Pass meta for all function keys, if 'meta' option set
849	*/	783	*/
850	#ifdef META8_OPTION	784	#ifdef META8_OPTION
…		…
1034		968
1035	void	969	void
1036	rxvt_term::flush ()	970	rxvt_term::flush ()
1037	{	971	{
1038	flush_ev.stop ();	972	flush_ev.stop ();
1039		973
1040	#ifdef HAVE_BG_PIXMAP	974	#ifdef HAVE_BG_PIXMAP
1041	if (bgPixmap.check_clearChanged ())	975	if (bgPixmap.check_clearChanged ())
1042	{	976	{
1043	// scr_clear (true); This needs to be researched further!	977	// scr_clear (true); This needs to be researched further!
1044	scr_touch (false);	978	scr_touch (false);
1045	}	979	}
…		…
1084	}	1018	}
1085	while (row < end_row);	1019	while (row < end_row);
1086	}	1020	}
1087		1021
1088	scr_refresh ();	1022	scr_refresh ();
1089	scrollbar_show (1);	1023	scrollBar.show (1);
1090	#ifdef USE_XIM	1024	#ifdef USE_XIM
1091	IMSendSpot ();	1025	IMSendSpot ();
1092	#endif	1026	#endif
1093	}	1027	}
1094		1028
1095	display->flush ();	1029	display->flush ();
1096	}	1030	}
1097		1031
		1032	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1033	void
1099	rxvt_term::check_cb (check_watcher &w)	1034	rxvt_term::refresh_check ()
1100	{	1035	{
1101	make_current ();	1036	if (want_refresh && !flush_ev.is_active ())
		1037	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102		1038
1103	display->flush ();	1039	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107	}	1040	}
1108		1041
1109	void	1042	void
1110	rxvt_term::flush_cb (time_watcher &w)	1043	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1044	{
1112	make_current ();	1045	make_current ();
1113		1046
1114	refresh_count = 0;	1047	refresh_count = 0;
1115	flush ();	1048	flush ();
1116	}	1049	}
1117		1050
1118	#ifdef CURSOR_BLINK	1051	#ifdef CURSOR_BLINK
1119	void	1052	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1053	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1054	{
1122	hidden_cursor = !hidden_cursor;	1055	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1056	want_refresh = 1;
1124		1057	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1058	}
1127	#endif	1059	#endif
1128		1060
1129	#ifdef TEXT_BLINK	1061	#ifdef TEXT_BLINK
1130	void	1062	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1063	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1064	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1065	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1066	{
1135	hidden_text = !hidden_text;	1067	hidden_text = !hidden_text;
1136	want_refresh = 1;	1068	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1069	refresh_check ();
1138	}	1070	}
		1071	else
		1072	w.stop ();
1139	}	1073	}
1140	#endif	1074	#endif
1141		1075
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1076	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1077	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1078	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1079	{
1146	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1080	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1081	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148	{	1082	{
1149	want_refresh = 1;	1083	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1084	refresh_check ();
1151	}	1085	}
		1086	else
		1087	w.stop ();
1152	}	1088	}
1153	#endif	1089	#endif
1154		1090
1155	#ifdef SELECTION_SCROLLING	1091	#ifdef SELECTION_SCROLLING
1156	void	1092	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1093	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1094	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1095	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1096	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1097	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1098	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1099	refresh_check ();
1164	}	1100	}
		1101	else
		1102	w.stop ();
1165	}	1103	}
1166	#endif	1104	#endif
1167		1105
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1106	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1107	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1108	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1109	{
1172	if (mouse_slip_wheel_speed == 0	1110	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	{	1111	{
1176	if (view_start == top_row || view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1112	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1113	refresh_check ();
		1114	}
		1115
		1116	if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
		1117	{
		1118	mouse_slip_wheel_speed = 0;
		1119	w.stop ();
1181	}	1120	}
1182	}	1121	}
1183	#endif	1122	#endif
1184		1123
1185	#if LINUX_YIELD_HACK	1124	#if LINUX_YIELD_HACK
1186	static struct event_handler	1125	static struct event_handler
1187	{	1126	{
1188	check_watcher yield_ev;	1127	ev::prepare yield_ev;
1189		1128
1190	void yield_cb (check_watcher &w)	1129	void yield_cb (ev::prepare &w, int revents)
1191	{	1130	{
1192	// this should really be sched_yield(), but the linux guys thought	1131	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1132	// 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	1133	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1134	// allowed by the sus... as is returning ENOSYS.
		1135	// since the linux guys additionally thought that breaking the only
		1136	// known workaroudn against their unusable sched_yield hack is cool,
		1137	// we just nanosleep a bit and hope for the best.
1196		1138
1197	struct timespec ts = { 0, 0 };	1139	struct timespec ts = { 0, 1000 };
1198	nanosleep (&ts, 0);	1140	nanosleep (&ts, 0);
1199		1141
1200	w.stop ();	1142	w.stop ();
1201	}	1143	}
1202		1144
…		…
1246		1188
1247	return false;	1189	return false;
1248	}	1190	}
1249		1191
1250	void	1192	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1193	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1194	{
1253	make_current ();	1195	make_current ();
1254		1196
1255	if (revents & EVENT_READ)	1197	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1198	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1199	for (int i = CBUFCNT; i-- && pty_fill (); )
1258	if (cmd_parse ())	1200	cmd_parse ();
1259	break;
1260		1201
1261	if (revents & EVENT_WRITE)	1202	if (revents & ev::WRITE)
1262	pty_write ();	1203	pty_write ();
		1204
		1205	refresh_check ();
1263	}	1206	}
1264		1207
1265	void	1208	void
1266	rxvt_term::pointer_unblank ()	1209	rxvt_term::pointer_unblank ()
1267	{	1210	{
…		…
1270		1213
1271	#ifdef POINTER_BLANK	1214	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1215	hidden_pointer = 0;
1273		1216
1274	if (option (Opt_pointerBlank))	1217	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1218	pointer_ev.start (pointerBlankDelay);
1276	#endif	1219	#endif
1277	}	1220	}
1278		1221
1279	#ifdef POINTER_BLANK	1222	#ifdef POINTER_BLANK
1280	void	1223	void
…		…
1288		1231
1289	hidden_pointer = 1;	1232	hidden_pointer = 1;
1290	}	1233	}
1291		1234
1292	void	1235	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1236	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1237	{
1295	make_current ();	1238	make_current ();
1296		1239
1297	pointer_blank ();	1240	pointer_blank ();
1298	}	1241	}
…		…
1301	void	1244	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1245	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1246	{
1304	int button_number, key_state = 0;	1247	int button_number, key_state = 0;
1305	int x, y;	1248	int x, y;
		1249	int code = 32;
1306		1250
1307	x = Pixel2Col (ev.x);	1251	x = Pixel2Col (ev.x);
1308	y = Pixel2Row (ev.y);	1252	y = Pixel2Row (ev.y);
		1253	if (ev.type == MotionNotify)
		1254	{
		1255	if (x == mouse_row && y == mouse_col)
		1256	return;
		1257	mouse_row = x;
		1258	mouse_col = y;
		1259	code += 32;
		1260	}
1309		1261
1310	if (MEvent.button == AnyButton)	1262	if (MEvent.button == AnyButton)
1311	button_number = 3;	1263	button_number = 3;
1312	else	1264	else
1313	{	1265	{
…		…
1359	x + 1,	1311	x + 1,
1360	y + 1);	1312	y + 1);
1361	#endif	1313	#endif
1362		1314
1363	tt_printf ("\033[M%c%c%c",	1315	tt_printf ("\033[M%c%c%c",
1364	(32 + button_number + key_state),	1316	(code + button_number + key_state),
1365	(32 + x + 1),	1317	(32 + x + 1),
1366	(32 + y + 1));	1318	(32 + y + 1));
1367	}	1319	}
1368		1320
1369	/*{{{ process an X event */	1321	/*{{{ process an X event */
…		…
1473	&& ev.xfocus.mode != NotifyGrab)	1425	&& ev.xfocus.mode != NotifyGrab)
1474	focus_out ();	1426	focus_out ();
1475	break;	1427	break;
1476		1428
1477	case ConfigureNotify:	1429	case ConfigureNotify:
1478	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1430	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1431	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480	szHint.width, szHint.height); */	1432	szHint.width, szHint.height);*/
1481	if (ev.xconfigure.window == parent[0])	1433	if (ev.xconfigure.window == parent[0])
1482	{	1434	{
1483	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1435	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484	;	1436	;
1485		1437
…		…
1490	}	1442	}
1491	else	1443	else
1492	{	1444	{
1493	#ifdef HAVE_BG_PIXMAP	1445	#ifdef HAVE_BG_PIXMAP
1494	if (bgPixmap.window_position_sensitive ())	1446	if (bgPixmap.window_position_sensitive ())
		1447	{
		1448	if (mapped)
1495	update_background ();	1449	update_background ();
		1450	else
		1451	bgPixmap.invalidate ();
		1452	}
1496	#endif	1453	#endif
1497	}	1454	}
		1455
1498	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1456	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499	}	1457	}
1500	break;	1458	break;
1501		1459
1502	case PropertyNotify:	1460	case PropertyNotify:
…		…
1506	selection_property (ev.xproperty.window, ev.xproperty.atom);	1464	selection_property (ev.xproperty.window, ev.xproperty.atom);
1507		1465
1508	break;	1466	break;
1509		1467
1510	case SelectionClear:	1468	case SelectionClear:
1511	selection_clear ();	1469	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1512	break;	1470	break;
1513		1471
1514	case SelectionNotify:	1472	case SelectionNotify:
1515	if (selection_wait == Sel_normal)	1473	if (selection_wait == Sel_normal)
1516	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1474	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1519	case SelectionRequest:	1477	case SelectionRequest:
1520	selection_send (ev.xselectionrequest);	1478	selection_send (ev.xselectionrequest);
1521	break;	1479	break;
1522		1480
1523	case MapNotify:	1481	case MapNotify:
		1482	#ifdef HAVE_BG_PIXMAP
		1483	/* This is needed spcifically to fix the case of no window manager or a
		1484	* non-reparenting window manager. In those cases we never get first
		1485	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1486	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1487	* reparenting.
		1488	* We should not render background immidiately, as there could be several
		1489	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1490	* by scheduling background redraw as soon as we can, but giving a short
		1491	* bit of time for ConfigureNotifies to arrive.
		1492	* We should render background PRIOR to drawing any text, but AFTER all
		1493	* of ConfigureNotifys for the best results.
		1494	*/
		1495	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1496	update_background_ev.start (0.025);
		1497	#endif
1524	mapped = 1;	1498	mapped = 1;
1525	#ifdef TEXT_BLINK	1499	#ifdef TEXT_BLINK
1526	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1500	text_blink_ev.start ();
1527	#endif	1501	#endif
1528	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1502	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529	break;	1503	break;
1530		1504
1531	case UnmapNotify:	1505	case UnmapNotify:
…		…
1552	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1526	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553	{	1527	{
1554	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1555	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1556	}	1530	}
		1531
1557	want_refresh = 1;	1532	want_refresh = 1;
1558	}	1533	}
1559	else	1534	else
1560	{	1535	{
1561	XEvent unused_event;	1536	XEvent unused_event;
…		…
1563	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1538	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1564	;	1539	;
1565	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1540	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566	;	1541	;
1567		1542
1568	if (isScrollbarWindow (ev.xany.window))	1543	if (scrollBar.state && ev.xany.window == scrollBar.win)
1569	{	1544	{
1570	scrollBar.setIdle ();	1545	scrollBar.state = STATE_IDLE;
1571	scrollbar_show (0);	1546	scrollBar.show (0);
1572	}	1547	}
1573	}	1548	}
1574	break;	1549	break;
1575		1550
1576	case MotionNotify:	1551	case MotionNotify:
1577	#ifdef POINTER_BLANK	1552	#ifdef POINTER_BLANK
1578	if (hidden_pointer)	1553	if (hidden_pointer)
1579	pointer_unblank ();	1554	pointer_unblank ();
1580	#endif	1555	#endif
		1556	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
		1557	|| priv_modes & PrivMode_MouseAnyEvent)
		1558	mouse_report (ev.xbutton);
1581	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1559	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582	break;	1560	break;
1583		1561
1584	if (ev.xany.window == vt)	1562	if (ev.xany.window == vt)
1585	{	1563	{
…		…
1619	int dist;	1597	int dist;
1620		1598
1621	/* don't clobber the current delay if we are	1599	/* don't clobber the current delay if we are
1622	* already in the middle of scrolling.	1600	* already in the middle of scrolling.
1623	*/	1601	*/
1624	if (!sel_scroll_ev.active)	1602	if (!sel_scroll_ev.is_active ())
1625	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1603	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1626		1604
1627	/* save the event params so we can highlight	1605	/* save the event params so we can highlight
1628	* the selection in the pending-scroll loop	1606	* the selection in the pending-scroll loop
1629	*/	1607	*/
1630	selection_save_x = ev.xbutton.x;	1608	selection_save_x = ev.xbutton.x;
…		…
1652	else	1630	else
1653	{	1631	{
1654	/* we are within the text window, so we	1632	/* we are within the text window, so we
1655	* shouldn't be scrolling	1633	* shouldn't be scrolling
1656	*/	1634	*/
1657	if (sel_scroll_ev.active)
1658	sel_scroll_ev.stop();	1635	sel_scroll_ev.stop();
1659	}	1636	}
1660	#endif	1637	#endif
1661	#ifdef MOUSE_THRESHOLD	1638	#ifdef MOUSE_THRESHOLD
1662	}	1639	}
1663	#endif	1640	#endif
1664	}	1641	}
1665	}	1642	}
1666	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1643	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1667	{	1644	{
1668	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1645	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1669	MotionNotify, &ev))	1646	MotionNotify, &ev))
1670	;	1647	;
1671		1648
…		…
1673	&unused_root, &unused_child,	1650	&unused_root, &unused_child,
1674	&unused_root_x, &unused_root_y,	1651	&unused_root_x, &unused_root_y,
1675	&ev.xbutton.x, &ev.xbutton.y,	1652	&ev.xbutton.x, &ev.xbutton.y,
1676	&unused_mask);	1653	&unused_mask);
1677	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1654	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1678	scrollbar_size ());	1655	scrollBar.size ());
1679	want_refresh = 1;	1656	want_refresh = 1;
1680	scrollbar_show (1);	1657	scrollBar.show (1);
1681	}	1658	}
1682	break;	1659	break;
1683	}	1660	}
1684		1661
1685	#if defined(CURSOR_BLINK)	1662	#if defined(CURSOR_BLINK)
…		…
1689	{	1666	{
1690	hidden_cursor = 0;	1667	hidden_cursor = 0;
1691	want_refresh = 1;	1668	want_refresh = 1;
1692	}	1669	}
1693		1670
1694	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1671	cursor_blink_ev.again ();
1695	}	1672	}
1696	#endif	1673	#endif
1697		1674
1698	#if defined(POINTER_BLANK)	1675	#if defined(POINTER_BLANK)
1699	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1676	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1706		1683
1707	if (ev.type == KeyPress && hidden_pointer == 0)	1684	if (ev.type == KeyPress && hidden_pointer == 0)
1708	pointer_blank ();	1685	pointer_blank ();
1709	}	1686	}
1710	#endif	1687	#endif
		1688
		1689	refresh_check ();
1711	}	1690	}
		1691
		1692	#if ENABLE_FRILLS
		1693	void
		1694	rxvt_term::set_urgency (bool enable)
		1695	{
		1696	if (enable == urgency_hint)
		1697	return;
		1698
		1699	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1700	{
		1701	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1702	XSetWMHints (dpy, parent[0], h);
		1703	urgency_hint = enable;
		1704	}
		1705	}
		1706	#endif
1712		1707
1713	void	1708	void
1714	rxvt_term::focus_in ()	1709	rxvt_term::focus_in ()
1715	{	1710	{
1716	if (!focus)	1711	if (!focus)
1717	{	1712	{
1718	focus = 1;	1713	focus = 1;
1719	want_refresh = 1;	1714	want_refresh = 1;
1720		1715
1721	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723	#if USE_XIM	1716	#if USE_XIM
1724	if (Input_Context != NULL)	1717	if (Input_Context != NULL)
1725	{	1718	{
1726	IMSetPosition ();	1719	IMSetPosition ();
1727	XSetICFocus (Input_Context);	1720	XSetICFocus (Input_Context);
1728	}	1721	}
1729	#endif	1722	#endif
1730	#if CURSOR_BLINK	1723	#if CURSOR_BLINK
1731	if (option (Opt_cursorBlink))	1724	if (option (Opt_cursorBlink))
1732	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1725	cursor_blink_ev.again ();
1733	#endif	1726	#endif
1734	#if OFF_FOCUS_FADING	1727	#if OFF_FOCUS_FADING
1735	if (rs[Rs_fade])	1728	if (rs[Rs_fade])
1736	{	1729	{
1737	pix_colors = pix_colors_focused;	1730	pix_colors = pix_colors_focused;
1738	scr_recolour ();	1731	scr_recolour ();
1739	}	1732	}
1740	#endif	1733	#endif
1741	#if ENABLE_FRILLS	1734	#if ENABLE_FRILLS
1742	if (option (Opt_urgentOnBell))	1735	if (option (Opt_urgentOnBell))
1743	{	1736	set_urgency (0);
1744	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745	{
1746	h->flags &= ~XUrgencyHint;
1747	XSetWMHints (dpy, parent[0], h);
1748	}
1749	}
1750	#endif	1737	#endif
		1738
		1739	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1751	}	1740	}
1752	}	1741	}
1753		1742
1754	void	1743	void
1755	rxvt_term::focus_out ()	1744	rxvt_term::focus_out ()
…		…
1757	if (focus)	1746	if (focus)
1758	{	1747	{
1759	focus = 0;	1748	focus = 0;
1760	want_refresh = 1;	1749	want_refresh = 1;
1761		1750
1762	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1751	#if ENABLE_FRILLS
1763		1752	if (option (Opt_urgentOnBell))
		1753	set_urgency (0);
		1754	#endif
1764	#if ENABLE_FRILLS || ISO_14755	1755	#if ENABLE_FRILLS || ISO_14755
1765	if (iso14755buf)	1756	if (iso14755buf)
1766	{	1757	{
1767	iso14755buf = 0;	1758	iso14755buf = 0;
1768	# if ISO_14755	1759	# if ISO_14755
…		…
1775	XUnsetICFocus (Input_Context);	1766	XUnsetICFocus (Input_Context);
1776	#endif	1767	#endif
1777	#if CURSOR_BLINK	1768	#if CURSOR_BLINK
1778	if (option (Opt_cursorBlink))	1769	if (option (Opt_cursorBlink))
1779	cursor_blink_ev.stop ();	1770	cursor_blink_ev.stop ();
		1771
1780	hidden_cursor = 0;	1772	hidden_cursor = 0;
1781	#endif	1773	#endif
1782	#if OFF_FOCUS_FADING	1774	#if OFF_FOCUS_FADING
1783	if (rs[Rs_fade])	1775	if (rs[Rs_fade])
1784	{	1776	{
1785	pix_colors = pix_colors_unfocused;	1777	pix_colors = pix_colors_unfocused;
1786	scr_recolour ();	1778	scr_recolour ();
1787	}	1779	}
1788	#endif	1780	#endif
		1781
		1782	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789	}	1783	}
1790	}	1784	}
1791		1785
1792	void	1786	void
1793	rxvt_term::update_fade_color (unsigned int idx)	1787	rxvt_term::update_fade_color (unsigned int idx)
…		…
1824	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1818	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825	{	1819	{
1826	bgPixmap.set_root_pixmap ();	1820	bgPixmap.set_root_pixmap ();
1827	update_background ();	1821	update_background ();
1828	}	1822	}
		1823
1829	break;	1824	break;
1830	}	1825	}
1831	# endif	1826	# endif
		1827
		1828	refresh_check ();
1832	}	1829	}
1833	#endif	1830	#endif
1834		1831
1835	void	1832	void
1836	rxvt_term::button_press (XButtonEvent &ev)	1833	rxvt_term::button_press (XButtonEvent &ev)
…		…
1891	mouse_report (ev);	1888	mouse_report (ev);
1892	}	1889	}
1893	#else	1890	#else
1894	MEvent.button = ev.button;	1891	MEvent.button = ev.button;
1895	mouse_report (ev);	1892	mouse_report (ev);
1896	#endif /* MOUSE_REPORT_DOUBLECLICK */	1893	#endif /* MOUSE_REPORT_DOUBLECLICK */
1897		1894
1898	}	1895	}
1899	else	1896	else
1900	{	1897	{
1901	if (ev.button != MEvent.button)	1898	if (ev.button != MEvent.button)
…		…
1949	}	1946	}
1950		1947
1951	/*	1948	/*
1952	* Scrollbar window processing of button press	1949	* Scrollbar window processing of button press
1953	*/	1950	*/
1954	if (isScrollbarWindow (ev.window))	1951	if (scrollBar.state && ev.window == scrollBar.win)
1955	{	1952	{
1956	scrollBar.setIdle ();	1953	page_dirn direction = NO_DIR;
		1954
		1955	if (scrollBar.upButton (ev.y))
		1956	direction = UP; /* up */
		1957	else if (scrollBar.dnButton (ev.y))
		1958	direction = DN; /* down */
		1959
		1960	scrollBar.state = STATE_IDLE;
1957	/*	1961	/*
1958	* Rxvt-style scrollbar:	1962	* Rxvt-style scrollbar:
1959	* move up if mouse is above slider	1963	* move up if mouse is above slider
1960	* move dn if mouse is below slider	1964	* move dn if mouse is below slider
1961	*	1965	*
…		…
1970	/*	1974	/*
1971	* Mouse report disabled scrollbar:	1975	* Mouse report disabled scrollbar:
1972	* arrow buttons - send up/down	1976	* arrow buttons - send up/down
1973	* click on scrollbar - send pageup/down	1977	* click on scrollbar - send pageup/down
1974	*/	1978	*/
1975	if ((scrollBar.style == R_SB_NEXT	1979	if (direction == UP)
1976	&& scrollbarnext_upButton (ev.y))
1977	|| (scrollBar.style == R_SB_RXVT
1978	&& scrollbarrxvt_upButton (ev.y)))
1979	tt_printf ("\033[A");	1980	tt_printf ("\033[A");
1980	else if ((scrollBar.style == R_SB_NEXT	1981	else if (direction == DN)
1981	&& scrollbarnext_dnButton (ev.y))
1982	|| (scrollBar.style == R_SB_RXVT
1983	&& scrollbarrxvt_dnButton (ev.y)))
1984	tt_printf ("\033[B");	1982	tt_printf ("\033[B");
1985	else	1983	else
1986	switch (ev.button)	1984	switch (ev.button)
1987	{	1985	{
1988	case Button2:	1986	case Button2:
…		…
1995	tt_printf ("\033[5~");	1993	tt_printf ("\033[5~");
1996	break;	1994	break;
1997	}	1995	}
1998	}	1996	}
1999	else	1997	else
2000	#endif /* NO_SCROLLBAR_REPORT */	1998	#endif /* NO_SCROLLBAR_REPORT */
2001
2002	{
2003	char upordown = 0;
2004
2005	if (scrollBar.style == R_SB_NEXT)
2006	{	1999	{
2007	if (scrollbarnext_upButton (ev.y))	2000	if (direction != NO_DIR)
2008	upordown = -1; /* up */
2009	else if (scrollbarnext_dnButton (ev.y))
2010	upordown = 1; /* down */
2011	}
2012	else if (scrollBar.style == R_SB_RXVT)
2013	{
2014	if (scrollbarrxvt_upButton (ev.y))
2015	upordown = -1; /* up */
2016	else if (scrollbarrxvt_dnButton (ev.y))
2017	upordown = 1; /* down */
2018	}
2019	if (upordown)
2020	{	2001	{
2021	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2002	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		2003	if (!cont_scroll_ev.is_active ())
2022	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2004	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2023	#endif	2005	#endif
2024	if (scr_page (upordown < 0 ? UP : DN, 1))	2006	if (scr_page (direction, 1))
2025	{	2007	{
2026	if (upordown < 0)	2008	if (direction == UP)
2027	scrollBar.setUp ();	2009	scrollBar.state = STATE_UP;
2028	else	2010	else
2029	scrollBar.setDn ();	2011	scrollBar.state = STATE_DOWN;
2030	}	2012	}
2031	}	2013	}
2032	else	2014	else
2033	switch (ev.button)	2015	switch (ev.button)
2034	{	2016	{
2035	case Button2:	2017	case Button2:
2036	switch (scrollbar_align)	2018	switch (scrollBar.align)
2037	{	2019	{
2038	case R_SB_ALIGN_TOP:	2020	case R_SB_ALIGN_TOP:
2039	csrO = 0;	2021	csrO = 0;
2040	break;	2022	break;
2041	case R_SB_ALIGN_CENTRE:	2023	case R_SB_ALIGN_CENTRE:
…		…
2047	}	2029	}
2048		2030
2049	if (scrollBar.style == R_SB_XTERM	2031	if (scrollBar.style == R_SB_XTERM
2050	|| scrollbar_above_slider (ev.y)	2032	|| scrollbar_above_slider (ev.y)
2051	|| scrollbar_below_slider (ev.y))	2033	|| scrollbar_below_slider (ev.y))
2052	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2034	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2053		2035
2054	scrollBar.setMotion ();	2036	scrollBar.state = STATE_MOTION;
2055	break;	2037	break;
2056		2038
2057	case Button1:	2039	case Button1:
2058	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2040	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2059	csrO = ev.y - scrollBar.top;	2041	csrO = ev.y - scrollBar.top;
2060	/* FALLTHROUGH */	2042	/* FALLTHROUGH */
2061		2043
2062	case Button3:	2044	case Button3:
2063	if (scrollBar.style != R_SB_XTERM)	2045	if (scrollBar.style != R_SB_XTERM)
…		…
2073	scr_page (DN, nrow - 1);	2055	scr_page (DN, nrow - 1);
2074	# else	2056	# else
2075	scr_page (DN, nrow / 4);	2057	scr_page (DN, nrow / 4);
2076	# endif	2058	# endif
2077	else	2059	else
2078	scrollBar.setMotion ();	2060	scrollBar.state = STATE_MOTION;
2079	}	2061	}
2080	else	2062	else
2081	{	2063	{
2082	scr_page ((ev.button == Button1 ? DN : UP),	2064	scr_page ((ev.button == Button1 ? DN : UP),
2083	(nrow	2065	(nrow
2084	* scrollbar_position (ev.y)	2066	* scrollbar_position (ev.y)
2085	/ scrollbar_size ()));	2067	/ scrollBar.size ()));
2086	}	2068	}
2087		2069
2088	break;	2070	break;
2089	}	2071	}
2090	}	2072	}
…		…
2100		2082
2101	csrO = 0; /* reset csr Offset */	2083	csrO = 0; /* reset csr Offset */
2102	if (!bypass_keystate)	2084	if (!bypass_keystate)
2103	reportmode = !! (priv_modes & PrivMode_mouse_report);	2085	reportmode = !! (priv_modes & PrivMode_mouse_report);
2104		2086
2105	if (scrollbar_isUpDn ())	2087	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2106	{	2088	{
2107	scrollBar.setIdle ();	2089	scrollBar.state = STATE_IDLE;
2108	scrollbar_show (0);	2090	scrollBar.show (0);
2109	}	2091	}
2110		2092
2111	#ifdef SELECTION_SCROLLING	2093	#ifdef SELECTION_SCROLLING
2112	if (sel_scroll_ev.active)
2113	sel_scroll_ev.stop();	2094	sel_scroll_ev.stop();
2114	#endif	2095	#endif
2115		2096
2116	if (ev.window == vt)	2097	if (ev.window == vt)
2117	{	2098	{
2118	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2099	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2142	mouse_report (ev);	2123	mouse_report (ev);
2143	}	2124	}
2144	#else /* MOUSE_REPORT_DOUBLECLICK */	2125	#else /* MOUSE_REPORT_DOUBLECLICK */
2145	MEvent.button = AnyButton;	2126	MEvent.button = AnyButton;
2146	mouse_report (ev);	2127	mouse_report (ev);
2147	#endif /* MOUSE_REPORT_DOUBLECLICK */	2128	#endif /* MOUSE_REPORT_DOUBLECLICK */
2148	return;	2129	return;
2149	}	2130	}
2150		2131
2151	/*	2132	/*
2152	* dumb hack to compensate for the failure of click-and-drag	2133	* dumb hack to compensate for the failure of click-and-drag
…		…
2190	{	2171	{
2191	mouse_slip_wheel_speed += v ? -1 : 1;	2172	mouse_slip_wheel_speed += v ? -1 : 1;
2192	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2173	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2193	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2174	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194		2175
2195	if (slip_wheel_ev.at < NOW)	2176	if (!slip_wheel_ev.is_active ())
2196	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2177	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197
2198	slip_wheel_ev.start ();
2199	}	2178	}
2200	else	2179	else
		2180	# endif
2201	{	2181	{
2202	# endif
2203	scr_page (v, i);	2182	scr_page (v, i);
2204	scrollbar_show (1);	2183	scrollBar.show (1);
2205	# ifdef MOUSE_SLIP_WHEELING
2206	}	2184	}
2207	# endif
2208	}	2185	}
2209	break;	2186	break;
2210	#endif	2187	#endif
2211	}	2188	}
2212	}	2189	}
2213	}	2190	}
2214		2191
2215	/*}}} */	2192	/*}}} */
2216		2193
2217	bool	2194	void
2218	rxvt_term::cmd_parse ()	2195	rxvt_term::cmd_parse ()
2219	{	2196	{
2220	bool flag = false;
2221	wchar_t ch = NOCHAR;	2197	wchar_t ch = NOCHAR;
2222	char *seq_begin; // remember start of esc-sequence here	2198	char *seq_begin; // remember start of esc-sequence here
2223		2199
2224	for (;;)	2200	for (;;)
2225	{	2201	{
2226	if (ch == NOCHAR)	2202	if (expect_false (ch == NOCHAR))
2227	{	2203	{
2228	seq_begin = cmdbuf_ptr;	2204	seq_begin = cmdbuf_ptr;
2229	ch = next_char ();	2205	ch = next_char ();
2230		2206
2231	if (ch == NOCHAR)	2207	if (ch == NOCHAR)
2232	break;	2208	break;
2233	}	2209	}
2234		2210
2235	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2211	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2236	{	2212	{
2237	if (!seen_input)	2213	if (expect_false (!seen_input))
2238	{	2214	{
2239	seen_input = 1;	2215	seen_input = 1;
2240	// many badly-written programs (e.g. jed) contain a race condition:	2216	// many badly-written programs (e.g. jed) contain a race condition:
2241	// they first read the screensize and then install a SIGWINCH handler.	2217	// they first read the screensize and then install a SIGWINCH handler.
2242	// some window managers resize the window early, and these programs	2218	// some window managers resize the window early, and these programs
…		…
2255	wchar_t *str = buf;	2231	wchar_t *str = buf;
2256	wchar_t *eol = str + min (ncol, UBUFSIZ);	2232	wchar_t *eol = str + min (ncol, UBUFSIZ);
2257		2233
2258	for (;;)	2234	for (;;)
2259	{	2235	{
2260	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2236	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2261	break;	2237	break;
2262		2238
2263	*str++ = ch;	2239	*str++ = ch;
2264		2240
2265	if (ch == C0_LF || str >= eol)	2241	if (expect_false (ch == C0_LF || str >= eol))
2266	{	2242	{
2267	if (ch == C0_LF)	2243	if (ch == C0_LF)
2268	nlines++;	2244	nlines++;
2269		2245
2270	refresh_count++;	2246	refresh_count++;
2271		2247
2272	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)	2248	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2273	{	2249	{
2274	refresh_count = 0;	2250	refresh_count = 0;
2275		2251
2276	if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)	2252	if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2277	{	2253	{
2278	refreshnow = true;	2254	refreshnow = true;
2279	ch = NOCHAR;	2255	ch = NOCHAR;
2280	break;	2256	break;
2281	}	2257	}
…		…
2319	* What the heck we'll cheat and only refresh less than every page-full.	2295	* What the heck we'll cheat and only refresh less than every page-full.
2320	* if skipScroll is enabled.	2296	* if skipScroll is enabled.
2321	*/	2297	*/
2322	if (refreshnow)	2298	if (refreshnow)
2323	{	2299	{
2324	flag = true;
2325	scr_refresh ();	2300	scr_refresh ();
2326	want_refresh = 1;	2301	want_refresh = 1;
2327	}	2302	}
2328
2329	}	2303	}
2330	else	2304	else
2331	{	2305	{
2332	try	2306	try
2333	{	2307	{
…		…
2341	}	2315	}
2342		2316
2343	ch = NOCHAR;	2317	ch = NOCHAR;
2344	}	2318	}
2345	}	2319	}
2346
2347	return flag;
2348	}	2320	}
2349		2321
2350	// read the next character	2322	// read the next character
2351	wchar_t	2323	wchar_t
2352	rxvt_term::next_char () NOTHROW	2324	rxvt_term::next_char () NOTHROW
2353	{	2325	{
2354	while (cmdbuf_ptr < cmdbuf_endp)	2326	while (cmdbuf_ptr < cmdbuf_endp)
2355	{	2327	{
2356	// assume 7-bit to be ascii ALWAYS	2328	// assume 7-bit to be ascii ALWAYS
2357	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2329	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2358	return *cmdbuf_ptr++;	2330	return *cmdbuf_ptr++;
2359		2331
2360	wchar_t wc;	2332	wchar_t wc;
2361	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2333	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2362		2334
…		…
2366	cmdbuf_ptr = cmdbuf_endp;	2338	cmdbuf_ptr = cmdbuf_endp;
2367	break;	2339	break;
2368	}	2340	}
2369		2341
2370	if (len == (size_t)-1)	2342	if (len == (size_t)-1)
		2343	{
		2344	mbstate.reset (); // reset now undefined conversion state
2371	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2345	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2346	}
2372		2347
2373	// assume wchar == unicode	2348	// assume wchar == unicode
2374	cmdbuf_ptr += len;	2349	cmdbuf_ptr += len;
2375	return wc & UNICODE_MASK;	2350	return wc & UNICODE_MASK;
2376	}	2351	}
…		…
2420	/*----------------------------------------------------------------------*/	2395	/*----------------------------------------------------------------------*/
2421	#ifdef PRINTPIPE	2396	#ifdef PRINTPIPE
2422	FILE *	2397	FILE *
2423	rxvt_term::popen_printer ()	2398	rxvt_term::popen_printer ()
2424	{	2399	{
2425	FILE *stream = popen (rs[Rs_print_pipe], "w");	2400	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2426		2401
2427	if (stream == NULL)	2402	if (stream == NULL)
2428	rxvt_warn ("can't open printer pipe, not printing.\n");	2403	rxvt_warn ("can't open printer pipe, not printing.\n");
2429		2404
2430	return stream;	2405	return stream;
…		…
2441	* simulate attached vt100 printer	2416	* simulate attached vt100 printer
2442	*/	2417	*/
2443	void	2418	void
2444	rxvt_term::process_print_pipe ()	2419	rxvt_term::process_print_pipe ()
2445	{	2420	{
2446	int done;	2421	FILE *fd = popen_printer ();
2447	FILE *fd;
2448		2422
2449	if ((fd = popen_printer ()) == NULL)	2423	if (!fd)
2450	return;	2424	return;
2451		2425
2452	/*	2426	/*
2453	* Send all input to the printer until either ESC[4i or ESC[?4i	2427	* Send all input to the printer until either ESC[4i or ESC[?4i
2454	* is received.	2428	* is received.
2455	*/	2429	*/
2456	for (done = 0; !done;)	2430	for (int done = 0; !done; )
2457	{	2431	{
2458	unsigned char buf[8];	2432	unsigned char buf[8];
2459	unicode_t ch;	2433	unicode_t ch;
2460	unsigned int i, len;	2434	unsigned int i, len;
2461		2435
…		…
2492	}	2466	}
2493	}	2467	}
2494		2468
2495	pclose_printer (fd);	2469	pclose_printer (fd);
2496	}	2470	}
2497	#endif /* PRINTPIPE */	2471	#endif /* PRINTPIPE */
2498	/*}}} */	2472	/*}}} */
2499		2473
2500	/* *INDENT-OFF* */	2474	/* *INDENT-OFF* */
2501	enum {	2475	enum {
2502	C1_40 = 0x40,	2476	C1_40 = 0x40,
…		…
2606	break;	2580	break;
2607	case 'Z': /* identify the terminal type */	2581	case 'Z': /* identify the terminal type */
2608	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2582	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2609	break;	2583	break;
2610	case '<': /* turn off VT52 mode */	2584	case '<': /* turn off VT52 mode */
2611	PrivMode (0, PrivMode_vt52);	2585	set_privmode (PrivMode_vt52, 0);
2612	break;	2586	break;
2613	case 'F': /* use special graphics character set */	2587	case 'F': /* use special graphics character set */
2614	case 'G': /* use regular character set */	2588	case 'G': /* use regular character set */
2615	/* unimplemented */	2589	/* unimplemented */
2616	break;	2590	break;
…		…
2670	scr_forwardindex ();	2644	scr_forwardindex ();
2671	break;	2645	break;
2672	#endif	2646	#endif
2673	case '=':	2647	case '=':
2674	case '>':	2648	case '>':
2675	PrivMode ((ch == '='), PrivMode_aplKP);	2649	set_privmode (PrivMode_aplKP, ch == '=');
2676	break;	2650	break;
2677		2651
2678	case C1_40:	2652	case C1_40:
2679	cmd_getc ();	2653	cmd_getc ();
2680	break;	2654	break;
…		…
2719	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2693	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2720	case C1_SCI: /* ESC Z */	2694	case C1_SCI: /* ESC Z */
2721	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2695	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2722	break; /* steal obsolete ESC [ c */	2696	break; /* steal obsolete ESC [ c */
2723		2697
2724	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2698	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2725	case C1_CSI: /* ESC [ */	2699	case C1_CSI: /* ESC [ */
2726	process_csi_seq ();	2700	process_csi_seq ();
2727	break;	2701	break;
2728		2702
2729	/* 8.3.90: OPERATING SYSTEM COMMAND */	2703	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2730	case C1_OSC: /* ESC ] */	2704	case C1_OSC: /* ESC ] */
2731	process_osc_seq ();	2705	process_osc_seq ();
2732	break;	2706	break;
2733		2707
2734	/* 8.3.106: RESET TO INITIAL STATE */	2708	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2735	case 'c':	2709	case 'c':
2736	mbstate.reset ();	2710	mbstate.reset ();
2737	scr_poweron ();	2711	scr_poweron ();
2738	scrollbar_show (1);	2712	scrollBar.show (1);
2739	break;	2713	break;
2740		2714
2741	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2715	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2742	case 'n':	2716	case 'n':
2743	scr_charset_choose (2);	2717	scr_charset_choose (2);
…		…
2794		2768
2795	nargs = 0;	2769	nargs = 0;
2796		2770
2797	priv = 0;	2771	priv = 0;
2798	ch = cmd_getc ();	2772	ch = cmd_getc ();
2799	if (ch >= '<' && ch <= '?')	2773	if ((ch >= '<' && ch <= '?') || ch == '!')
		2774	{
2800	{ /* '<' '=' '>' '?' */	2775	/* '<' '=' '>' '?' '!' */
2801	priv = ch;	2776	priv = ch;
2802	ch = cmd_getc ();	2777	ch = cmd_getc ();
2803	}	2778	}
2804		2779
2805	/* read any numerical arguments */	2780	/* read any numerical arguments */
…		…
2848	{	2823	{
2849	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2824	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2825	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851	//	2826	//
2852	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2827	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2828	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2854	// that we do not support xterm mouse reporting (should be 95 when we do).	2829	// versions.
2855	//	2830	//
2856	tt_printf ("\033[>%d;94;0c", 'U');	2831	tt_printf ("\033[>%d;95;0c", 'U');
2857	}	2832	}
2858	break;	2833	break;
		2834
2859	case '?':	2835	case '?':
2860	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2836	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2861	process_terminal_mode (ch, priv, nargs, arg);	2837	process_terminal_mode (ch, priv, nargs, arg);
2862	break;	2838	break;
		2839
		2840	case '!':
		2841	if (ch == CSI_70)
		2842	{
		2843	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2844	scr_soft_reset ();
		2845
		2846	static const int pm_h[] = { 7, 25 };
		2847	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2848
		2849	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2850	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2863	}	2851	}
		2852	break;
		2853	}
		2854
2864	return;	2855	return;
2865	}	2856	}
2866		2857
2867	switch (ch)	2858	switch (ch)
2868	{	2859	{
…		…
3297		3288
3298	/*	3289	/*
3299	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3290	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3300	*/	3291	*/
3301	void	3292	void
3302	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3293	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3303	{	3294	{
3304	int color;	3295	int color;
3305	char *buf, *name;	3296	char *buf, *name;
3306	bool query = str[0] == '?' && !str[1];	3297	bool query = str[0] == '?' && !str[1];
3307	int saveop = op;	3298	int saveop = op;
…		…
3348		3339
3349	XFree (value);	3340	XFree (value);
3350	}	3341	}
3351	else	3342	else
3352	{	3343	{
3353	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3344	char *eq = strchr (str, '=');
3354		3345
3355	if (eq)	3346	if (eq)
3356	{	3347	{
3357	*eq = 0;	3348	*eq = 0;
3358	set_utf8_property (display->atom (str), eq + 1);	3349	set_utf8_property (display->atom (str), eq + 1);
…		…
3379	*buf++ = '\0';	3370	*buf++ = '\0';
3380		3371
3381	process_color_seq (op, color, name, resp);	3372	process_color_seq (op, color, name, resp);
3382	}	3373	}
3383	break;	3374	break;
		3375	case Rxvt_restoreFG:
3384	case XTerm_Color00:	3376	case XTerm_Color00:
3385	process_color_seq (op, Color_fg, str, resp);	3377	process_color_seq (op, Color_fg, str, resp);
3386	break;	3378	break;
		3379	case Rxvt_restoreBG:
3387	case XTerm_Color01:	3380	case XTerm_Color01:
3388	process_color_seq (op, Color_bg, str, resp);	3381	process_color_seq (op, Color_bg, str, resp);
3389	break;	3382	break;
3390	#ifndef NO_CURSORCOLOR	3383	#ifndef NO_CURSORCOLOR
3391	case XTerm_Color_cursor:	3384	case XTerm_Color_cursor:
…		…
3412	break;	3405	break;
3413	case URxvt_Color_IT:	3406	case URxvt_Color_IT:
3414	process_color_seq (op, Color_IT, str, resp);	3407	process_color_seq (op, Color_IT, str, resp);
3415	break;	3408	break;
3416	#endif	3409	#endif
		3410	case URxvt_Color_border:
		3411	process_color_seq (op, Color_border, str, resp);
		3412	break;
3417	#if ENABLE_TRANSPARENCY	3413	#if ENABLE_TRANSPARENCY
3418	case URxvt_Color_tint:	3414	case URxvt_Color_tint:
3419	process_color_seq (op, Color_tint, str, resp);	3415	process_color_seq (op, Color_tint, str, resp);
3420	{	3416	{
3421	bool changed = false;	3417	bool changed = false;
		3418
3422	if (ISSET_PIXCOLOR (Color_tint))	3419	if (ISSET_PIXCOLOR (Color_tint))
3423	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3420	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3424	else	3421	else
3425	changed = bgPixmap.unset_tint ();	3422	changed = bgPixmap.unset_tint ();
		3423
3426	if (changed)	3424	if (changed)
3427	update_background ();	3425	update_background ();
3428	}	3426	}
3429		3427
3430	break;	3428	break;
…		…
3434	case Rxvt_Pixmap:	3432	case Rxvt_Pixmap:
3435	if (!strcmp (str, "?"))	3433	if (!strcmp (str, "?"))
3436	{	3434	{
3437	char str[256];	3435	char str[256];
3438		3436
3439	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3437	sprintf (str, "[%dx%d+%d+%d]",
3440	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3438	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3441	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3439	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442	process_xterm_seq (XTerm_title, str, CHAR_ST);	3440	process_xterm_seq (XTerm_title, str, CHAR_ST);
3443	}	3441	}
3444	else	3442	else
…		…
3453	changed++;	3451	changed++;
3454	str = strchr (str, ';');	3452	str = strchr (str, ';');
3455	if (str == NULL)	3453	if (str == NULL)
3456	bgPixmap.set_defaultGeometry ();	3454	bgPixmap.set_defaultGeometry ();
3457	}	3455	}
		3456
3458	while (str)	3457	while (str)
3459	{	3458	{
3460	str++;	3459	str++;
3461	if (bgPixmap.set_geometry (str))	3460	if (bgPixmap.set_geometry (str))
3462	changed++;	3461	changed++;
3463	str = strchr (str, ';');	3462	str = strchr (str, ';');
3464	}	3463	}
		3464
3465	if (changed)	3465	if (changed)
3466	update_background ();	3466	update_background ();
3467	}	3467	}
3468	break;	3468	break;
3469	#endif	3469	#endif
3470
3471	case Rxvt_restoreFG:
3472	set_window_color (Color_fg, str);
3473	break;
3474	case Rxvt_restoreBG:
3475	set_window_color (Color_bg, str);
3476	break;
3477		3470
3478	case XTerm_logfile:	3471	case XTerm_logfile:
3479	// TODO, when secure mode?	3472	// TODO, when secure mode?
3480	break;	3473	break;
3481		3474
…		…
3548	break;	3541	break;
3549	#endif	3542	#endif
3550		3543
3551	#if ENABLE_PERL	3544	#if ENABLE_PERL
3552	case URxvt_perl:	3545	case URxvt_perl:
3553	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3546	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3554	; // no responses yet
3555	break;	3547	break;
3556	#endif	3548	#endif
3557	}	3549	}
3558	}	3550	}
3559	/*----------------------------------------------------------------------*/	3551	/*----------------------------------------------------------------------*/
…		…
3582	{	3574	{
3583	if (mode == 'r')	3575	if (mode == 'r')
3584	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3576	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3585	else	3577	else
3586	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3578	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3587	PrivMode (state, bit);	3579	set_privmode (bit, state);
3588	}	3580	}
3589		3581
3590	return state;	3582	return state;
3591	}	3583	}
3592		3584
…		…
3600	static const struct	3592	static const struct
3601	{	3593	{
3602	const int argval;	3594	const int argval;
3603	const unsigned long bit;	3595	const unsigned long bit;
3604	} argtopriv[] = {	3596	} argtopriv[] = {
3605	{ 1, PrivMode_aplCUR },	3597	{ 1, PrivMode_aplCUR }, // DECCKM
3606	{ 2, PrivMode_vt52 },	3598	{ 2, PrivMode_vt52 },
3607	{ 3, PrivMode_132 },	3599	{ 3, PrivMode_132 }, // DECCOLM
3608	{ 4, PrivMode_smoothScroll },	3600	{ 4, PrivMode_smoothScroll }, // DECSCLM
3609	{ 5, PrivMode_rVideo },	3601	{ 5, PrivMode_rVideo }, // DECSCNM
3610	{ 6, PrivMode_relOrigin },	3602	{ 6, PrivMode_relOrigin }, // DECOM
3611	{ 7, PrivMode_Autowrap },	3603	{ 7, PrivMode_Autowrap }, // DECAWM
3612	// 8, bi-directional support mode	3604	// 8, auto-repeat keys // DECARM
3613	{ 9, PrivMode_MouseX10 },	3605	{ 9, PrivMode_MouseX10 },
3614	// 18, 19 printing-related	3606	// 18 end FF to printer after print screen
		3607	// 19 Print screen prints full screen/scorll region
3615	{ 25, PrivMode_VisibleCursor },	3608	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3616	#ifdef scrollBar_esc	3609	#ifdef scrollBar_esc
3617	{ scrollBar_esc, PrivMode_scrollBar },	3610	{ scrollBar_esc, PrivMode_scrollBar },
3618	#endif	3611	#endif
3619	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3612	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3613	// 38, tektronix mode // DECTEK
3620	{ 40, PrivMode_132OK },	3614	{ 40, PrivMode_132OK },
3621	// 41 xterm more fixes NYI	3615	// 41 xterm more fixes NYI
3622	// 45 margin bell NYI	3616	// 45 margin bell NYI
3623	// 46 start logging	3617	// 46 start logging
3624	{ 47, PrivMode_Screen },	3618	{ 47, PrivMode_Screen },
3625	{ 66, PrivMode_aplKP },	3619	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3626	#ifndef NO_BACKSPACE_KEY	3620	#ifndef NO_BACKSPACE_KEY
3627	{ 67, PrivMode_BackSpace },	3621	{ 67, PrivMode_BackSpace }, // DECBKM
3628	#endif	3622	#endif
3629	{ 1000, PrivMode_MouseX11 },	3623	{ 1000, PrivMode_MouseX11 },
3630	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3624	{ 1002, PrivMode_MouseBtnEvent },
3631	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3625	{ 1003, PrivMode_MouseAnyEvent },
3632	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3633	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634	{ 1011, PrivMode_Keypress }, // rxvt extension	3627	{ 1011, PrivMode_Keypress }, // rxvt extension
3635	// 1035 enable modifiers for alt, numlock NYI	3628	// 1035 enable modifiers for alt, numlock NYI
3636	// 1036 send ESC for meta keys NYI	3629	// 1036 send ESC for meta keys NYI
3637	// 1037 send DEL for keypad delete NYI	3630	// 1037 send DEL for keypad delete NYI
3638	{ 1047, PrivMode_Screen },	3631	{ 1047, PrivMode_Screen },
3639	// 1048 save and restore cursor	3632	// 1048 save and restore cursor
3640	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3633	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3641	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3634	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3635	{ 2004, PrivMode_BracketPaste },
3642	};	3636	};
3643		3637
3644	if (nargs == 0)	3638	if (nargs == 0)
3645	return;	3639	return;
3646		3640
…		…
3671		3665
3672	scr_touch (true);	3666	scr_touch (true);
3673	break;	3667	break;
3674	#endif	3668	#endif
3675	case 1048: /* alternative cursor save */	3669	case 1048: /* alternative cursor save */
3676	case 1049:
3677	if (option (Opt_secondaryScreen))	3670	if (option (Opt_secondaryScreen))
3678	if (mode == 0)	3671	if (mode == 0)
3679	scr_cursor (RESTORE);	3672	scr_cursor (RESTORE);
3680	else if (mode == 1)	3673	else if (mode == 1)
3681	scr_cursor (SAVE);	3674	scr_cursor (SAVE);
…		…
3690	case 2: /* VT52 mode */	3683	case 2: /* VT52 mode */
3691	/* oddball mode. should be set regardless of set/reset	3684	/* oddball mode. should be set regardless of set/reset
3692	* parameter. Return from VT52 mode with an ESC < from	3685	* parameter. Return from VT52 mode with an ESC < from
3693	* within VT52 mode	3686	* within VT52 mode
3694	*/	3687	*/
3695	PrivMode (1, PrivMode_vt52);	3688	set_privmode (PrivMode_vt52, 1);
3696	break;	3689	break;
3697	case 3: /* 80/132 */	3690	case 3: /* 80/132 */
3698	if (priv_modes & PrivMode_132OK)	3691	if (priv_modes & PrivMode_132OK)
3699	set_widthheight (((state ? 132 : 80) * fwidth), height);	3692	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3700	break;	3693	break;
3701	case 4: /* smooth scrolling */	3694	case 4: /* smooth scrolling */
3702	set_option (Opt_jumpScroll, !state);	3695	set_option (Opt_jumpScroll, !state);
3703	break;	3696	break;
3704	case 5: /* reverse video */	3697	case 5: /* reverse video */
…		…
3711	scr_autowrap (state);	3704	scr_autowrap (state);
3712	break;	3705	break;
3713	/* case 8: - auto repeat, can't do on a per window basis */	3706	/* case 8: - auto repeat, can't do on a per window basis */
3714	case 9: /* X10 mouse reporting */	3707	case 9: /* X10 mouse reporting */
3715	if (state) /* orthogonal */	3708	if (state) /* orthogonal */
3716	priv_modes &= ~PrivMode_MouseX11;	3709	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3717	break;	3710	break;
3718	#ifdef scrollBar_esc	3711	#ifdef scrollBar_esc
3719	case scrollBar_esc:	3712	case scrollBar_esc:
3720	if (scrollbar_mapping (state))	3713	if (scrollBar.map (state))
3721	{	3714	{
3722	resize_all_windows (0, 0, 0);	3715	resize_all_windows (0, 0, 0);
3723	scr_touch (true);	3716	scr_touch (true);
3724	}	3717	}
3725	break;	3718	break;
…		…
3734	break;	3727	break;
3735	/* case 66: - application key pad */	3728	/* case 66: - application key pad */
3736	/* case 67: - backspace key */	3729	/* case 67: - backspace key */
3737	case 1000: /* X11 mouse reporting */	3730	case 1000: /* X11 mouse reporting */
3738	if (state) /* orthogonal */	3731	if (state) /* orthogonal */
3739	priv_modes &= ~PrivMode_MouseX10;	3732	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3740	break;	3733	break;
3741	#if 0
3742	case 1001:	3734	case 1002:
3743	break; /* X11 mouse highlighting */	3735	case 1003:
3744	#endif	3736	if (state)
		3737	{
		3738	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
		3739	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3740	vt_emask_mouse = PointerMotionMask;
		3741	}
		3742	else
		3743	vt_emask_mouse = NoEventMask;
		3744
		3745	vt_select_input ();
		3746	break;
3745	case 1010: /* scroll to bottom on TTY output inhibit */	3747	case 1010: /* scroll to bottom on TTY output inhibit */
3746	set_option (Opt_scrollTtyOutput, !state);	3748	set_option (Opt_scrollTtyOutput, !state);
3747	break;	3749	break;
3748	case 1011: /* scroll to bottom on key press */	3750	case 1011: /* scroll to bottom on key press */
3749	set_option (Opt_scrollTtyKeypress, state);	3751	set_option (Opt_scrollTtyKeypress, state);
3750	break;	3752	break;
3751	case 1047: /* secondary screen w/ clearing last */	3753	case 1047: /* secondary screen w/ clearing last */
3752	if (option (Opt_secondaryScreen))	3754	if (option (Opt_secondaryScreen))
3753	if (current_screen != PRIMARY)	3755	if (!state)
3754	scr_erase_screen (2);	3756	scr_erase_screen (2);
		3757
3755	scr_change_screen (state);	3758	scr_change_screen (state);
3756	break;	3759	break;
3757	case 1049: /* secondary screen w/ clearing first */	3760	case 1049: /* secondary screen w/ clearing first */
		3761	if (option (Opt_secondaryScreen))
		3762	if (state)
		3763	scr_cursor (SAVE);
		3764
3758	scr_change_screen (state);	3765	scr_change_screen (state);
		3766
3759	if (option (Opt_secondaryScreen))	3767	if (option (Opt_secondaryScreen))
3760	if (current_screen != PRIMARY)	3768	if (state)
3761	scr_erase_screen (2);	3769	scr_erase_screen (2);
		3770	else
		3771	scr_cursor (RESTORE);
3762	break;	3772	break;
3763	default:	3773	default:
3764	break;	3774	break;
3765	}	3775	}
3766	}	3776	}
…		…
3926	rxvt_term::process_graphics ()	3936	rxvt_term::process_graphics ()
3927	{	3937	{
3928	unicode_t ch, cmd = cmd_getc ();	3938	unicode_t ch, cmd = cmd_getc ();
3929		3939
3930	if (cmd == 'Q')	3940	if (cmd == 'Q')
		3941	{
3931	{ /* query graphics */	3942	/* query graphics */
3932	tt_printf ("\033G0\012"); /* no graphics */	3943	tt_printf ("\033G0\012"); /* no graphics */
3933	return;	3944	return;
3934	}	3945	}
3935	/* swallow other graphics sequences until terminating ':' */	3946	/* swallow other graphics sequences until terminating ':' */
3936	do	3947	do
…		…
3986	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3997	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3987		3998
3988	memcpy (v_buffer + v_buflen, data, len);	3999	memcpy (v_buffer + v_buflen, data, len);
3989	v_buflen += len;	4000	v_buflen += len;
3990		4001
3991	pty_ev.set (EVENT_READ | EVENT_WRITE);	4002	pty_ev.set (ev::READ | ev::WRITE);
3992	}	4003	}
3993		4004
3994	void rxvt_term::pty_write ()	4005	void rxvt_term::pty_write ()
3995	{	4006	{
3996	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4007	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4002	if (v_buflen == 0)	4013	if (v_buflen == 0)
4003	{	4014	{
4004	free (v_buffer);	4015	free (v_buffer);
4005	v_buffer = 0;	4016	v_buffer = 0;
4006		4017
4007	pty_ev.set (EVENT_READ);	4018	pty_ev.set (ev::READ);
4008	return;	4019	return;
4009	}	4020	}
4010		4021
4011	memmove (v_buffer, v_buffer + written, v_buflen);	4022	memmove (v_buffer, v_buffer + written, v_buflen);
4012	}	4023	}
4013	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4024	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4014	pty_ev.set (EVENT_READ);	4025	pty_ev.set (ev::READ);
4015	}	4026	}
4016		4027
4017	/*----------------------- end-of-file (C source) -----------------------*/	4028	/*----------------------- end-of-file (C source) -----------------------*/
4018		4029

Diff Legend

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