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.352 by ayin, Sun Sep 9 10:35:00 2007 UTC vs.
Revision 1.435 by sf-exg, Wed Jan 6 12:10:44 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
…		…
484	}	579	}
485	}	580	}
486		581
487	#if ENABLE_FRILLS || ISO_14755	582	#if ENABLE_FRILLS || ISO_14755
488	// ISO 14755 support	583	// ISO 14755 support
489	if (shft && ctrl)	584	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490	{	585	{
491	int hv;	586	int hv;
492		587
493	if (iso14755buf & ISO_14755_51	588	if (iso14755buf & ISO_14755_51
494	&& (keysym == XK_space || keysym == XK_KP_Space	589	&& (keysym == XK_space || keysym == XK_KP_Space
…		…
524	scr_overlay_off ();	619	scr_overlay_off ();
525	# endif	620	# endif
526	iso14755buf = 0;	621	iso14755buf = 0;
527	}	622	}
528	}	623	}
		624	else if (option (Opt_iso14755) &&
529	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	625	((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	626	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531	if (!(iso14755buf & ISO_14755_STARTED))	627	if (!(iso14755buf & ISO_14755_STARTED))
532	{	628	{
533	iso14755buf |= ISO_14755_STARTED;	629	iso14755buf |= ISO_14755_STARTED;
534	# if ISO_14755	630	# if ISO_14755
535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	631	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
546	}	642	}
547	#endif	643	#endif
548		644
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	645	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	646	{
		647	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		648	unsigned int newlen = 1;
		649
		650	switch (translate_keypad (keysym, kp))
551	{	651	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	652	#ifndef NO_BACKSPACE_KEY
		653	case XK_BackSpace:
		654	if (priv_modes & PrivMode_HaveBackSpace)
		655	{
		656	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		657	^ !!ctrl) ? '\b' : '\177';
		658	kbuf[1] = '\0';
		659	}
		660	else
		661	strcpy (kbuf, rs[Rs_backspace_key]);
		662	break;
		663	#endif
		664	#ifndef NO_DELETE_KEY
		665	case XK_Delete:
		666	strcpy (kbuf, rs[Rs_delete_key]);
		667	break;
		668	#endif
		669	case XK_Tab:
		670	if (shft)
		671	strcpy (kbuf, "\033[Z");
		672	else
		673	{
		674	#ifdef CTRL_TAB_MAKES_META
		675	if (ctrl)
		676	meta = 1;
		677	#endif
		678	#ifdef MOD4_TAB_MAKES_META
		679	if (ev.state & Mod4Mask)
		680	meta = 1;
		681	#endif
553	newlen = 1;	682	newlen = 0;
554	switch (keysym)	683	}
		684	break;
		685
		686	case XK_Up: /* "\033[A" */
		687	case XK_Down: /* "\033[B" */
		688	case XK_Right: /* "\033[C" */
		689	case XK_Left: /* "\033[D" */
		690	strcpy (kbuf, "\033[Z");
		691	kbuf[2] = "DACB"[keysym - XK_Left];
		692	/* do Shift first */
		693	if (shft)
		694	kbuf[2] = "dacb"[keysym - XK_Left];
		695	else if (ctrl)
		696	{
		697	kbuf[1] = 'O';
		698	kbuf[2] = "dacb"[keysym - XK_Left];
		699	}
		700	else if (priv_modes & PrivMode_aplCUR)
		701	kbuf[1] = 'O';
		702	break;
		703
		704	case XK_KP_Enter:
		705	/* allow shift to override */
		706	if (kp)
		707	{
		708	strcpy (kbuf, "\033OM");
		709	break;
		710	}
		711
		712	/* FALLTHROUGH */
		713
		714	case XK_Return:
		715	if (priv_modes & PrivMode_LFNL)
		716	{
		717	kbuf[0] = '\015';
		718	kbuf[1] = '\012';
		719	kbuf[2] = '\0';
		720	}
		721	else
		722	{
		723	kbuf[0] = '\015';
		724	kbuf[1] = '\0';
		725	}
		726	break;
		727
		728	case XK_KP_F1: /* "\033OP" */
		729	case XK_KP_F2: /* "\033OQ" */
		730	case XK_KP_F3: /* "\033OR" */
		731	case XK_KP_F4: /* "\033OS" */
		732	strcpy (kbuf, "\033OP");
		733	kbuf[2] += (keysym - XK_KP_F1);
		734	break;
		735
		736	case XK_KP_Multiply: /* "\033Oj" : "*" */
		737	case XK_KP_Add: /* "\033Ok" : "+" */
		738	case XK_KP_Separator: /* "\033Ol" : "," */
		739	case XK_KP_Subtract: /* "\033Om" : "-" */
		740	case XK_KP_Decimal: /* "\033On" : "." */
		741	case XK_KP_Divide: /* "\033Oo" : "/" */
		742	case XK_KP_0: /* "\033Op" : "0" */
		743	case XK_KP_1: /* "\033Oq" : "1" */
		744	case XK_KP_2: /* "\033Or" : "2" */
		745	case XK_KP_3: /* "\033Os" : "3" */
		746	case XK_KP_4: /* "\033Ot" : "4" */
		747	case XK_KP_5: /* "\033Ou" : "5" */
		748	case XK_KP_6: /* "\033Ov" : "6" */
		749	case XK_KP_7: /* "\033Ow" : "7" */
		750	case XK_KP_8: /* "\033Ox" : "8" */
		751	case XK_KP_9: /* "\033Oy" : "9" */
		752	/* allow shift to override */
		753	if (kp)
		754	{
		755	strcpy (kbuf, "\033Oj");
		756	kbuf[2] += (keysym - XK_KP_Multiply);
		757	}
		758	else
		759	{
		760	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		761	kbuf[1] = '\0';
		762	}
		763	break;
		764
		765	default:
555	{	766	{
556	#ifndef NO_BACKSPACE_KEY	767	int param = map_function_key (keysym);
557	case XK_BackSpace:	768	if (param > 0)
558	if (priv_modes & PrivMode_HaveBackSpace)	769	sprintf (kbuf,"\033[%d~", param);
559	{
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';
563	}
564	else	770	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;	771	newlen = 0;
840	break;
841	}	772	}
842		773	break;
843	if (newlen)
844	len = strlen (kbuf);
845	}	774	}
		775
		776	if (newlen)
		777	len = strlen (kbuf);
846		778
847	/*	779	/*
848	* Pass meta for all function keys, if 'meta' option set	780	* Pass meta for all function keys, if 'meta' option set
849	*/	781	*/
850	#ifdef META8_OPTION	782	#ifdef META8_OPTION
…		…
1035	void	967	void
1036	rxvt_term::flush ()	968	rxvt_term::flush ()
1037	{	969	{
1038	flush_ev.stop ();	970	flush_ev.stop ();
1039		971
1040	#ifdef ENABLE_TRANSPARENCY	972	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	973	if (bgPixmap.check_clearChanged ())
1042	{	974	{
1043	want_full_refresh = 0;	975	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	976	scr_touch (false);
1046	}	977	}
1047	#endif	978	#endif
1048		979
1049	if (want_refresh)	980	if (want_refresh)
…		…
1085	}	1016	}
1086	while (row < end_row);	1017	while (row < end_row);
1087	}	1018	}
1088		1019
1089	scr_refresh ();	1020	scr_refresh ();
1090	scrollbar_show (1);	1021	scrollBar.show (1);
1091	#ifdef USE_XIM	1022	#ifdef USE_XIM
1092	IMSendSpot ();	1023	IMSendSpot ();
1093	#endif	1024	#endif
1094	}	1025	}
1095		1026
1096	display->flush ();	1027	display->flush ();
1097	}	1028	}
1098		1029
		1030	/* checks wether a refresh is requested and starts the refresh timer */
1099	void	1031	void
1100	rxvt_term::check_cb (check_watcher &w)	1032	rxvt_term::refresh_check ()
1101	{	1033	{
1102	make_current ();	1034	if (want_refresh && !flush_ev.is_active ())
		1035	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103		1036
1104	display->flush ();	1037	display->flush ();
1105
1106	if (want_refresh && !flush_ev.active)
1107	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108	}	1038	}
1109		1039
1110	void	1040	void
1111	rxvt_term::flush_cb (time_watcher &w)	1041	rxvt_term::flush_cb (ev::timer &w, int revents)
1112	{	1042	{
1113	make_current ();	1043	make_current ();
1114		1044
1115	refresh_count = 0;	1045	refresh_count = 0;
1116	flush ();	1046	flush ();
1117	}	1047	}
1118		1048
1119	#ifdef CURSOR_BLINK	1049	#ifdef CURSOR_BLINK
1120	void	1050	void
1121	rxvt_term::cursor_blink_cb (time_watcher &w)	1051	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122	{	1052	{
1123	hidden_cursor = !hidden_cursor;	1053	hidden_cursor = !hidden_cursor;
1124	want_refresh = 1;	1054	want_refresh = 1;
1125		1055	refresh_check ();
1126	w.start (w.at + CURSOR_BLINK_INTERVAL);
1127	}	1056	}
1128	#endif	1057	#endif
1129		1058
1130	#ifdef TEXT_BLINK	1059	#ifdef TEXT_BLINK
1131	void	1060	void
1132	rxvt_term::text_blink_cb (time_watcher &w)	1061	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133	{	1062	{
1134	if (scr_refresh_rend (RS_Blink, RS_Blink))	1063	if (scr_refresh_rend (RS_Blink, RS_Blink))
1135	{	1064	{
1136	hidden_text = !hidden_text;	1065	hidden_text = !hidden_text;
1137	want_refresh = 1;	1066	want_refresh = 1;
1138	w.start (w.at + TEXT_BLINK_INTERVAL);	1067	refresh_check ();
1139	}	1068	}
		1069	else
		1070	w.stop ();
1140	}	1071	}
1141	#endif	1072	#endif
1142		1073
1143	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1074	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144	void	1075	void
1145	rxvt_term::cont_scroll_cb (time_watcher &w)	1076	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146	{	1077	{
1147	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1078	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148	scr_page (scrollbar_isUp() ? UP : DN, 1))	1079	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149	{	1080	{
1150	want_refresh = 1;	1081	want_refresh = 1;
1151	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1082	refresh_check ();
1152	}	1083	}
		1084	else
		1085	w.stop ();
1153	}	1086	}
1154	#endif	1087	#endif
1155		1088
1156	#ifdef SELECTION_SCROLLING	1089	#ifdef SELECTION_SCROLLING
1157	void	1090	void
1158	rxvt_term::sel_scroll_cb (time_watcher &w)	1091	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159	{	1092	{
1160	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1093	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161	{	1094	{
1162	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1095	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163	want_refresh = 1;	1096	want_refresh = 1;
1164	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1097	refresh_check ();
1165	}	1098	}
		1099	else
		1100	w.stop ();
1166	}	1101	}
1167	#endif	1102	#endif
1168		1103
1169	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1104	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170	void	1105	void
1171	rxvt_term::slip_wheel_cb (time_watcher &w)	1106	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172	{	1107	{
1173	if (mouse_slip_wheel_speed == 0	1108	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175	: scr_page (UP, mouse_slip_wheel_speed))
1176	{	1109	{
1177	if (view_start == top_row || view_start == 0)
1178	mouse_slip_wheel_speed = 0;
1179
1180	want_refresh = 1;	1110	want_refresh = 1;
1181	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1111	refresh_check ();
		1112	}
		1113
		1114	if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
		1115	{
		1116	mouse_slip_wheel_speed = 0;
		1117	w.stop ();
1182	}	1118	}
1183	}	1119	}
1184	#endif	1120	#endif
1185		1121
1186	#if LINUX_YIELD_HACK	1122	#if LINUX_YIELD_HACK
1187	static struct event_handler	1123	static struct event_handler
1188	{	1124	{
1189	check_watcher yield_ev;	1125	ev::prepare yield_ev;
1190		1126
1191	void yield_cb (check_watcher &w)	1127	void yield_cb (ev::prepare &w, int revents)
1192	{	1128	{
1193	// this should really be sched_yield(), but the linux guys thought	1129	// this should really be sched_yield(), but the linux guys thought
1194	// that giving a process calling sched_yield () less cpu time than	1130	// that giving a process calling sched_yield () less cpu time than
1195	// ones with high nice levels is a useful thing to do. It surely is is	1131	// ones with high nice levels is a useful thing to do. It surely is is
1196	// allowed by the sus... as is returning ENOSYS.	1132	// allowed by the sus... as is returning ENOSYS.
		1133	// since the linux guys additionally thought that breaking the only
		1134	// known workaroudn against their unusable sched_yield hack is cool,
		1135	// we just nanosleep a bit and hope for the best.
1197		1136
1198	struct timespec ts = { 0, 0 };	1137	struct timespec ts = { 0, 1000 };
1199	nanosleep (&ts, 0);	1138	nanosleep (&ts, 0);
1200		1139
1201	w.stop ();	1140	w.stop ();
1202	}	1141	}
1203		1142
…		…
1247		1186
1248	return false;	1187	return false;
1249	}	1188	}
1250		1189
1251	void	1190	void
1252	rxvt_term::pty_cb (io_watcher &w, short revents)	1191	rxvt_term::pty_cb (ev::io &w, int revents)
1253	{	1192	{
1254	make_current ();	1193	make_current ();
1255		1194
1256	if (revents & EVENT_READ)	1195	if (revents & ev::READ)
1257	// loop, but don't allow a single term to monopolize us	1196	// loop, but don't allow a single term to monopolize us
1258	while (pty_fill ())	1197	for (int i = CBUFCNT; i-- && pty_fill (); )
1259	if (cmd_parse ())	1198	cmd_parse ();
1260	break;
1261		1199
1262	if (revents & EVENT_WRITE)	1200	if (revents & ev::WRITE)
1263	pty_write ();	1201	pty_write ();
		1202
		1203	refresh_check ();
1264	}	1204	}
1265		1205
1266	void	1206	void
1267	rxvt_term::pointer_unblank ()	1207	rxvt_term::pointer_unblank ()
1268	{	1208	{
…		…
1271		1211
1272	#ifdef POINTER_BLANK	1212	#ifdef POINTER_BLANK
1273	hidden_pointer = 0;	1213	hidden_pointer = 0;
1274		1214
1275	if (option (Opt_pointerBlank))	1215	if (option (Opt_pointerBlank))
1276	pointer_ev.start (NOW + pointerBlankDelay);	1216	pointer_ev.start (pointerBlankDelay);
1277	#endif	1217	#endif
1278	}	1218	}
1279		1219
1280	#ifdef POINTER_BLANK	1220	#ifdef POINTER_BLANK
1281	void	1221	void
…		…
1289		1229
1290	hidden_pointer = 1;	1230	hidden_pointer = 1;
1291	}	1231	}
1292		1232
1293	void	1233	void
1294	rxvt_term::pointer_cb (time_watcher &w)	1234	rxvt_term::pointer_cb (ev::timer &w, int revents)
1295	{	1235	{
1296	make_current ();	1236	make_current ();
1297		1237
1298	pointer_blank ();	1238	pointer_blank ();
1299	}	1239	}
…		…
1302	void	1242	void
1303	rxvt_term::mouse_report (XButtonEvent &ev)	1243	rxvt_term::mouse_report (XButtonEvent &ev)
1304	{	1244	{
1305	int button_number, key_state = 0;	1245	int button_number, key_state = 0;
1306	int x, y;	1246	int x, y;
		1247	int code = 32;
1307		1248
1308	x = ev.x;	1249	x = Pixel2Col (ev.x);
1309	y = ev.y;	1250	y = Pixel2Row (ev.y);
1310	pixel_position (&x, &y);	1251	if (ev.type == MotionNotify)
		1252	{
		1253	if (x == mouse_row && y == mouse_col)
		1254	return;
		1255	mouse_row = x;
		1256	mouse_col = y;
		1257	code += 32;
		1258	}
1311		1259
1312	if (MEvent.button == AnyButton)	1260	if (MEvent.button == AnyButton)
1313	button_number = 3;	1261	button_number = 3;
1314	else	1262	else
1315	{	1263	{
…		…
1361	x + 1,	1309	x + 1,
1362	y + 1);	1310	y + 1);
1363	#endif	1311	#endif
1364		1312
1365	tt_printf ("\033[M%c%c%c",	1313	tt_printf ("\033[M%c%c%c",
1366	(32 + button_number + key_state),	1314	(code + button_number + key_state),
1367	(32 + x + 1),	1315	(32 + x + 1),
1368	(32 + y + 1));	1316	(32 + y + 1));
1369	}	1317	}
1370		1318
1371	/*{{{ process an X event */	1319	/*{{{ process an X event */
…		…
1475	&& ev.xfocus.mode != NotifyGrab)	1423	&& ev.xfocus.mode != NotifyGrab)
1476	focus_out ();	1424	focus_out ();
1477	break;	1425	break;
1478		1426
1479	case ConfigureNotify:	1427	case ConfigureNotify:
1480	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1428	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1481	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1429	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1482	szHint.width, szHint.height);*/	1430	szHint.width, szHint.height);*/
1483	if (ev.xconfigure.window == parent[0])	1431	if (ev.xconfigure.window == parent[0])
1484	{	1432	{
1485	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1433	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
…		…
1490	seen_resize = 1;	1438	seen_resize = 1;
1491	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1439	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492	}	1440	}
1493	else	1441	else
1494	{	1442	{
1495	#ifdef ENABLE_TRANSPARENCY	1443	#ifdef HAVE_BG_PIXMAP
1496	if (option (Opt_transparent))	1444	if (bgPixmap.window_position_sensitive ())
		1445	{
		1446	if (mapped)
1497	update_background ();	1447	update_background ();
		1448	else
		1449	bgPixmap.invalidate ();
		1450	}
1498	#endif	1451	#endif
1499	}	1452	}
		1453
1500	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1454	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1501	}	1455	}
1502	break;	1456	break;
1503		1457
1504	case PropertyNotify:	1458	case PropertyNotify:
…		…
1521	case SelectionRequest:	1475	case SelectionRequest:
1522	selection_send (ev.xselectionrequest);	1476	selection_send (ev.xselectionrequest);
1523	break;	1477	break;
1524		1478
1525	case MapNotify:	1479	case MapNotify:
		1480	#ifdef HAVE_BG_PIXMAP
		1481	/* This is needed spcifically to fix the case of no window manager or a
		1482	* non-reparenting window manager. In those cases we never get first
		1483	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1484	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1485	* reparenting.
		1486	* We should not render background immidiately, as there could be several
		1487	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1488	* by scheduling background redraw as soon as we can, but giving a short
		1489	* bit of time for ConfigureNotifies to arrive.
		1490	* We should render background PRIOR to drawing any text, but AFTER all
		1491	* of ConfigureNotifys for the best results.
		1492	*/
		1493	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1494	update_background_ev.start (0.025);
		1495	#endif
1526	mapped = 1;	1496	mapped = 1;
1527	#ifdef TEXT_BLINK	1497	#ifdef TEXT_BLINK
1528	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1498	text_blink_ev.start ();
1529	#endif	1499	#endif
1530	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1500	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531	break;	1501	break;
1532		1502
1533	case UnmapNotify:	1503	case UnmapNotify:
…		…
1535	#ifdef TEXT_BLINK	1505	#ifdef TEXT_BLINK
1536	text_blink_ev.stop ();	1506	text_blink_ev.stop ();
1537	#endif	1507	#endif
1538	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1508	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539	break;	1509	break;
1540
1541	#ifdef ENABLE_TRANSPARENCY
1542	case ReparentNotify:
1543	rootwin_cb (ev);
1544	break;
1545	#endif /* ENABLE_TRANSPARENCY */
1546		1510
1547	case GraphicsExpose:	1511	case GraphicsExpose:
1548	case Expose:	1512	case Expose:
1549	if (ev.xany.window == vt)	1513	if (ev.xany.window == vt)
1550	{	1514	{
1551	do	1515	do
		1516	{
1552	scr_expose (ev.xexpose.x, ev.xexpose.y,	1517	scr_expose (ev.xexpose.x, ev.xexpose.y,
1553	ev.xexpose.width, ev.xexpose.height, False);	1518	ev.xexpose.width, ev.xexpose.height, False);
		1519	}
1554	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1520	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1555		1521
1556	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1522	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1557		1523
1558	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1524	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1525	{
1559	scr_expose (ev.xexpose.x, ev.xexpose.y,	1526	scr_expose (ev.xexpose.x, ev.xexpose.y,
1560	ev.xexpose.width, ev.xexpose.height, False);	1527	ev.xexpose.width, ev.xexpose.height, False);
		1528	}
1561		1529
1562	want_refresh = 1;	1530	want_refresh = 1;
1563	}	1531	}
1564	else	1532	else
1565	{	1533	{
…		…
1568	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1536	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1569	;	1537	;
1570	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1538	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1571	;	1539	;
1572		1540
1573	if (isScrollbarWindow (ev.xany.window))	1541	if (scrollBar.state && ev.xany.window == scrollBar.win)
1574	{	1542	{
1575	scrollBar.setIdle ();	1543	scrollBar.state = STATE_IDLE;
1576	scrollbar_show (0);	1544	scrollBar.show (0);
1577	}	1545	}
1578	}	1546	}
1579	break;	1547	break;
1580		1548
1581	case MotionNotify:	1549	case MotionNotify:
1582	#ifdef POINTER_BLANK	1550	#ifdef POINTER_BLANK
1583	if (hidden_pointer)	1551	if (hidden_pointer)
1584	pointer_unblank ();	1552	pointer_unblank ();
1585	#endif	1553	#endif
		1554	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
		1555	|| priv_modes & PrivMode_MouseAnyEvent)
		1556	mouse_report (ev.xbutton);
1586	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1557	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1587	break;	1558	break;
1588		1559
1589	if (ev.xany.window == vt)	1560	if (ev.xany.window == vt)
1590	{	1561	{
…		…
1624	int dist;	1595	int dist;
1625		1596
1626	/* don't clobber the current delay if we are	1597	/* don't clobber the current delay if we are
1627	* already in the middle of scrolling.	1598	* already in the middle of scrolling.
1628	*/	1599	*/
1629	if (!sel_scroll_ev.active)	1600	if (!sel_scroll_ev.is_active ())
1630	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1601	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1631		1602
1632	/* save the event params so we can highlight	1603	/* save the event params so we can highlight
1633	* the selection in the pending-scroll loop	1604	* the selection in the pending-scroll loop
1634	*/	1605	*/
1635	selection_save_x = ev.xbutton.x;	1606	selection_save_x = ev.xbutton.x;
…		…
1657	else	1628	else
1658	{	1629	{
1659	/* we are within the text window, so we	1630	/* we are within the text window, so we
1660	* shouldn't be scrolling	1631	* shouldn't be scrolling
1661	*/	1632	*/
1662	if (sel_scroll_ev.active)
1663	sel_scroll_ev.stop();	1633	sel_scroll_ev.stop();
1664	}	1634	}
1665	#endif	1635	#endif
1666	#ifdef MOUSE_THRESHOLD	1636	#ifdef MOUSE_THRESHOLD
1667	}	1637	}
1668	#endif	1638	#endif
1669	}	1639	}
1670	}	1640	}
1671	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1641	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1672	{	1642	{
1673	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1643	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1674	MotionNotify, &ev))	1644	MotionNotify, &ev))
1675	;	1645	;
1676		1646
…		…
1678	&unused_root, &unused_child,	1648	&unused_root, &unused_child,
1679	&unused_root_x, &unused_root_y,	1649	&unused_root_x, &unused_root_y,
1680	&ev.xbutton.x, &ev.xbutton.y,	1650	&ev.xbutton.x, &ev.xbutton.y,
1681	&unused_mask);	1651	&unused_mask);
1682	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1652	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1683	scrollbar_size ());	1653	scrollBar.size ());
1684	want_refresh = 1;	1654	want_refresh = 1;
1685	scrollbar_show (1);	1655	scrollBar.show (1);
1686	}	1656	}
1687	break;	1657	break;
1688	}	1658	}
1689		1659
1690	#if defined(CURSOR_BLINK)	1660	#if defined(CURSOR_BLINK)
…		…
1694	{	1664	{
1695	hidden_cursor = 0;	1665	hidden_cursor = 0;
1696	want_refresh = 1;	1666	want_refresh = 1;
1697	}	1667	}
1698		1668
1699	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1669	cursor_blink_ev.again ();
1700	}	1670	}
1701	#endif	1671	#endif
1702		1672
1703	#if defined(POINTER_BLANK)	1673	#if defined(POINTER_BLANK)
1704	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1674	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1711		1681
1712	if (ev.type == KeyPress && hidden_pointer == 0)	1682	if (ev.type == KeyPress && hidden_pointer == 0)
1713	pointer_blank ();	1683	pointer_blank ();
1714	}	1684	}
1715	#endif	1685	#endif
		1686
		1687	refresh_check ();
1716	}	1688	}
		1689
		1690	#if ENABLE_FRILLS
		1691	void
		1692	rxvt_term::set_urgency (bool enable)
		1693	{
		1694	if (enable == urgency_hint)
		1695	return;
		1696
		1697	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1698	{
		1699	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1700	XSetWMHints (dpy, parent[0], h);
		1701	urgency_hint = enable;
		1702	}
		1703	}
		1704	#endif
1717		1705
1718	void	1706	void
1719	rxvt_term::focus_in ()	1707	rxvt_term::focus_in ()
1720	{	1708	{
1721	if (!focus)	1709	if (!focus)
1722	{	1710	{
1723	focus = 1;	1711	focus = 1;
1724	want_refresh = 1;	1712	want_refresh = 1;
1725		1713
1726	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727
1728	#if USE_XIM	1714	#if USE_XIM
1729	if (Input_Context != NULL)	1715	if (Input_Context != NULL)
1730	{	1716	{
1731	IMSetPosition ();	1717	IMSetPosition ();
1732	XSetICFocus (Input_Context);	1718	XSetICFocus (Input_Context);
1733	}	1719	}
1734	#endif	1720	#endif
1735	#if CURSOR_BLINK	1721	#if CURSOR_BLINK
1736	if (option (Opt_cursorBlink))	1722	if (option (Opt_cursorBlink))
1737	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1723	cursor_blink_ev.again ();
1738	#endif	1724	#endif
1739	#if OFF_FOCUS_FADING	1725	#if OFF_FOCUS_FADING
1740	if (rs[Rs_fade])	1726	if (rs[Rs_fade])
1741	{	1727	{
1742	pix_colors = pix_colors_focused;	1728	pix_colors = pix_colors_focused;
1743	scr_recolour ();	1729	scr_recolour ();
1744	}	1730	}
1745	#endif	1731	#endif
1746	#if ENABLE_FRILLS	1732	#if ENABLE_FRILLS
1747	if (option (Opt_urgentOnBell))	1733	if (option (Opt_urgentOnBell))
1748	{	1734	set_urgency (0);
1749	XWMHints *h;
1750
1751	h = XGetWMHints(dpy, parent[0]);
1752	if (h != NULL)
1753	{
1754	h->flags &= ~XUrgencyHint;
1755	XSetWMHints(dpy, parent[0], h);
1756	}
1757	}
1758	#endif	1735	#endif
		1736
		1737	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759	}	1738	}
1760	}	1739	}
1761		1740
1762	void	1741	void
1763	rxvt_term::focus_out ()	1742	rxvt_term::focus_out ()
…		…
1765	if (focus)	1744	if (focus)
1766	{	1745	{
1767	focus = 0;	1746	focus = 0;
1768	want_refresh = 1;	1747	want_refresh = 1;
1769		1748
1770	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1749	#if ENABLE_FRILLS
1771		1750	if (option (Opt_urgentOnBell))
		1751	set_urgency (0);
		1752	#endif
1772	#if ENABLE_FRILLS || ISO_14755	1753	#if ENABLE_FRILLS || ISO_14755
1773	if (iso14755buf)	1754	if (iso14755buf)
1774	{	1755	{
1775	iso14755buf = 0;	1756	iso14755buf = 0;
1776	# if ISO_14755	1757	# if ISO_14755
…		…
1783	XUnsetICFocus (Input_Context);	1764	XUnsetICFocus (Input_Context);
1784	#endif	1765	#endif
1785	#if CURSOR_BLINK	1766	#if CURSOR_BLINK
1786	if (option (Opt_cursorBlink))	1767	if (option (Opt_cursorBlink))
1787	cursor_blink_ev.stop ();	1768	cursor_blink_ev.stop ();
		1769
1788	hidden_cursor = 0;	1770	hidden_cursor = 0;
1789	#endif	1771	#endif
1790	#if OFF_FOCUS_FADING	1772	#if OFF_FOCUS_FADING
1791	if (rs[Rs_fade])	1773	if (rs[Rs_fade])
1792	{	1774	{
1793	pix_colors = pix_colors_unfocused;	1775	pix_colors = pix_colors_unfocused;
1794	scr_recolour ();	1776	scr_recolour ();
1795	}	1777	}
1796	#endif	1778	#endif
		1779
		1780	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1797	}	1781	}
1798	}	1782	}
1799		1783
1800	void	1784	void
1801	rxvt_term::update_fade_color (unsigned int idx)	1785	rxvt_term::update_fade_color (unsigned int idx)
…		…
1832	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1816	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1833	{	1817	{
1834	bgPixmap.set_root_pixmap ();	1818	bgPixmap.set_root_pixmap ();
1835	update_background ();	1819	update_background ();
1836	}	1820	}
		1821
1837	break;	1822	break;
1838	}	1823	}
1839	# endif	1824	# endif
		1825
		1826	refresh_check ();
1840	}	1827	}
1841	#endif	1828	#endif
1842		1829
1843	void	1830	void
1844	rxvt_term::button_press (XButtonEvent &ev)	1831	rxvt_term::button_press (XButtonEvent &ev)
…		…
1899	mouse_report (ev);	1886	mouse_report (ev);
1900	}	1887	}
1901	#else	1888	#else
1902	MEvent.button = ev.button;	1889	MEvent.button = ev.button;
1903	mouse_report (ev);	1890	mouse_report (ev);
1904	#endif /* MOUSE_REPORT_DOUBLECLICK */	1891	#endif /* MOUSE_REPORT_DOUBLECLICK */
1905		1892
1906	}	1893	}
1907	else	1894	else
1908	{	1895	{
1909	if (ev.button != MEvent.button)	1896	if (ev.button != MEvent.button)
…		…
1957	}	1944	}
1958		1945
1959	/*	1946	/*
1960	* Scrollbar window processing of button press	1947	* Scrollbar window processing of button press
1961	*/	1948	*/
1962	if (isScrollbarWindow (ev.window))	1949	if (scrollBar.state && ev.window == scrollBar.win)
1963	{	1950	{
1964	scrollBar.setIdle ();	1951	page_dirn direction = NO_DIR;
		1952
		1953	if (scrollBar.upButton (ev.y))
		1954	direction = UP; /* up */
		1955	else if (scrollBar.dnButton (ev.y))
		1956	direction = DN; /* down */
		1957
		1958	scrollBar.state = STATE_IDLE;
1965	/*	1959	/*
1966	* Rxvt-style scrollbar:	1960	* Rxvt-style scrollbar:
1967	* move up if mouse is above slider	1961	* move up if mouse is above slider
1968	* move dn if mouse is below slider	1962	* move dn if mouse is below slider
1969	*	1963	*
…		…
1978	/*	1972	/*
1979	* Mouse report disabled scrollbar:	1973	* Mouse report disabled scrollbar:
1980	* arrow buttons - send up/down	1974	* arrow buttons - send up/down
1981	* click on scrollbar - send pageup/down	1975	* click on scrollbar - send pageup/down
1982	*/	1976	*/
1983	if ((scrollBar.style == R_SB_NEXT	1977	if (direction == UP)
1984	&& scrollbarnext_upButton (ev.y))
1985	|| (scrollBar.style == R_SB_RXVT
1986	&& scrollbarrxvt_upButton (ev.y)))
1987	tt_printf ("\033[A");	1978	tt_printf ("\033[A");
1988	else if ((scrollBar.style == R_SB_NEXT	1979	else if (direction == DN)
1989	&& scrollbarnext_dnButton (ev.y))
1990	|| (scrollBar.style == R_SB_RXVT
1991	&& scrollbarrxvt_dnButton (ev.y)))
1992	tt_printf ("\033[B");	1980	tt_printf ("\033[B");
1993	else	1981	else
1994	switch (ev.button)	1982	switch (ev.button)
1995	{	1983	{
1996	case Button2:	1984	case Button2:
…		…
2003	tt_printf ("\033[5~");	1991	tt_printf ("\033[5~");
2004	break;	1992	break;
2005	}	1993	}
2006	}	1994	}
2007	else	1995	else
2008	#endif /* NO_SCROLLBAR_REPORT */	1996	#endif /* NO_SCROLLBAR_REPORT */
2009
2010	{
2011	char upordown = 0;
2012
2013	if (scrollBar.style == R_SB_NEXT)
2014	{	1997	{
2015	if (scrollbarnext_upButton (ev.y))	1998	if (direction != NO_DIR)
2016	upordown = -1; /* up */
2017	else if (scrollbarnext_dnButton (ev.y))
2018	upordown = 1; /* down */
2019	}
2020	else if (scrollBar.style == R_SB_RXVT)
2021	{
2022	if (scrollbarrxvt_upButton (ev.y))
2023	upordown = -1; /* up */
2024	else if (scrollbarrxvt_dnButton (ev.y))
2025	upordown = 1; /* down */
2026	}
2027	if (upordown)
2028	{	1999	{
2029	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2000	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		2001	if (!cont_scroll_ev.is_active ())
2030	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2002	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2031	#endif	2003	#endif
2032	if (scr_page (upordown < 0 ? UP : DN, 1))	2004	if (scr_page (direction, 1))
2033	{	2005	{
2034	if (upordown < 0)	2006	if (direction == UP)
2035	scrollBar.setUp ();	2007	scrollBar.state = STATE_UP;
2036	else	2008	else
2037	scrollBar.setDn ();	2009	scrollBar.state = STATE_DOWN;
2038	}	2010	}
2039	}	2011	}
2040	else	2012	else
2041	switch (ev.button)	2013	switch (ev.button)
2042	{	2014	{
2043	case Button2:	2015	case Button2:
2044	switch (scrollbar_align)	2016	switch (scrollBar.align)
2045	{	2017	{
2046	case R_SB_ALIGN_TOP:	2018	case R_SB_ALIGN_TOP:
2047	csrO = 0;	2019	csrO = 0;
2048	break;	2020	break;
2049	case R_SB_ALIGN_CENTRE:	2021	case R_SB_ALIGN_CENTRE:
…		…
2055	}	2027	}
2056		2028
2057	if (scrollBar.style == R_SB_XTERM	2029	if (scrollBar.style == R_SB_XTERM
2058	|| scrollbar_above_slider (ev.y)	2030	|| scrollbar_above_slider (ev.y)
2059	|| scrollbar_below_slider (ev.y))	2031	|| scrollbar_below_slider (ev.y))
2060	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2032	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2061		2033
2062	scrollBar.setMotion ();	2034	scrollBar.state = STATE_MOTION;
2063	break;	2035	break;
2064		2036
2065	case Button1:	2037	case Button1:
2066	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2038	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2067	csrO = ev.y - scrollBar.top;	2039	csrO = ev.y - scrollBar.top;
2068	/* FALLTHROUGH */	2040	/* FALLTHROUGH */
2069		2041
2070	case Button3:	2042	case Button3:
2071	if (scrollBar.style != R_SB_XTERM)	2043	if (scrollBar.style != R_SB_XTERM)
…		…
2081	scr_page (DN, nrow - 1);	2053	scr_page (DN, nrow - 1);
2082	# else	2054	# else
2083	scr_page (DN, nrow / 4);	2055	scr_page (DN, nrow / 4);
2084	# endif	2056	# endif
2085	else	2057	else
2086	scrollBar.setMotion ();	2058	scrollBar.state = STATE_MOTION;
2087	}	2059	}
2088	else	2060	else
2089	{	2061	{
2090	scr_page ((ev.button == Button1 ? DN : UP),	2062	scr_page ((ev.button == Button1 ? DN : UP),
2091	(nrow	2063	(nrow
2092	* scrollbar_position (ev.y)	2064	* scrollbar_position (ev.y)
2093	/ scrollbar_size ()));	2065	/ scrollBar.size ()));
2094	}	2066	}
2095		2067
2096	break;	2068	break;
2097	}	2069	}
2098	}	2070	}
…		…
2108		2080
2109	csrO = 0; /* reset csr Offset */	2081	csrO = 0; /* reset csr Offset */
2110	if (!bypass_keystate)	2082	if (!bypass_keystate)
2111	reportmode = !! (priv_modes & PrivMode_mouse_report);	2083	reportmode = !! (priv_modes & PrivMode_mouse_report);
2112		2084
2113	if (scrollbar_isUpDn ())	2085	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2114	{	2086	{
2115	scrollBar.setIdle ();	2087	scrollBar.state = STATE_IDLE;
2116	scrollbar_show (0);	2088	scrollBar.show (0);
2117	}	2089	}
2118		2090
2119	#ifdef SELECTION_SCROLLING	2091	#ifdef SELECTION_SCROLLING
2120	if (sel_scroll_ev.active)
2121	sel_scroll_ev.stop();	2092	sel_scroll_ev.stop();
2122	#endif	2093	#endif
2123		2094
2124	if (ev.window == vt)	2095	if (ev.window == vt)
2125	{	2096	{
2126	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2097	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2150	mouse_report (ev);	2121	mouse_report (ev);
2151	}	2122	}
2152	#else /* MOUSE_REPORT_DOUBLECLICK */	2123	#else /* MOUSE_REPORT_DOUBLECLICK */
2153	MEvent.button = AnyButton;	2124	MEvent.button = AnyButton;
2154	mouse_report (ev);	2125	mouse_report (ev);
2155	#endif /* MOUSE_REPORT_DOUBLECLICK */	2126	#endif /* MOUSE_REPORT_DOUBLECLICK */
2156	return;	2127	return;
2157	}	2128	}
2158		2129
2159	/*	2130	/*
2160	* dumb hack to compensate for the failure of click-and-drag	2131	* dumb hack to compensate for the failure of click-and-drag
…		…
2198	{	2169	{
2199	mouse_slip_wheel_speed += v ? -1 : 1;	2170	mouse_slip_wheel_speed += v ? -1 : 1;
2200	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2171	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2201	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2172	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202		2173
2203	if (slip_wheel_ev.at < NOW)	2174	if (!slip_wheel_ev.is_active ())
2204	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2175	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205
2206	slip_wheel_ev.start ();
2207	}	2176	}
2208	else	2177	else
		2178	# endif
2209	{	2179	{
2210	# endif
2211	scr_page (v, i);	2180	scr_page (v, i);
2212	scrollbar_show (1);	2181	scrollBar.show (1);
2213	# ifdef MOUSE_SLIP_WHEELING
2214	}	2182	}
2215	# endif
2216	}	2183	}
2217	break;	2184	break;
2218	#endif	2185	#endif
2219	}	2186	}
2220	}	2187	}
2221	}	2188	}
2222		2189
2223	/*}}} */	2190	/*}}} */
2224		2191
2225	bool	2192	void
2226	rxvt_term::cmd_parse ()	2193	rxvt_term::cmd_parse ()
2227	{	2194	{
2228	bool flag = false;
2229	wchar_t ch = NOCHAR;	2195	wchar_t ch = NOCHAR;
2230	char *seq_begin; // remember start of esc-sequence here	2196	char *seq_begin; // remember start of esc-sequence here
2231		2197
2232	for (;;)	2198	for (;;)
2233	{	2199	{
2234	if (ch == NOCHAR)	2200	if (expect_false (ch == NOCHAR))
2235	{	2201	{
2236	seq_begin = cmdbuf_ptr;	2202	seq_begin = cmdbuf_ptr;
2237	ch = next_char ();	2203	ch = next_char ();
2238		2204
2239	if (ch == NOCHAR)	2205	if (ch == NOCHAR)
2240	break;	2206	break;
2241	}	2207	}
2242		2208
2243	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2209	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2244	{	2210	{
2245	if (!seen_input)	2211	if (expect_false (!seen_input))
2246	{	2212	{
2247	seen_input = 1;	2213	seen_input = 1;
2248	// many badly-written programs (e.g. jed) contain a race condition:	2214	// many badly-written programs (e.g. jed) contain a race condition:
2249	// they first read the screensize and then install a SIGWINCH handler.	2215	// they first read the screensize and then install a SIGWINCH handler.
2250	// some window managers resize the window early, and these programs	2216	// some window managers resize the window early, and these programs
…		…
2263	wchar_t *str = buf;	2229	wchar_t *str = buf;
2264	wchar_t *eol = str + min (ncol, UBUFSIZ);	2230	wchar_t *eol = str + min (ncol, UBUFSIZ);
2265		2231
2266	for (;;)	2232	for (;;)
2267	{	2233	{
2268	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2234	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2269	break;	2235	break;
2270		2236
2271	*str++ = ch;	2237	*str++ = ch;
2272		2238
2273	if (ch == C0_LF || str >= eol)	2239	if (expect_false (ch == C0_LF || str >= eol))
2274	{	2240	{
2275	if (ch == C0_LF)	2241	if (ch == C0_LF)
2276	nlines++;	2242	nlines++;
2277		2243
2278	refresh_count++;	2244	refresh_count++;
2279		2245
2280	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)	2246	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2281	{	2247	{
2282	refresh_count = 0;	2248	refresh_count = 0;
2283		2249
2284	if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)	2250	if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2285	{	2251	{
2286	refreshnow = true;	2252	refreshnow = true;
2287	ch = NOCHAR;	2253	ch = NOCHAR;
2288	break;	2254	break;
2289	}	2255	}
…		…
2327	* What the heck we'll cheat and only refresh less than every page-full.	2293	* What the heck we'll cheat and only refresh less than every page-full.
2328	* if skipScroll is enabled.	2294	* if skipScroll is enabled.
2329	*/	2295	*/
2330	if (refreshnow)	2296	if (refreshnow)
2331	{	2297	{
2332	flag = true;
2333	scr_refresh ();	2298	scr_refresh ();
2334	want_refresh = 1;	2299	want_refresh = 1;
2335	}	2300	}
2336
2337	}	2301	}
2338	else	2302	else
2339	{	2303	{
2340	try	2304	try
2341	{	2305	{
…		…
2349	}	2313	}
2350		2314
2351	ch = NOCHAR;	2315	ch = NOCHAR;
2352	}	2316	}
2353	}	2317	}
2354
2355	return flag;
2356	}	2318	}
2357		2319
2358	// read the next character	2320	// read the next character
2359	wchar_t	2321	wchar_t
2360	rxvt_term::next_char () NOTHROW	2322	rxvt_term::next_char () NOTHROW
2361	{	2323	{
2362	while (cmdbuf_ptr < cmdbuf_endp)	2324	while (cmdbuf_ptr < cmdbuf_endp)
2363	{	2325	{
2364	// assume 7-bit to be ascii ALWAYS	2326	// assume 7-bit to be ascii ALWAYS
2365	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2327	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2366	return *cmdbuf_ptr++;	2328	return *cmdbuf_ptr++;
2367		2329
2368	wchar_t wc;	2330	wchar_t wc;
2369	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2331	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2370		2332
…		…
2374	cmdbuf_ptr = cmdbuf_endp;	2336	cmdbuf_ptr = cmdbuf_endp;
2375	break;	2337	break;
2376	}	2338	}
2377		2339
2378	if (len == (size_t)-1)	2340	if (len == (size_t)-1)
		2341	{
		2342	mbstate.reset (); // reset now undefined conversion state
2379	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2343	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2344	}
2380		2345
2381	// assume wchar == unicode	2346	// assume wchar == unicode
2382	cmdbuf_ptr += len;	2347	cmdbuf_ptr += len;
2383	return wc & UNICODE_MASK;	2348	return wc & UNICODE_MASK;
2384	}	2349	}
…		…
2428	/*----------------------------------------------------------------------*/	2393	/*----------------------------------------------------------------------*/
2429	#ifdef PRINTPIPE	2394	#ifdef PRINTPIPE
2430	FILE *	2395	FILE *
2431	rxvt_term::popen_printer ()	2396	rxvt_term::popen_printer ()
2432	{	2397	{
2433	FILE *stream = popen (rs[Rs_print_pipe], "w");	2398	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2434		2399
2435	if (stream == NULL)	2400	if (stream == NULL)
2436	rxvt_warn ("can't open printer pipe, not printing.\n");	2401	rxvt_warn ("can't open printer pipe, not printing.\n");
2437		2402
2438	return stream;	2403	return stream;
…		…
2449	* simulate attached vt100 printer	2414	* simulate attached vt100 printer
2450	*/	2415	*/
2451	void	2416	void
2452	rxvt_term::process_print_pipe ()	2417	rxvt_term::process_print_pipe ()
2453	{	2418	{
2454	int done;	2419	FILE *fd = popen_printer ();
2455	FILE *fd;
2456		2420
2457	if ((fd = popen_printer ()) == NULL)	2421	if (!fd)
2458	return;	2422	return;
2459		2423
2460	/*	2424	/*
2461	* Send all input to the printer until either ESC[4i or ESC[?4i	2425	* Send all input to the printer until either ESC[4i or ESC[?4i
2462	* is received.	2426	* is received.
2463	*/	2427	*/
2464	for (done = 0; !done;)	2428	for (int done = 0; !done; )
2465	{	2429	{
2466	unsigned char buf[8];	2430	unsigned char buf[8];
2467	unicode_t ch;	2431	unicode_t ch;
2468	unsigned int i, len;	2432	unsigned int i, len;
2469		2433
…		…
2500	}	2464	}
2501	}	2465	}
2502		2466
2503	pclose_printer (fd);	2467	pclose_printer (fd);
2504	}	2468	}
2505	#endif /* PRINTPIPE */	2469	#endif /* PRINTPIPE */
2506	/*}}} */	2470	/*}}} */
2507		2471
2508	/* *INDENT-OFF* */	2472	/* *INDENT-OFF* */
2509	enum {	2473	enum {
2510	C1_40 = 0x40,	2474	C1_40 = 0x40,
…		…
2614	break;	2578	break;
2615	case 'Z': /* identify the terminal type */	2579	case 'Z': /* identify the terminal type */
2616	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2580	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2617	break;	2581	break;
2618	case '<': /* turn off VT52 mode */	2582	case '<': /* turn off VT52 mode */
2619	PrivMode (0, PrivMode_vt52);	2583	set_privmode (PrivMode_vt52, 0);
2620	break;	2584	break;
2621	case 'F': /* use special graphics character set */	2585	case 'F': /* use special graphics character set */
2622	case 'G': /* use regular character set */	2586	case 'G': /* use regular character set */
2623	/* unimplemented */	2587	/* unimplemented */
2624	break;	2588	break;
…		…
2678	scr_forwardindex ();	2642	scr_forwardindex ();
2679	break;	2643	break;
2680	#endif	2644	#endif
2681	case '=':	2645	case '=':
2682	case '>':	2646	case '>':
2683	PrivMode ((ch == '='), PrivMode_aplKP);	2647	set_privmode (PrivMode_aplKP, ch == '=');
2684	break;	2648	break;
2685		2649
2686	case C1_40:	2650	case C1_40:
2687	cmd_getc ();	2651	cmd_getc ();
2688	break;	2652	break;
…		…
2727	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2691	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2728	case C1_SCI: /* ESC Z */	2692	case C1_SCI: /* ESC Z */
2729	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2693	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2730	break; /* steal obsolete ESC [ c */	2694	break; /* steal obsolete ESC [ c */
2731		2695
2732	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2696	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2733	case C1_CSI: /* ESC [ */	2697	case C1_CSI: /* ESC [ */
2734	process_csi_seq ();	2698	process_csi_seq ();
2735	break;	2699	break;
2736		2700
2737	/* 8.3.90: OPERATING SYSTEM COMMAND */	2701	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2738	case C1_OSC: /* ESC ] */	2702	case C1_OSC: /* ESC ] */
2739	process_osc_seq ();	2703	process_osc_seq ();
2740	break;	2704	break;
2741		2705
2742	/* 8.3.106: RESET TO INITIAL STATE */	2706	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2743	case 'c':	2707	case 'c':
2744	mbstate.reset ();	2708	mbstate.reset ();
2745	scr_poweron ();	2709	scr_poweron ();
2746	scrollbar_show (1);	2710	scrollBar.show (1);
2747	break;	2711	break;
2748		2712
2749	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2713	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2750	case 'n':	2714	case 'n':
2751	scr_charset_choose (2);	2715	scr_charset_choose (2);
…		…
2802		2766
2803	nargs = 0;	2767	nargs = 0;
2804		2768
2805	priv = 0;	2769	priv = 0;
2806	ch = cmd_getc ();	2770	ch = cmd_getc ();
2807	if (ch >= '<' && ch <= '?')	2771	if ((ch >= '<' && ch <= '?') || ch == '!')
		2772	{
2808	{ /* '<' '=' '>' '?' */	2773	/* '<' '=' '>' '?' '!' */
2809	priv = ch;	2774	priv = ch;
2810	ch = cmd_getc ();	2775	ch = cmd_getc ();
2811	}	2776	}
2812		2777
2813	/* read any numerical arguments */	2778	/* read any numerical arguments */
…		…
2856	{	2821	{
2857	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2822	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2823	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859	//	2824	//
2860	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2825	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2826	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2862	// that we do not support xterm mouse reporting (should be 95 when we do).	2827	// versions.
2863	//	2828	//
2864	tt_printf ("\033[>%d;94;0c", 'U');	2829	tt_printf ("\033[>%d;95;0c", 'U');
2865	}	2830	}
2866	break;	2831	break;
		2832
2867	case '?':	2833	case '?':
2868	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2834	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2869	process_terminal_mode (ch, priv, nargs, arg);	2835	process_terminal_mode (ch, priv, nargs, arg);
2870	break;	2836	break;
		2837
		2838	case '!':
		2839	if (ch == CSI_70)
		2840	{
		2841	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2842	scr_soft_reset ();
		2843
		2844	static const int pm_h[] = { 7, 25 };
		2845	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2846
		2847	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2848	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2871	}	2849	}
		2850	break;
		2851	}
		2852
2872	return;	2853	return;
2873	}	2854	}
2874		2855
2875	switch (ch)	2856	switch (ch)
2876	{	2857	{
…		…
3305		3286
3306	/*	3287	/*
3307	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3288	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3308	*/	3289	*/
3309	void	3290	void
3310	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3291	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3311	{	3292	{
3312	int color;	3293	int color;
3313	char *buf, *name;	3294	char *buf, *name;
3314	bool query = str[0] == '?' && !str[1];	3295	bool query = str[0] == '?' && !str[1];
3315	int saveop = op;	3296	int saveop = op;
…		…
3356		3337
3357	XFree (value);	3338	XFree (value);
3358	}	3339	}
3359	else	3340	else
3360	{	3341	{
3361	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3342	char *eq = strchr (str, '=');
3362		3343
3363	if (eq)	3344	if (eq)
3364	{	3345	{
3365	*eq = 0;	3346	*eq = 0;
3366	set_utf8_property (display->atom (str), eq + 1);	3347	set_utf8_property (display->atom (str), eq + 1);
…		…
3387	*buf++ = '\0';	3368	*buf++ = '\0';
3388		3369
3389	process_color_seq (op, color, name, resp);	3370	process_color_seq (op, color, name, resp);
3390	}	3371	}
3391	break;	3372	break;
		3373	case Rxvt_restoreFG:
3392	case XTerm_Color00:	3374	case XTerm_Color00:
3393	process_color_seq (op, Color_fg, str, resp);	3375	process_color_seq (op, Color_fg, str, resp);
3394	break;	3376	break;
		3377	case Rxvt_restoreBG:
3395	case XTerm_Color01:	3378	case XTerm_Color01:
3396	process_color_seq (op, Color_bg, str, resp);	3379	process_color_seq (op, Color_bg, str, resp);
3397	break;	3380	break;
3398	#ifndef NO_CURSORCOLOR	3381	#ifndef NO_CURSORCOLOR
3399	case XTerm_Color_cursor:	3382	case XTerm_Color_cursor:
…		…
3420	break;	3403	break;
3421	case URxvt_Color_IT:	3404	case URxvt_Color_IT:
3422	process_color_seq (op, Color_IT, str, resp);	3405	process_color_seq (op, Color_IT, str, resp);
3423	break;	3406	break;
3424	#endif	3407	#endif
		3408	case URxvt_Color_border:
		3409	process_color_seq (op, Color_border, str, resp);
		3410	break;
3425	#if ENABLE_TRANSPARENCY	3411	#if ENABLE_TRANSPARENCY
3426	case URxvt_Color_tint:	3412	case URxvt_Color_tint:
3427	process_color_seq (op, Color_tint, str, resp);	3413	process_color_seq (op, Color_tint, str, resp);
3428	{	3414	{
3429	bool changed = false;	3415	bool changed = false;
		3416
3430	if (ISSET_PIXCOLOR (Color_tint))	3417	if (ISSET_PIXCOLOR (Color_tint))
3431	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3418	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3432	else	3419	else
3433	changed = bgPixmap.unset_tint ();	3420	changed = bgPixmap.unset_tint ();
		3421
3434	if (changed)	3422	if (changed)
3435	update_background ();	3423	update_background ();
3436	}	3424	}
3437		3425
3438	break;	3426	break;
3439	#endif	3427	#endif
3440		3428
3441	#if XPM_BACKGROUND	3429	#if BG_IMAGE_FROM_FILE
3442	case Rxvt_Pixmap:	3430	case Rxvt_Pixmap:
3443	if (!strcmp (str, "?"))	3431	if (!strcmp (str, "?"))
3444	{	3432	{
3445	char str[256];	3433	char str[256];
3446		3434
…		…
3461	changed++;	3449	changed++;
3462	str = strchr (str, ';');	3450	str = strchr (str, ';');
3463	if (str == NULL)	3451	if (str == NULL)
3464	bgPixmap.set_defaultGeometry ();	3452	bgPixmap.set_defaultGeometry ();
3465	}	3453	}
		3454
3466	while (str)	3455	while (str)
3467	{	3456	{
3468	str++;	3457	str++;
3469	if (bgPixmap.set_geometry (str))	3458	if (bgPixmap.set_geometry (str))
3470	changed++;	3459	changed++;
3471	str = strchr (str, ';');	3460	str = strchr (str, ';');
3472	}	3461	}
		3462
3473	if (changed)	3463	if (changed)
3474	update_background ();	3464	update_background ();
3475	}	3465	}
3476	break;	3466	break;
3477	#endif	3467	#endif
3478
3479	case Rxvt_restoreFG:
3480	set_window_color (Color_fg, str);
3481	break;
3482	case Rxvt_restoreBG:
3483	set_window_color (Color_bg, str);
3484	break;
3485		3468
3486	case XTerm_logfile:	3469	case XTerm_logfile:
3487	// TODO, when secure mode?	3470	// TODO, when secure mode?
3488	break;	3471	break;
3489		3472
…		…
3556	break;	3539	break;
3557	#endif	3540	#endif
3558		3541
3559	#if ENABLE_PERL	3542	#if ENABLE_PERL
3560	case URxvt_perl:	3543	case URxvt_perl:
3561	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3544	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3562	; // no responses yet
3563	break;	3545	break;
3564	#endif	3546	#endif
3565	}	3547	}
3566	}	3548	}
3567	/*----------------------------------------------------------------------*/	3549	/*----------------------------------------------------------------------*/
…		…
3590	{	3572	{
3591	if (mode == 'r')	3573	if (mode == 'r')
3592	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3574	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3593	else	3575	else
3594	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3576	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3595	PrivMode (state, bit);	3577	set_privmode (bit, state);
3596	}	3578	}
3597		3579
3598	return state;	3580	return state;
3599	}	3581	}
3600		3582
…		…
3608	static const struct	3590	static const struct
3609	{	3591	{
3610	const int argval;	3592	const int argval;
3611	const unsigned long bit;	3593	const unsigned long bit;
3612	} argtopriv[] = {	3594	} argtopriv[] = {
3613	{ 1, PrivMode_aplCUR },	3595	{ 1, PrivMode_aplCUR }, // DECCKM
3614	{ 2, PrivMode_vt52 },	3596	{ 2, PrivMode_vt52 },
3615	{ 3, PrivMode_132 },	3597	{ 3, PrivMode_132 }, // DECCOLM
3616	{ 4, PrivMode_smoothScroll },	3598	{ 4, PrivMode_smoothScroll }, // DECSCLM
3617	{ 5, PrivMode_rVideo },	3599	{ 5, PrivMode_rVideo }, // DECSCNM
3618	{ 6, PrivMode_relOrigin },	3600	{ 6, PrivMode_relOrigin }, // DECOM
3619	{ 7, PrivMode_Autowrap },	3601	{ 7, PrivMode_Autowrap }, // DECAWM
3620	// 8, bi-directional support mode	3602	// 8, auto-repeat keys // DECARM
3621	{ 9, PrivMode_MouseX10 },	3603	{ 9, PrivMode_MouseX10 },
3622	// 18, 19 printing-related	3604	// 18 end FF to printer after print screen
		3605	// 19 Print screen prints full screen/scorll region
3623	{ 25, PrivMode_VisibleCursor },	3606	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3624	#ifdef scrollBar_esc	3607	#ifdef scrollBar_esc
3625	{ scrollBar_esc, PrivMode_scrollBar },	3608	{ scrollBar_esc, PrivMode_scrollBar },
3626	#endif	3609	#endif
3627	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3610	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3611	// 38, tektronix mode // DECTEK
3628	{ 40, PrivMode_132OK },	3612	{ 40, PrivMode_132OK },
3629	// 41 xterm more fixes NYI	3613	// 41 xterm more fixes NYI
3630	// 45 margin bell NYI	3614	// 45 margin bell NYI
3631	// 46 start logging	3615	// 46 start logging
3632	{ 47, PrivMode_Screen },	3616	{ 47, PrivMode_Screen },
3633	{ 66, PrivMode_aplKP },	3617	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3634	#ifndef NO_BACKSPACE_KEY	3618	#ifndef NO_BACKSPACE_KEY
3635	{ 67, PrivMode_BackSpace },	3619	{ 67, PrivMode_BackSpace }, // DECBKM
3636	#endif	3620	#endif
3637	{ 1000, PrivMode_MouseX11 },	3621	{ 1000, PrivMode_MouseX11 },
3638	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3622	{ 1002, PrivMode_MouseBtnEvent },
3639	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3623	{ 1003, PrivMode_MouseAnyEvent },
3640	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3641	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3624	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3642	{ 1011, PrivMode_Keypress }, // rxvt extension	3625	{ 1011, PrivMode_Keypress }, // rxvt extension
3643	// 1035 enable modifiers for alt, numlock NYI	3626	// 1035 enable modifiers for alt, numlock NYI
3644	// 1036 send ESC for meta keys NYI	3627	// 1036 send ESC for meta keys NYI
3645	// 1037 send DEL for keypad delete NYI	3628	// 1037 send DEL for keypad delete NYI
3646	{ 1047, PrivMode_Screen },	3629	{ 1047, PrivMode_Screen },
3647	// 1048 save and restore cursor	3630	// 1048 save and restore cursor
3648	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3631	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3649	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3632	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3633	{ 2004, PrivMode_BracketPaste },
3650	};	3634	};
3651		3635
3652	if (nargs == 0)	3636	if (nargs == 0)
3653	return;	3637	return;
3654		3638
…		…
3679		3663
3680	scr_touch (true);	3664	scr_touch (true);
3681	break;	3665	break;
3682	#endif	3666	#endif
3683	case 1048: /* alternative cursor save */	3667	case 1048: /* alternative cursor save */
3684	case 1049:
3685	if (option (Opt_secondaryScreen))	3668	if (option (Opt_secondaryScreen))
3686	if (mode == 0)	3669	if (mode == 0)
3687	scr_cursor (RESTORE);	3670	scr_cursor (RESTORE);
3688	else if (mode == 1)	3671	else if (mode == 1)
3689	scr_cursor (SAVE);	3672	scr_cursor (SAVE);
…		…
3698	case 2: /* VT52 mode */	3681	case 2: /* VT52 mode */
3699	/* oddball mode. should be set regardless of set/reset	3682	/* oddball mode. should be set regardless of set/reset
3700	* parameter. Return from VT52 mode with an ESC < from	3683	* parameter. Return from VT52 mode with an ESC < from
3701	* within VT52 mode	3684	* within VT52 mode
3702	*/	3685	*/
3703	PrivMode (1, PrivMode_vt52);	3686	set_privmode (PrivMode_vt52, 1);
3704	break;	3687	break;
3705	case 3: /* 80/132 */	3688	case 3: /* 80/132 */
3706	if (priv_modes & PrivMode_132OK)	3689	if (priv_modes & PrivMode_132OK)
3707	set_widthheight (((state ? 132 : 80) * fwidth), height);	3690	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3708	break;	3691	break;
3709	case 4: /* smooth scrolling */	3692	case 4: /* smooth scrolling */
3710	set_option (Opt_jumpScroll, !state);	3693	set_option (Opt_jumpScroll, !state);
3711	break;	3694	break;
3712	case 5: /* reverse video */	3695	case 5: /* reverse video */
…		…
3719	scr_autowrap (state);	3702	scr_autowrap (state);
3720	break;	3703	break;
3721	/* case 8: - auto repeat, can't do on a per window basis */	3704	/* case 8: - auto repeat, can't do on a per window basis */
3722	case 9: /* X10 mouse reporting */	3705	case 9: /* X10 mouse reporting */
3723	if (state) /* orthogonal */	3706	if (state) /* orthogonal */
3724	priv_modes &= ~PrivMode_MouseX11;	3707	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3725	break;	3708	break;
3726	#ifdef scrollBar_esc	3709	#ifdef scrollBar_esc
3727	case scrollBar_esc:	3710	case scrollBar_esc:
3728	if (scrollbar_mapping (state))	3711	if (scrollBar.map (state))
3729	{	3712	{
3730	resize_all_windows (0, 0, 0);	3713	resize_all_windows (0, 0, 0);
3731	scr_touch (true);	3714	scr_touch (true);
3732	}	3715	}
3733	break;	3716	break;
…		…
3742	break;	3725	break;
3743	/* case 66: - application key pad */	3726	/* case 66: - application key pad */
3744	/* case 67: - backspace key */	3727	/* case 67: - backspace key */
3745	case 1000: /* X11 mouse reporting */	3728	case 1000: /* X11 mouse reporting */
3746	if (state) /* orthogonal */	3729	if (state) /* orthogonal */
3747	priv_modes &= ~PrivMode_MouseX10;	3730	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3748	break;	3731	break;
3749	#if 0
3750	case 1001:	3732	case 1002:
3751	break; /* X11 mouse highlighting */	3733	case 1003:
3752	#endif	3734	if (state)
		3735	{
		3736	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
		3737	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3738	vt_emask_mouse = PointerMotionMask;
		3739	}
		3740	else
		3741	vt_emask_mouse = NoEventMask;
		3742
		3743	vt_select_input ();
		3744	break;
3753	case 1010: /* scroll to bottom on TTY output inhibit */	3745	case 1010: /* scroll to bottom on TTY output inhibit */
3754	set_option (Opt_scrollTtyOutput, !state);	3746	set_option (Opt_scrollTtyOutput, !state);
3755	break;	3747	break;
3756	case 1011: /* scroll to bottom on key press */	3748	case 1011: /* scroll to bottom on key press */
3757	set_option (Opt_scrollTtyKeypress, state);	3749	set_option (Opt_scrollTtyKeypress, state);
3758	break;	3750	break;
3759	case 1047: /* secondary screen w/ clearing last */	3751	case 1047: /* secondary screen w/ clearing last */
3760	if (option (Opt_secondaryScreen))	3752	if (option (Opt_secondaryScreen))
3761	if (current_screen != PRIMARY)	3753	if (!state)
3762	scr_erase_screen (2);	3754	scr_erase_screen (2);
		3755
3763	scr_change_screen (state);	3756	scr_change_screen (state);
3764	break;	3757	break;
3765	case 1049: /* secondary screen w/ clearing first */	3758	case 1049: /* secondary screen w/ clearing first */
		3759	if (option (Opt_secondaryScreen))
		3760	if (state)
		3761	scr_cursor (SAVE);
		3762
3766	scr_change_screen (state);	3763	scr_change_screen (state);
		3764
3767	if (option (Opt_secondaryScreen))	3765	if (option (Opt_secondaryScreen))
3768	if (current_screen != PRIMARY)	3766	if (state)
3769	scr_erase_screen (2);	3767	scr_erase_screen (2);
		3768	else
		3769	scr_cursor (RESTORE);
3770	break;	3770	break;
3771	default:	3771	default:
3772	break;	3772	break;
3773	}	3773	}
3774	}	3774	}
…		…
3934	rxvt_term::process_graphics ()	3934	rxvt_term::process_graphics ()
3935	{	3935	{
3936	unicode_t ch, cmd = cmd_getc ();	3936	unicode_t ch, cmd = cmd_getc ();
3937		3937
3938	if (cmd == 'Q')	3938	if (cmd == 'Q')
		3939	{
3939	{ /* query graphics */	3940	/* query graphics */
3940	tt_printf ("\033G0\012"); /* no graphics */	3941	tt_printf ("\033G0\012"); /* no graphics */
3941	return;	3942	return;
3942	}	3943	}
3943	/* swallow other graphics sequences until terminating ':' */	3944	/* swallow other graphics sequences until terminating ':' */
3944	do	3945	do
…		…
3994	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3995	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3995		3996
3996	memcpy (v_buffer + v_buflen, data, len);	3997	memcpy (v_buffer + v_buflen, data, len);
3997	v_buflen += len;	3998	v_buflen += len;
3998		3999
3999	pty_ev.set (EVENT_READ | EVENT_WRITE);	4000	pty_ev.set (ev::READ | ev::WRITE);
4000	}	4001	}
4001		4002
4002	void rxvt_term::pty_write ()	4003	void rxvt_term::pty_write ()
4003	{	4004	{
4004	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4005	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4009		4010
4010	if (v_buflen == 0)	4011	if (v_buflen == 0)
4011	{	4012	{
4012	free (v_buffer);	4013	free (v_buffer);
4013	v_buffer = 0;	4014	v_buffer = 0;
4014	v_buflen = 0;
4015		4015
4016	pty_ev.set (EVENT_READ);	4016	pty_ev.set (ev::READ);
4017	return;	4017	return;
4018	}	4018	}
4019		4019
4020	memmove (v_buffer, v_buffer + written, v_buflen);	4020	memmove (v_buffer, v_buffer + written, v_buflen);
4021	}	4021	}
4022	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4022	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4023	pty_ev.set (EVENT_READ);	4023	pty_ev.set (ev::READ);
4024	}	4024	}
4025		4025
4026	/*----------------------- end-of-file (C source) -----------------------*/	4026	/*----------------------- end-of-file (C source) -----------------------*/
4027		4027

Diff Legend

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