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.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 2011 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* 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
34	* 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
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
162		162
163	void	163	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font *f = (*fs)[fs->find_font (ch)];
168	wchar_t *chr, *alloc, ch2, *fname;	167	wchar_t *chr, *alloc, ch2, **fname;
169	int len;	168	int len;
170
171	fname = rxvt_utf8towcs (f->name);
172		169
173	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
174	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
175	{	172	{
176	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
197	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
198	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
199	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
201		198
		199	int width = 0;
		200	fname = rxvt_temp_buf<wchar_t *> (len);
		201	for (int i = 0; i < len; i++)
		202	{
		203	rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
		204	fname[i] = rxvt_utf8towcs (f->name);
202	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
203		207
204	max_it (width, 8+5); // for char + hex	208	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
206		210
207	if (y >= 0)	211	if (y >= 0)
208	{	212	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210	x = 0;	214	x = 0;
211	}	215	}
212		216
213	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
214		218
215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216		220
217	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
218	{	222	{
…		…
237	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
238	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
240	// }	244	// }
241	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
242	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
243
244	free (fname);	249	free (fname[i]);
		250	}
245		251
246	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
247	if (alloc)	253	if (alloc)
248	delete [] alloc;	254	delete [] alloc;
249	# endif	255	# endif
…		…
282	}	288	}
283		289
284	static int	290	static int
285	hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
286	{	292	{
287	// check wether this event corresponds to a hex digit	293	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	294	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	295	for (int index = 0; index < 8; index++)
290	{	296	{
291	KeySym k = XLookupKeysym (&ev, index);	297	KeySym k = XLookupKeysym (&ev, index);
292		298
…		…
334	# endif	340	# endif
335	#endif	341	#endif
336	return keysym;	342	return keysym;
337	}	343	}
338		344
		345	static inline int
		346	map_function_key (KeySym keysym)
		347	{
		348	int param = 0;
		349
		350	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		351	{
		352	param = 11 + keysym - XK_F1;
		353	if (keysym >= XK_F17)
		354	param += 4;
		355	else if (keysym >= XK_F15)
		356	param += 3;
		357	else if (keysym >= XK_F11)
		358	param += 2;
		359	else if (keysym >= XK_F6)
		360	param += 1;
		361	}
		362	else
		363	switch (keysym)
		364	{
		365	case XK_Find:
		366	param = 1;
		367	break;
		368	case XK_Insert:
		369	param = 2;
		370	break;
		371	#ifdef DXK_Remove
		372	case DXK_Remove:
		373	#endif
		374	case XK_Execute:
		375	param = 3;
		376	break;
		377	case XK_Select:
		378	param = 4;
		379	break;
		380	#ifndef UNSHIFTED_SCROLLKEYS
		381	case XK_Prior:
		382	param = 5;
		383	break;
		384	case XK_Next:
		385	param = 6;
		386	break;
		387	case XK_Home:
		388	param = 7;
		389	break;
		390	case XK_End:
		391	param = 8;
		392	break;
		393	#endif
		394	case XK_Help:
		395	param = 28;
		396	break;
		397	case XK_Menu:
		398	param = 29;
		399	break;
		400	}
		401	return param;
		402	}
		403
339	void	404	void
340	rxvt_term::key_press (XKeyEvent &ev)	405	rxvt_term::key_press (XKeyEvent &ev)
341	{	406	{
342	int ctrl, meta, shft, len;	407	int ctrl, meta, shft, len;
343	KeySym keysym;	408	KeySym keysym;
…		…
356	* Always permit `shift' to override the current setting	421	* Always permit `shift' to override the current setting
357	*/	422	*/
358	shft = ev.state & ShiftMask;	423	shft = ev.state & ShiftMask;
359	ctrl = ev.state & ControlMask;	424	ctrl = ev.state & ControlMask;
360	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
361
362	if (numlock_state || (ev.state & ModNumLockMask))
363	{
364	numlock_state = (ev.state & ModNumLockMask);
365	PrivMode ((!numlock_state), PrivMode_aplKP);
366	}
367		426
368	kbuf[0] = 0;	427	kbuf[0] = 0;
369		428
370	#ifdef USE_XIM	429	#ifdef USE_XIM
371	if (Input_Context)	430	if (Input_Context)
…		…
446	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
447	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
448	#else	507	#else
449	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
450	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
451	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
452	{	513	{
453	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
454	return;	515	return;
455	}	516	}
…		…
520	}	581	}
521	}	582	}
522		583
523	#if ENABLE_FRILLS || ISO_14755	584	#if ENABLE_FRILLS || ISO_14755
524	// ISO 14755 support	585	// ISO 14755 support
525	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
526	{	587	{
527	int hv;	588	int hv;
528		589
529	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
530	&& (keysym == XK_space || keysym == XK_KP_Space	591	&& (keysym == XK_space || keysym == XK_KP_Space
…		…
560	scr_overlay_off ();	621	scr_overlay_off ();
561	# endif	622	# endif
562	iso14755buf = 0;	623	iso14755buf = 0;
563	}	624	}
564	}	625	}
		626	else if (option (Opt_iso14755) &&
565	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
566	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	628	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
567	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
568	{	630	{
569	iso14755buf |= ISO_14755_STARTED;	631	iso14755buf |= ISO_14755_STARTED;
570	# if ISO_14755	632	# if ISO_14755
571	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
582	}	644	}
583	#endif	645	#endif
584		646
585	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
586	{	648	{
587	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	649	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
588	unsigned int newlen = 1;	650	unsigned int newlen = 1;
589		651
		652	if (ev.state & ModNumLockMask)
		653	kp = false;
		654
590	switch (translate_keypad (keysym, kp))	655	keysym = translate_keypad (keysym, kp);
		656
		657	switch (keysym)
		658	{
		659	#ifndef NO_BACKSPACE_KEY
		660	case XK_BackSpace:
		661	if (priv_modes & PrivMode_HaveBackSpace)
		662	{
		663	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		664	^ !!ctrl) ? '\b' : '\177';
		665	kbuf[1] = '\0';
		666	}
		667	else
		668	strcpy (kbuf, rs[Rs_backspace_key]);
		669	break;
		670	#endif
		671	#ifndef NO_DELETE_KEY
		672	case XK_Delete:
		673	strcpy (kbuf, rs[Rs_delete_key]);
		674	break;
		675	#endif
		676	case XK_Tab:
		677	if (shft)
		678	strcpy (kbuf, "\033[Z");
		679	else
		680	{
		681	#ifdef CTRL_TAB_MAKES_META
		682	if (ctrl)
		683	meta = 1;
		684	#endif
		685	#ifdef MOD4_TAB_MAKES_META
		686	if (ev.state & Mod4Mask)
		687	meta = 1;
		688	#endif
		689	newlen = 0;
		690	}
		691	break;
		692
		693	case XK_Up: /* "\033[A" */
		694	case XK_Down: /* "\033[B" */
		695	case XK_Right: /* "\033[C" */
		696	case XK_Left: /* "\033[D" */
		697	strcpy (kbuf, "\033[Z");
		698	kbuf[2] = "DACB"[keysym - XK_Left];
		699	/* do Shift first */
		700	if (shft)
		701	kbuf[2] = "dacb"[keysym - XK_Left];
		702	else if (ctrl)
		703	{
		704	kbuf[1] = 'O';
		705	kbuf[2] = "dacb"[keysym - XK_Left];
		706	}
		707	else if (priv_modes & PrivMode_aplCUR)
		708	kbuf[1] = 'O';
		709	break;
		710
		711	case XK_KP_Enter:
		712	/* allow shift to override */
		713	if (kp)
		714	{
		715	strcpy (kbuf, "\033OM");
		716	break;
		717	}
		718
		719	/* FALLTHROUGH */
		720
		721	case XK_Return:
		722	if (priv_modes & PrivMode_LFNL)
		723	{
		724	kbuf[0] = '\015';
		725	kbuf[1] = '\012';
		726	kbuf[2] = '\0';
		727	}
		728	else
		729	{
		730	kbuf[0] = '\015';
		731	kbuf[1] = '\0';
		732	}
		733	break;
		734
		735	case XK_KP_F1: /* "\033OP" */
		736	case XK_KP_F2: /* "\033OQ" */
		737	case XK_KP_F3: /* "\033OR" */
		738	case XK_KP_F4: /* "\033OS" */
		739	strcpy (kbuf, "\033OP");
		740	kbuf[2] += (keysym - XK_KP_F1);
		741	break;
		742
		743	case XK_KP_Multiply: /* "\033Oj" : "*" */
		744	case XK_KP_Add: /* "\033Ok" : "+" */
		745	case XK_KP_Separator: /* "\033Ol" : "," */
		746	case XK_KP_Subtract: /* "\033Om" : "-" */
		747	case XK_KP_Decimal: /* "\033On" : "." */
		748	case XK_KP_Divide: /* "\033Oo" : "/" */
		749	case XK_KP_0: /* "\033Op" : "0" */
		750	case XK_KP_1: /* "\033Oq" : "1" */
		751	case XK_KP_2: /* "\033Or" : "2" */
		752	case XK_KP_3: /* "\033Os" : "3" */
		753	case XK_KP_4: /* "\033Ot" : "4" */
		754	case XK_KP_5: /* "\033Ou" : "5" */
		755	case XK_KP_6: /* "\033Ov" : "6" */
		756	case XK_KP_7: /* "\033Ow" : "7" */
		757	case XK_KP_8: /* "\033Ox" : "8" */
		758	case XK_KP_9: /* "\033Oy" : "9" */
		759	/* allow shift to override */
		760	if (kp)
		761	{
		762	strcpy (kbuf, "\033Oj");
		763	kbuf[2] += (keysym - XK_KP_Multiply);
		764	}
		765	else
		766	{
		767	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		768	kbuf[1] = '\0';
		769	}
		770	break;
		771
		772	default:
591	{	773	{
592	#ifndef NO_BACKSPACE_KEY	774	int param = map_function_key (keysym);
593	case XK_BackSpace:	775	if (param > 0)
594	if (priv_modes & PrivMode_HaveBackSpace)	776	sprintf (kbuf,"\033[%d~", param);
595	{
596	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
597	^ !!ctrl) ? '\b' : '\177';
598	kbuf[1] = '\0';
599	}
600	else	777	else
601	strcpy (kbuf, rs[Rs_backspace_key]);
602	break;
603	#endif
604	#ifndef NO_DELETE_KEY
605	case XK_Delete:
606	strcpy (kbuf, rs[Rs_delete_key]);
607	break;
608	#endif
609	case XK_Tab:
610	if (shft)
611	strcpy (kbuf, "\033[Z");
612	else
613	{
614	#ifdef CTRL_TAB_MAKES_META
615	if (ctrl)
616	meta = 1;
617	#endif
618	#ifdef MOD4_TAB_MAKES_META
619	if (ev.state & Mod4Mask)
620	meta = 1;
621	#endif
622	newlen = 0;
623	}
624	break;
625
626	case XK_Up: /* "\033[A" */
627	case XK_Down: /* "\033[B" */
628	case XK_Right: /* "\033[C" */
629	case XK_Left: /* "\033[D" */
630	strcpy (kbuf, "\033[Z");
631	kbuf[2] = "DACB"[keysym - XK_Left];
632	/* do Shift first */
633	if (shft)
634	kbuf[2] = "dacb"[keysym - XK_Left];
635	else if (ctrl)
636	{
637	kbuf[1] = 'O';
638	kbuf[2] = "dacb"[keysym - XK_Left];
639	}
640	else if (priv_modes & PrivMode_aplCUR)
641	kbuf[1] = 'O';
642	break;
643
644	#ifndef UNSHIFTED_SCROLLKEYS
645	case XK_Prior:
646	strcpy (kbuf, "\033[5~");
647	break;
648	case XK_Next:
649	strcpy (kbuf, "\033[6~");
650	break;
651	#endif
652	case XK_KP_Enter:
653	/* allow shift to override */
654	if (kp)
655	{
656	strcpy (kbuf, "\033OM");
657	break;
658	}
659
660	/* FALLTHROUGH */
661
662	case XK_Return:
663	if (priv_modes & PrivMode_LFNL)
664	{
665	kbuf[0] = '\015';
666	kbuf[1] = '\012';
667	kbuf[2] = '\0';
668	}
669	else
670	{
671	kbuf[0] = '\015';
672	kbuf[1] = '\0';
673	}
674	break;
675
676	case XK_KP_F1: /* "\033OP" */
677	case XK_KP_F2: /* "\033OQ" */
678	case XK_KP_F3: /* "\033OR" */
679	case XK_KP_F4: /* "\033OS" */
680	strcpy (kbuf, "\033OP");
681	kbuf[2] += (keysym - XK_KP_F1);
682	break;
683
684	case XK_KP_Multiply: /* "\033Oj" : "*" */
685	case XK_KP_Add: /* "\033Ok" : "+" */
686	case XK_KP_Separator: /* "\033Ol" : "," */
687	case XK_KP_Subtract: /* "\033Om" : "-" */
688	case XK_KP_Decimal: /* "\033On" : "." */
689	case XK_KP_Divide: /* "\033Oo" : "/" */
690	case XK_KP_0: /* "\033Op" : "0" */
691	case XK_KP_1: /* "\033Oq" : "1" */
692	case XK_KP_2: /* "\033Or" : "2" */
693	case XK_KP_3: /* "\033Os" : "3" */
694	case XK_KP_4: /* "\033Ot" : "4" */
695	case XK_KP_5: /* "\033Ou" : "5" */
696	case XK_KP_6: /* "\033Ov" : "6" */
697	case XK_KP_7: /* "\033Ow" : "7" */
698	case XK_KP_8: /* "\033Ox" : "8" */
699	case XK_KP_9: /* "\033Oy" : "9" */
700	/* allow shift to override */
701	if (kp)
702	{
703	strcpy (kbuf, "\033Oj");
704	kbuf[2] += (keysym - XK_KP_Multiply);
705	}
706	else
707	{
708	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
709	kbuf[1] = '\0';
710	}
711	break;
712
713	case XK_Find:
714	strcpy (kbuf, "\033[1~");
715	break;
716
717	case XK_Insert:
718	strcpy (kbuf, "\033[2~");
719	break;
720	#ifdef DXK_Remove /* support for DEC remove like key */
721	case DXK_Remove:
722	/* FALLTHROUGH */
723	#endif
724	case XK_Execute:
725	strcpy (kbuf, "\033[3~");
726	break;
727	case XK_Select:
728	strcpy (kbuf, "\033[4~");
729	break;
730	case XK_End:
731	strcpy (kbuf, KS_END);
732	break;
733	case XK_Home:
734	strcpy (kbuf, KS_HOME);
735	break;
736
737	#define FKEY(n, fkey) \
738	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
739
740	case XK_F1: /* "\033[11~" */
741	case XK_F2: /* "\033[12~" */
742	case XK_F3: /* "\033[13~" */
743	case XK_F4: /* "\033[14~" */
744	case XK_F5: /* "\033[15~" */
745	FKEY (11, XK_F1);
746	break;
747	case XK_F6: /* "\033[17~" */
748	case XK_F7: /* "\033[18~" */
749	case XK_F8: /* "\033[19~" */
750	case XK_F9: /* "\033[20~" */
751	case XK_F10: /* "\033[21~" */
752	FKEY (17, XK_F6);
753	break;
754	case XK_F11: /* "\033[23~" */
755	case XK_F12: /* "\033[24~" */
756	case XK_F13: /* "\033[25~" */
757	case XK_F14: /* "\033[26~" */
758	FKEY (23, XK_F11);
759	break;
760	case XK_F15: /* "\033[28~" */
761	case XK_F16: /* "\033[29~" */
762	FKEY (28, XK_F15);
763	break;
764	case XK_Help: /* "\033[28~" */
765	FKEY (28, XK_Help);
766	break;
767	case XK_Menu: /* "\033[29~" */
768	FKEY (29, XK_Menu);
769	break;
770	case XK_F17: /* "\033[31~" */
771	case XK_F18: /* "\033[32~" */
772	case XK_F19: /* "\033[33~" */
773	case XK_F20: /* "\033[34~" */
774	case XK_F21: /* "\033[35~" */
775	case XK_F22: /* "\033[36~" */
776	case XK_F23: /* "\033[37~" */
777	case XK_F24: /* "\033[38~" */
778	case XK_F25: /* "\033[39~" */
779	case XK_F26: /* "\033[40~" */
780	case XK_F27: /* "\033[41~" */
781	case XK_F28: /* "\033[42~" */
782	case XK_F29: /* "\033[43~" */
783	case XK_F30: /* "\033[44~" */
784	case XK_F31: /* "\033[45~" */
785	case XK_F32: /* "\033[46~" */
786	case XK_F33: /* "\033[47~" */
787	case XK_F34: /* "\033[48~" */
788	case XK_F35: /* "\033[49~" */
789	FKEY (31, XK_F17);
790	break;
791	#undef FKEY
792	default:
793	newlen = 0;	778	newlen = 0;
794	break;
795	}	779	}
		780	break;
		781	}
796		782
797	if (newlen)	783	if (newlen)
798	len = strlen (kbuf);	784	len = strlen (kbuf);
799		785
800	/*	786	/*
801	* Pass meta for all function keys, if 'meta' option set	787	* Pass meta for all function keys, if 'meta' option set
802	*/	788	*/
803	#ifdef META8_OPTION	789	#ifdef META8_OPTION
…		…
903	commit_iso14755 ();	889	commit_iso14755 ();
904		890
905	return;	891	return;
906	}	892	}
907		893
908	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	894	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909	if (i[0] == keysym)	895	if (i[0] == keysym)
910	{	896	{
911	iso14755buf = ISO_14755_51 | i[1];	897	iso14755buf = ISO_14755_51 | i[1];
912	commit_iso14755 ();	898	commit_iso14755 ();
913		899
…		…
950	else if (keysym == XK_Control_L || keysym == XK_Control_R)	936	else if (keysym == XK_Control_L || keysym == XK_Control_R)
951	mouse_slip_wheel_speed = 0;	937	mouse_slip_wheel_speed = 0;
952	#endif	938	#endif
953	}	939	}
954		940
955	#if defined (KEYSYM_RESOURCE)
956	unsigned int
957	rxvt_term::cmd_write (const char *str, unsigned int count)
958	{
959	unsigned int n, s;
960
961	n = cmdbuf_ptr - cmdbuf_base;
962	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
963
964	if (n > 0 && s < count)
965	{
966	memmove (cmdbuf_base, cmdbuf_ptr,
967	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
968	cmdbuf_ptr = cmdbuf_base;
969	cmdbuf_endp -= n;
970	s += n;
971	}
972
973	if (count > s)
974	{
975	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
976	count = s;
977	}
978
979	for (; count--;)
980	*cmdbuf_endp++ = *str++;
981
982	cmd_parse ();
983
984	return 0;
985	}
986	#endif
987
988	void	941	void
989	rxvt_term::flush ()	942	rxvt_term::flush ()
990	{	943	{
991	flush_ev.stop ();	944	flush_ev.stop ();
992		945
993	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_BG_PIXMAP
994	if (bgPixmap.check_clearChanged ())	947	if (bg_flags & BG_NEEDS_REFRESH)
995	{	948	{
996	// scr_clear (true); This needs to be researched further!	949	bg_flags &= ~BG_NEEDS_REFRESH;
997	scr_touch (false);	950	scr_touch (false);
998	}	951	}
999	#endif	952	#endif
1000		953
1001	if (want_refresh)	954	if (want_refresh)
…		…
1037	}	990	}
1038	while (row < end_row);	991	while (row < end_row);
1039	}	992	}
1040		993
1041	scr_refresh ();	994	scr_refresh ();
1042	scrollbar_show (1);	995	scrollBar.show (1);
1043	#ifdef USE_XIM	996	#ifdef USE_XIM
1044	IMSendSpot ();	997	IMSendSpot ();
1045	#endif	998	#endif
1046	}	999	}
1047		1000
1048	display->flush ();	1001	display->flush ();
1049	}	1002	}
1050		1003
1051	/* checks wether a refresh is requested and starts the refresh timer */	1004	/* checks whether a refresh is requested and starts the refresh timer */
1052	void	1005	void
1053	rxvt_term::refresh_check ()	1006	rxvt_term::refresh_check ()
1054	{	1007	{
1055	if (want_refresh && !flush_ev.is_active ())	1008	if (want_refresh && !flush_ev.is_active ())
1056	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1009	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1149	{	1102	{
1150	// this should really be sched_yield(), but the linux guys thought	1103	// this should really be sched_yield(), but the linux guys thought
1151	// that giving a process calling sched_yield () less cpu time than	1104	// that giving a process calling sched_yield () less cpu time than
1152	// ones with high nice levels is a useful thing to do. It surely is is	1105	// ones with high nice levels is a useful thing to do. It surely is is
1153	// allowed by the sus... as is returning ENOSYS.	1106	// allowed by the sus... as is returning ENOSYS.
		1107	// since the linux guys additionally thought that breaking the only
		1108	// known workaround against their unusable sched_yield hack is cool,
		1109	// we just nanosleep a bit and hope for the best.
1154		1110
1155	struct timespec ts = { 0, 0 };	1111	struct timespec ts = { 0, 1000 };
1156	nanosleep (&ts, 0);	1112	nanosleep (&ts, 0);
1157		1113
1158	w.stop ();	1114	w.stop ();
1159	}	1115	}
1160		1116
…		…
1163	{	1119	{
1164	}	1120	}
1165	} event_handler;	1121	} event_handler;
1166	#endif	1122	#endif
1167		1123
		1124	/* make sure all the cmd data is at beginning of cmdbuf */
		1125	void
		1126	rxvt_term::cmdbuf_reify ()
		1127	{
		1128	if (cmdbuf_ptr == cmdbuf_base)
		1129	return;
		1130
		1131	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1132
		1133	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1134	cmdbuf_ptr = cmdbuf_base;
		1135	cmdbuf_endp = cmdbuf_ptr + used;
		1136
		1137	}
		1138
		1139	#if defined (KEYSYM_RESOURCE)
		1140	void
		1141	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1142	{
		1143	cmdbuf_reify ();
		1144
		1145	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1146
		1147	if (count > avail)
		1148	return;
		1149
		1150	memcpy (cmdbuf_endp, str, count);
		1151	cmdbuf_endp += count;
		1152
		1153	cmd_parse ();
		1154	}
		1155	#endif
		1156
1168	bool	1157	bool
1169	rxvt_term::pty_fill ()	1158	rxvt_term::pty_fill ()
1170	{	1159	{
1171	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1160	cmdbuf_reify ();
1172		1161
1173	if (CBUFSIZ == n)	1162	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1174	{	1163
1175	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1164	if (!avail)
1176	n = 0;
1177	}	1165	{
1178		1166	// normally this indicates a "too long" command sequence - just drop the data we have
1179	memmove (cmdbuf_base, cmdbuf_ptr, n);
1180	cmdbuf_ptr = cmdbuf_base;	1167	cmdbuf_ptr = cmdbuf_base;
1181	cmdbuf_endp = cmdbuf_ptr + n;	1168	cmdbuf_endp = cmdbuf_ptr;
		1169	avail = CBUFSIZ;
		1170	}
1182		1171
1183	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1172	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1184		1173
1185	if (r > 0)	1174	if (r > 0)
1186	{	1175	{
1187	cmdbuf_endp += r;	1176	cmdbuf_endp += r;
1188	return true;	1177	return true;
…		…
1210	{	1199	{
1211	make_current ();	1200	make_current ();
1212		1201
1213	if (revents & ev::READ)	1202	if (revents & ev::READ)
1214	// loop, but don't allow a single term to monopolize us	1203	// loop, but don't allow a single term to monopolize us
1215	while (pty_fill ())	1204	for (int i = CBUFCNT; i-- && pty_fill (); )
1216	if (cmd_parse ())	1205	cmd_parse ();
1217	break;
1218		1206
1219	if (revents & ev::WRITE)	1207	if (revents & ev::WRITE)
1220	pty_write ();	1208	pty_write ();
1221		1209
1222	refresh_check ();	1210	refresh_check ();
…		…
1263	{	1251	{
1264	int button_number, key_state = 0;	1252	int button_number, key_state = 0;
1265	int x, y;	1253	int x, y;
1266	int code = 32;	1254	int code = 32;
1267		1255
1268	x = Pixel2Col (ev.x);	1256	x = Pixel2Col (ev.x) + 1;
1269	y = Pixel2Row (ev.y);	1257	y = Pixel2Row (ev.y) + 1;
		1258
1270	if (ev.type == MotionNotify)	1259	if (ev.type == MotionNotify)
1271	{	1260	{
1272	if (x == mouse_row && y == mouse_col)	1261	if (x == mouse_row && y == mouse_col)
1273	return;	1262	return;
		1263
1274	mouse_row = x;	1264	mouse_row = x;
1275	mouse_col = y;	1265	mouse_col = y;
1276	code += 32;	1266	code += 32;
1277	}	1267	}
1278		1268
…		…
1281	else	1271	else
1282	{	1272	{
1283	button_number = MEvent.button - Button1;	1273	button_number = MEvent.button - Button1;
1284	/* add 0x3D for wheel events, like xterm does */	1274	/* add 0x3D for wheel events, like xterm does */
1285	if (button_number >= 3)	1275	if (button_number >= 3)
1286	button_number += (64 - 3);	1276	button_number += 64 - 3;
1287	}	1277	}
1288		1278
1289	if (priv_modes & PrivMode_MouseX10)	1279	if (priv_modes & PrivMode_MouseX10)
1290	{	1280	{
1291	/*	1281	/*
…		…
1323	fputc ('A', stderr);	1313	fputc ('A', stderr);
1324	if (key_state & 32)	1314	if (key_state & 32)
1325	fputc ('2', stderr);	1315	fputc ('2', stderr);
1326	fprintf (stderr, "]: <%d>, %d/%d\n",	1316	fprintf (stderr, "]: <%d>, %d/%d\n",
1327	button_number,	1317	button_number,
1328	x + 1,	1318	x,
1329	y + 1);	1319	y);
1330	#endif	1320	#endif
1331		1321
		1322	#if ENABLE_FRILLS
		1323	if (priv_modes & PrivMode_ExtMouseRight)
		1324	tt_printf ("\033[%d;%d;%dM",
		1325	code + button_number + key_state,
		1326	x,
		1327	y);
		1328	else if (priv_modes & PrivMode_ExtModeMouse)
		1329	tt_printf ("\033[M%c%lc%lc",
		1330	code + button_number + key_state,
		1331	wint_t (32 + x),
		1332	wint_t (32 + y));
		1333	else
		1334	#endif
1332	tt_printf ("\033[M%c%c%c",	1335	tt_printf ("\033[M%c%c%c",
1333	(code + button_number + key_state),	1336	code + button_number + key_state,
1334	(32 + x + 1),	1337	32 + x,
1335	(32 + y + 1));	1338	32 + y);
1336	}	1339	}
1337		1340
1338	/*{{{ process an X event */	1341	/*{{{ process an X event */
1339	void	1342	void
1340	rxvt_term::x_cb (XEvent &ev)	1343	rxvt_term::x_cb (XEvent &ev)
…		…
1442	&& ev.xfocus.mode != NotifyGrab)	1445	&& ev.xfocus.mode != NotifyGrab)
1443	focus_out ();	1446	focus_out ();
1444	break;	1447	break;
1445		1448
1446	case ConfigureNotify:	1449	case ConfigureNotify:
1447	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449	szHint.width, szHint.height);*/
1450	if (ev.xconfigure.window == parent[0])	1450	if (ev.xconfigure.window == parent)
1451	{	1451	{
1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453	;	1453	;
		1454
		1455	#ifdef HAVE_BG_PIXMAP
		1456	bool moved = false;
		1457	if (bg_window_position_sensitive ())
		1458	{
		1459	int x, y;
		1460	if (ev.xconfigure.send_event)
		1461	{
		1462	x = ev.xconfigure.x;
		1463	y = ev.xconfigure.y;
		1464	}
		1465	else
		1466	get_window_origin (x, y);
		1467
		1468	if (bg_set_position (x, y)
		1469	|| !(bg_flags & BG_IS_VALID))
		1470	moved = true;
		1471	}
		1472	#endif
1454		1473
1455	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1474	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1456	{	1475	{
1457	seen_resize = 1;	1476	seen_resize = 1;
1458	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1477	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1459	}	1478	}
1460	else	1479	else
1461	{	1480	{
1462	#ifdef HAVE_BG_PIXMAP	1481	#ifdef HAVE_BG_PIXMAP
1463	if (bgPixmap.window_position_sensitive ())	1482	if (moved)
1464	{	1483	{
1465	if (mapped)	1484	if (mapped)
1466	update_background ();	1485	update_background ();
1467	else	1486	else
1468	bgPixmap.invalidate ();	1487	bg_invalidate ();
1469	}	1488	}
1470	#endif	1489	#endif
1471	}	1490	}
1472		1491
1473	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1492	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1474	}	1493	}
1475	break;	1494	break;
1476		1495
1477	case PropertyNotify:	1496	case PropertyNotify:
1478	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1497	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1479	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480	&& ev.xproperty.state == PropertyNewValue)
1481	selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1483	break;	1498	break;
1484		1499
1485	case SelectionClear:	1500	case SelectionClear:
1486	selection_clear ();	1501	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1487	break;
1488
1489	case SelectionNotify:
1490	if (selection_wait == Sel_normal)
1491	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1492	break;	1502	break;
1493		1503
1494	case SelectionRequest:	1504	case SelectionRequest:
1495	selection_send (ev.xselectionrequest);	1505	selection_send (ev.xselectionrequest);
1496	break;	1506	break;
1497		1507
1498	case MapNotify:	1508	case MapNotify:
1499	#ifdef HAVE_BG_PIXMAP	1509	#ifdef HAVE_BG_PIXMAP
1500	/* This is needed spcifically to fix the case of no window manager or a	1510	/* This is needed specifically to fix the case of no window manager or a
1501	* non-reparenting window manager. In those cases we never get first	1511	* non-reparenting window manager. In those cases we never get first
1502	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1512	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1503	* care of multiplicity of ConfigureNotify events arriwing while WM does	1513	* care of multiplicity of ConfigureNotify events arriving while WM does
1504	* reparenting.	1514	* reparenting.
1505	* We should not render background immidiately, as there could be several	1515	* We should not render background immediately, as there could be several
1506	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1516	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507	* by scheduling background redraw as soon as we can, but giving a short	1517	* by scheduling background redraw as soon as we can, but giving a short
1508	* bit of time for ConfigureNotifies to arrive.	1518	* bit of time for ConfigureNotifies to arrive.
1509	* We should render background PRIOR to drawing any text, but AFTER all	1519	* We should render background PRIOR to drawing any text, but AFTER all
1510	* of ConfigureNotifys for the best results.	1520	* of ConfigureNotifys for the best results.
1511	*/	1521	*/
1512	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1522	if (!(bg_flags & BG_IS_VALID))
1513	update_background_ev.start (0.025);	1523	update_background_ev.start (0.025);
1514	#endif	1524	#endif
1515	mapped = 1;	1525	mapped = 1;
1516	#ifdef TEXT_BLINK	1526	#ifdef TEXT_BLINK
1517	text_blink_ev.start ();	1527	text_blink_ev.start ();
…		…
1532	if (ev.xany.window == vt)	1542	if (ev.xany.window == vt)
1533	{	1543	{
1534	do	1544	do
1535	{	1545	{
1536	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1537	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, false);
1538	}	1548	}
1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1549	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540		1550
1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1551	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542		1552
1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1553	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544	{	1554	{
1545	scr_expose (ev.xexpose.x, ev.xexpose.y,	1555	scr_expose (ev.xexpose.x, ev.xexpose.y,
1546	ev.xexpose.width, ev.xexpose.height, False);	1556	ev.xexpose.width, ev.xexpose.height, false);
1547	}	1557	}
1548		1558
1549	want_refresh = 1;	1559	want_refresh = 1;
1550	}	1560	}
1551	else	1561	else
…		…
1558	;	1568	;
1559		1569
1560	if (scrollBar.state && ev.xany.window == scrollBar.win)	1570	if (scrollBar.state && ev.xany.window == scrollBar.win)
1561	{	1571	{
1562	scrollBar.state = STATE_IDLE;	1572	scrollBar.state = STATE_IDLE;
1563	scrollbar_show (0);	1573	scrollBar.show (0);
1564	}	1574	}
1565	}	1575	}
1566	break;	1576	break;
1567		1577
1568	case MotionNotify:	1578	case MotionNotify:
…		…
1667	&unused_root, &unused_child,	1677	&unused_root, &unused_child,
1668	&unused_root_x, &unused_root_y,	1678	&unused_root_x, &unused_root_y,
1669	&ev.xbutton.x, &ev.xbutton.y,	1679	&ev.xbutton.x, &ev.xbutton.y,
1670	&unused_mask);	1680	&unused_mask);
1671	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1681	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1672	scrollbar_size ());	1682	scrollBar.size ());
1673	want_refresh = 1;	1683	want_refresh = 1;
1674	scrollbar_show (1);	1684	scrollBar.show (1);
1675	}	1685	}
1676	break;	1686	break;
1677	}	1687	}
1678		1688
1679	#if defined(CURSOR_BLINK)	1689	#if defined(CURSOR_BLINK)
…		…
1704	#endif	1714	#endif
1705		1715
1706	refresh_check ();	1716	refresh_check ();
1707	}	1717	}
1708		1718
		1719	#if ENABLE_FRILLS
		1720	void
		1721	rxvt_term::set_urgency (bool enable)
		1722	{
		1723	if (enable == urgency_hint)
		1724	return;
		1725
		1726	if (XWMHints *h = XGetWMHints (dpy, parent))
		1727	{
		1728	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
		1729	XSetWMHints (dpy, parent, h);
		1730	urgency_hint = enable;
		1731	}
		1732	}
		1733	#endif
		1734
1709	void	1735	void
1710	rxvt_term::focus_in ()	1736	rxvt_term::focus_in ()
1711	{	1737	{
1712	if (!focus)	1738	if (!focus)
1713	{	1739	{
1714	focus = 1;	1740	focus = 1;
1715	want_refresh = 1;	1741	want_refresh = 1;
1716
1717	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718		1742
1719	#if USE_XIM	1743	#if USE_XIM
1720	if (Input_Context != NULL)	1744	if (Input_Context != NULL)
1721	{	1745	{
1722	IMSetPosition ();	1746	IMSetPosition ();
…		…
1734	scr_recolour ();	1758	scr_recolour ();
1735	}	1759	}
1736	#endif	1760	#endif
1737	#if ENABLE_FRILLS	1761	#if ENABLE_FRILLS
1738	if (option (Opt_urgentOnBell))	1762	if (option (Opt_urgentOnBell))
1739	{	1763	set_urgency (0);
1740	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741	{
1742	h->flags &= ~XUrgencyHint;
1743	XSetWMHints (dpy, parent[0], h);
1744	}
1745	}
1746	#endif	1764	#endif
		1765
		1766	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747	}	1767	}
1748	}	1768	}
1749		1769
1750	void	1770	void
1751	rxvt_term::focus_out ()	1771	rxvt_term::focus_out ()
…		…
1753	if (focus)	1773	if (focus)
1754	{	1774	{
1755	focus = 0;	1775	focus = 0;
1756	want_refresh = 1;	1776	want_refresh = 1;
1757		1777
1758	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1778	#if ENABLE_FRILLS
1759		1779	if (option (Opt_urgentOnBell))
		1780	set_urgency (0);
		1781	#endif
1760	#if ENABLE_FRILLS || ISO_14755	1782	#if ENABLE_FRILLS || ISO_14755
1761	if (iso14755buf)	1783	if (iso14755buf)
1762	{	1784	{
1763	iso14755buf = 0;	1785	iso14755buf = 0;
1764	# if ISO_14755	1786	# if ISO_14755
…		…
1781	{	1803	{
1782	pix_colors = pix_colors_unfocused;	1804	pix_colors = pix_colors_unfocused;
1783	scr_recolour ();	1805	scr_recolour ();
1784	}	1806	}
1785	#endif	1807	#endif
		1808
		1809	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786	}	1810	}
1787	}	1811	}
1788		1812
1789	void	1813	void
1790	rxvt_term::update_fade_color (unsigned int idx)	1814	rxvt_term::update_fade_color (unsigned int idx)
…		…
1818	* use the property to determine the pixmap. We use it later on.	1842	* use the property to determine the pixmap. We use it later on.
1819	*/	1843	*/
1820	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1844	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1845	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822	{	1846	{
1823	bgPixmap.set_root_pixmap ();	1847	bg_set_root_pixmap ();
1824	update_background ();	1848	update_background ();
1825	}	1849	}
1826		1850
1827	break;	1851	break;
1828	}	1852	}
…		…
1867	/* save the xbutton state (for ButtonRelease) */	1891	/* save the xbutton state (for ButtonRelease) */
1868	MEvent.state = ev.state;	1892	MEvent.state = ev.state;
1869	#ifdef MOUSE_REPORT_DOUBLECLICK	1893	#ifdef MOUSE_REPORT_DOUBLECLICK
1870	if (ev.button == MEvent.button && clickintime)	1894	if (ev.button == MEvent.button && clickintime)
1871	{	1895	{
1872	/* same button, within alloted time */	1896	/* same button, within allowed time */
1873	MEvent.clicks++;	1897	MEvent.clicks++;
1874		1898
1875	if (MEvent.clicks > 1)	1899	if (MEvent.clicks > 1)
1876	{	1900	{
1877	/* only report double clicks */	1901	/* only report double clicks */
…		…
2032	}	2056	}
2033		2057
2034	if (scrollBar.style == R_SB_XTERM	2058	if (scrollBar.style == R_SB_XTERM
2035	|| scrollbar_above_slider (ev.y)	2059	|| scrollbar_above_slider (ev.y)
2036	|| scrollbar_below_slider (ev.y))	2060	|| scrollbar_below_slider (ev.y))
2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2061	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2038		2062
2039	scrollBar.state = STATE_MOTION;	2063	scrollBar.state = STATE_MOTION;
2040	break;	2064	break;
2041		2065
2042	case Button1:	2066	case Button1:
…		…
2065	else	2089	else
2066	{	2090	{
2067	scr_page ((ev.button == Button1 ? DN : UP),	2091	scr_page ((ev.button == Button1 ? DN : UP),
2068	(nrow	2092	(nrow
2069	* scrollbar_position (ev.y)	2093	* scrollbar_position (ev.y)
2070	/ scrollbar_size ()));	2094	/ scrollBar.size ()));
2071	}	2095	}
2072		2096
2073	break;	2097	break;
2074	}	2098	}
2075	}	2099	}
…		…
2088	reportmode = !! (priv_modes & PrivMode_mouse_report);	2112	reportmode = !! (priv_modes & PrivMode_mouse_report);
2089		2113
2090	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2114	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2091	{	2115	{
2092	scrollBar.state = STATE_IDLE;	2116	scrollBar.state = STATE_IDLE;
2093	scrollbar_show (0);	2117	scrollBar.show (0);
2094	}	2118	}
2095		2119
2096	#ifdef SELECTION_SCROLLING	2120	#ifdef SELECTION_SCROLLING
2097	sel_scroll_ev.stop();	2121	sel_scroll_ev.stop();
2098	#endif	2122	#endif
…		…
2148	selection_make (ev.time);	2172	selection_make (ev.time);
2149	break;	2173	break;
2150		2174
2151	case Button2:	2175	case Button2:
2152	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2176	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2153	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2177	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154	break;	2178	break;
2155		2179
2156	#ifdef MOUSE_WHEEL	2180	#ifdef MOUSE_WHEEL
2157	case Button4:	2181	case Button4:
2158	case Button5:	2182	case Button5:
…		…
2181	}	2205	}
2182	else	2206	else
2183	# endif	2207	# endif
2184	{	2208	{
2185	scr_page (v, i);	2209	scr_page (v, i);
2186	scrollbar_show (1);	2210	scrollBar.show (1);
2187	}	2211	}
2188	}	2212	}
2189	break;	2213	break;
2190	#endif	2214	#endif
2191	}	2215	}
2192	}	2216	}
2193	}	2217	}
2194		2218
2195	/*}}} */	2219	/*}}} */
2196		2220
2197	bool	2221	void
2198	rxvt_term::cmd_parse ()	2222	rxvt_term::cmd_parse ()
2199	{	2223	{
2200	bool flag = false;
2201	wchar_t ch = NOCHAR;	2224	wchar_t ch = NOCHAR;
2202	char *seq_begin; // remember start of esc-sequence here	2225	char *seq_begin; // remember start of esc-sequence here
2203		2226
2204	for (;;)	2227	for (;;)
2205	{	2228	{
2206	if (ch == NOCHAR)	2229	if (expect_false (ch == NOCHAR))
2207	{	2230	{
2208	seq_begin = cmdbuf_ptr;	2231	seq_begin = cmdbuf_ptr;
2209	ch = next_char ();	2232	ch = next_char ();
2210		2233
2211	if (ch == NOCHAR)	2234	if (ch == NOCHAR)
2212	break;	2235	break;
2213	}	2236	}
2214		2237
2215	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2238	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2216	{	2239	{
2217	if (!seen_input)	2240	if (expect_false (!seen_input))
2218	{	2241	{
2219	seen_input = 1;	2242	seen_input = 1;
2220	// many badly-written programs (e.g. jed) contain a race condition:	2243	// many badly-written programs (e.g. jed) contain a race condition:
2221	// they first read the screensize and then install a SIGWINCH handler.	2244	// they first read the screensize and then install a SIGWINCH handler.
2222	// some window managers resize the window early, and these programs	2245	// some window managers resize the window early, and these programs
…		…
2235	wchar_t *str = buf;	2258	wchar_t *str = buf;
2236	wchar_t *eol = str + min (ncol, UBUFSIZ);	2259	wchar_t *eol = str + min (ncol, UBUFSIZ);
2237		2260
2238	for (;;)	2261	for (;;)
2239	{	2262	{
2240	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2263	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2241	break;	2264	break;
2242		2265
2243	*str++ = ch;	2266	*str++ = ch;
2244		2267
2245	if (ch == C0_LF || str >= eol)	2268	if (expect_false (ch == C0_LF || str >= eol))
2246	{	2269	{
2247	if (ch == C0_LF)	2270	if (ch == C0_LF)
2248	nlines++;	2271	nlines++;
2249		2272
2250	refresh_count++;	2273	refresh_count++;
…		…
2299	* What the heck we'll cheat and only refresh less than every page-full.	2322	* What the heck we'll cheat and only refresh less than every page-full.
2300	* if skipScroll is enabled.	2323	* if skipScroll is enabled.
2301	*/	2324	*/
2302	if (refreshnow)	2325	if (refreshnow)
2303	{	2326	{
2304	flag = true;
2305	scr_refresh ();	2327	scr_refresh ();
2306	want_refresh = 1;	2328	want_refresh = 1;
2307	}	2329	}
2308
2309	}	2330	}
2310	else	2331	else
2311	{	2332	{
2312	try	2333	try
2313	{	2334	{
…		…
2321	}	2342	}
2322		2343
2323	ch = NOCHAR;	2344	ch = NOCHAR;
2324	}	2345	}
2325	}	2346	}
2326
2327	return flag;
2328	}	2347	}
2329		2348
2330	// read the next character	2349	// read the next character
2331	wchar_t	2350	wchar_t
2332	rxvt_term::next_char () NOTHROW	2351	rxvt_term::next_char () NOTHROW
2333	{	2352	{
2334	while (cmdbuf_ptr < cmdbuf_endp)	2353	while (cmdbuf_ptr < cmdbuf_endp)
2335	{	2354	{
2336	// assume 7-bit to be ascii ALWAYS	2355	// assume 7-bit to be ascii ALWAYS
2337	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2356	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2338	return *cmdbuf_ptr++;	2357	return *cmdbuf_ptr++;
2339		2358
2340	wchar_t wc;	2359	wchar_t wc;
2341	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2360	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2342		2361
…		…
2346	cmdbuf_ptr = cmdbuf_endp;	2365	cmdbuf_ptr = cmdbuf_endp;
2347	break;	2366	break;
2348	}	2367	}
2349		2368
2350	if (len == (size_t)-1)	2369	if (len == (size_t)-1)
		2370	{
		2371	mbstate.reset (); // reset now undefined conversion state
2351	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2372	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2373	}
2352		2374
2353	// assume wchar == unicode	2375	// assume wchar == unicode
2354	cmdbuf_ptr += len;	2376	cmdbuf_ptr += len;
2355	return wc & UNICODE_MASK;	2377	return wc & UNICODE_MASK;
2356	}	2378	}
…		…
2400	/*----------------------------------------------------------------------*/	2422	/*----------------------------------------------------------------------*/
2401	#ifdef PRINTPIPE	2423	#ifdef PRINTPIPE
2402	FILE *	2424	FILE *
2403	rxvt_term::popen_printer ()	2425	rxvt_term::popen_printer ()
2404	{	2426	{
2405	FILE *stream = popen (rs[Rs_print_pipe], "w");	2427	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406		2428
2407	if (stream == NULL)	2429	if (stream == NULL)
2408	rxvt_warn ("can't open printer pipe, not printing.\n");	2430	rxvt_warn ("can't open printer pipe, not printing.\n");
2409		2431
2410	return stream;	2432	return stream;
…		…
2421	* simulate attached vt100 printer	2443	* simulate attached vt100 printer
2422	*/	2444	*/
2423	void	2445	void
2424	rxvt_term::process_print_pipe ()	2446	rxvt_term::process_print_pipe ()
2425	{	2447	{
2426	int done;	2448	FILE *fd = popen_printer ();
2427	FILE *fd;
2428		2449
2429	if ((fd = popen_printer ()) == NULL)	2450	if (!fd)
2430	return;	2451	return;
2431		2452
2432	/*	2453	/*
2433	* Send all input to the printer until either ESC[4i or ESC[?4i	2454	* Send all input to the printer until either ESC[4i or ESC[?4i
2434	* is received.	2455	* is received.
2435	*/	2456	*/
2436	for (done = 0; !done;)	2457	for (int done = 0; !done; )
2437	{	2458	{
2438	unsigned char buf[8];	2459	unsigned char buf[8];
2439	unicode_t ch;	2460	unicode_t ch;
2440	unsigned int i, len;	2461	unsigned int i, len;
2441		2462
…		…
2586	break;	2607	break;
2587	case 'Z': /* identify the terminal type */	2608	case 'Z': /* identify the terminal type */
2588	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2609	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589	break;	2610	break;
2590	case '<': /* turn off VT52 mode */	2611	case '<': /* turn off VT52 mode */
2591	PrivMode (0, PrivMode_vt52);	2612	set_privmode (PrivMode_vt52, 0);
2592	break;	2613	break;
2593	case 'F': /* use special graphics character set */	2614	case 'F': /* use special graphics character set */
2594	case 'G': /* use regular character set */	2615	case 'G': /* use regular character set */
2595	/* unimplemented */	2616	/* unimplemented */
2596	break;	2617	break;
…		…
2650	scr_forwardindex ();	2671	scr_forwardindex ();
2651	break;	2672	break;
2652	#endif	2673	#endif
2653	case '=':	2674	case '=':
2654	case '>':	2675	case '>':
2655	PrivMode ((ch == '='), PrivMode_aplKP);	2676	set_privmode (PrivMode_aplKP, ch == '=');
2656	break;	2677	break;
2657		2678
2658	case C1_40:	2679	case C1_40:
2659	cmd_getc ();	2680	cmd_getc ();
2660	break;	2681	break;
…		…
2664		2685
2665	/* 8.3.87: NEXT LINE */	2686	/* 8.3.87: NEXT LINE */
2666	case C1_NEL: /* ESC E */	2687	case C1_NEL: /* ESC E */
2667	{	2688	{
2668	wchar_t nlcr[] = { C0_LF, C0_CR };	2689	wchar_t nlcr[] = { C0_LF, C0_CR };
2669	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2690	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2670	}	2691	}
2671	break;	2692	break;
2672		2693
2673	/* kidnapped escape sequence: Should be 8.3.48 */	2694	/* kidnapped escape sequence: Should be 8.3.48 */
2674	case C1_ESA: /* ESC G */	2695	case C1_ESA: /* ESC G */
2675	process_graphics ();	2696	// used by original rxvt for rob nations own graphics mode
		2697	if (cmd_getc () == 'Q')
		2698	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2676	break;	2699	break;
2677		2700
2678	/* 8.3.63: CHARACTER TABULATION SET */	2701	/* 8.3.63: CHARACTER TABULATION SET */
2679	case C1_HTS: /* ESC H */	2702	case C1_HTS: /* ESC H */
2680	scr_set_tab (1);	2703	scr_set_tab (1);
…		…
2699	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2722	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700	case C1_SCI: /* ESC Z */	2723	case C1_SCI: /* ESC Z */
2701	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2724	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702	break; /* steal obsolete ESC [ c */	2725	break; /* steal obsolete ESC [ c */
2703		2726
2704	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2727	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705	case C1_CSI: /* ESC [ */	2728	case C1_CSI: /* ESC [ */
2706	process_csi_seq ();	2729	process_csi_seq ();
2707	break;	2730	break;
2708		2731
2709	/* 8.3.90: OPERATING SYSTEM COMMAND */	2732	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710	case C1_OSC: /* ESC ] */	2733	case C1_OSC: /* ESC ] */
2711	process_osc_seq ();	2734	process_osc_seq ();
2712	break;	2735	break;
2713		2736
2714	/* 8.3.106: RESET TO INITIAL STATE */	2737	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715	case 'c':	2738	case 'c':
2716	mbstate.reset ();	2739	mbstate.reset ();
2717	scr_poweron ();	2740	scr_poweron ();
2718	scrollbar_show (1);	2741	scrollBar.show (1);
2719	break;	2742	break;
2720		2743
2721	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2744	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722	case 'n':	2745	case 'n':
2723	scr_charset_choose (2);	2746	scr_charset_choose (2);
…		…
2743	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2766	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2744	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2767	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2745	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2768	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2746	};	2769	};
2747		2770
2748	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2771	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \	2772	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))	2773	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751	#define get_byte_array_bit(array, bit) \	2774	#define get_byte_array_bit(array, bit) \
2752	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2775	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753		2776
2754	const unsigned char csi_defaults[] =	2777	static const unsigned char csi_defaults[] =
2755	{	2778	{
2756	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2779	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2757	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2780	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2758	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2781	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2759	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2782	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
…		…
2774		2797
2775	nargs = 0;	2798	nargs = 0;
2776		2799
2777	priv = 0;	2800	priv = 0;
2778	ch = cmd_getc ();	2801	ch = cmd_getc ();
2779	if (ch >= '<' && ch <= '?')	2802	if ((ch >= '<' && ch <= '?') || ch == '!')
2780	{	2803	{
2781	/* '<' '=' '>' '?' */	2804	/* '<' '=' '>' '?' '!' */
2782	priv = ch;	2805	priv = ch;
2783	ch = cmd_getc ();	2806	ch = cmd_getc ();
2784	}	2807	}
2785		2808
2786	/* read any numerical arguments */	2809	/* read any numerical arguments */
…		…
2840		2863
2841	case '?':	2864	case '?':
2842	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2865	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2843	process_terminal_mode (ch, priv, nargs, arg);	2866	process_terminal_mode (ch, priv, nargs, arg);
2844	break;	2867	break;
		2868
		2869	case '!':
		2870	if (ch == CSI_70)
		2871	{
		2872	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2873	scr_soft_reset ();
		2874
		2875	static const int pm_h[] = { 7, 25 };
		2876	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
		2877
		2878	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
		2879	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2845	}	2880	}
		2881	break;
		2882	}
		2883
2846	return;	2884	return;
2847	}	2885	}
2848		2886
2849	switch (ch)	2887	switch (ch)
2850	{	2888	{
…		…
3084	{	3122	{
3085	/*	3123	/*
3086	* commands	3124	* commands
3087	*/	3125	*/
3088	case 1: /* deiconify window */	3126	case 1: /* deiconify window */
3089	XMapWindow (dpy, parent[0]);	3127	XMapWindow (dpy, parent);
3090	break;	3128	break;
3091	case 2: /* iconify window */	3129	case 2: /* iconify window */
3092	XIconifyWindow (dpy, parent[0], display->screen);	3130	XIconifyWindow (dpy, parent, display->screen);
3093	break;	3131	break;
3094	case 3: /* set position (pixels) */	3132	case 3: /* set position (pixels) */
3095	XMoveWindow (dpy, parent[0], args[1], args[2]);	3133	XMoveWindow (dpy, parent, args[1], args[2]);
3096	break;	3134	break;
3097	case 4: /* set size (pixels) */	3135	case 4: /* set size (pixels) */
3098	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3136	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3099	break;	3137	break;
3100	case 5: /* raise window */	3138	case 5: /* raise window */
3101	XRaiseWindow (dpy, parent[0]);	3139	XRaiseWindow (dpy, parent);
3102	break;	3140	break;
3103	case 6: /* lower window */	3141	case 6: /* lower window */
3104	XLowerWindow (dpy, parent[0]);	3142	XLowerWindow (dpy, parent);
3105	break;	3143	break;
3106	case 7: /* refresh window */	3144	case 7: /* refresh window */
3107	scr_touch (true);	3145	scr_touch (true);
3108	break;	3146	break;
3109	case 8: /* set size (chars) */	3147	case 8: /* set size (chars) */
…		…
3120		3158
3121	/*	3159	/*
3122	* reports - some output format copied from XTerm	3160	* reports - some output format copied from XTerm
3123	*/	3161	*/
3124	case 11: /* report window state */	3162	case 11: /* report window state */
3125	XGetWindowAttributes (dpy, parent[0], &wattr);	3163	XGetWindowAttributes (dpy, parent, &wattr);
3126	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3164	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3127	break;	3165	break;
3128	case 13: /* report window position */	3166	case 13: /* report window position */
3129	XGetWindowAttributes (dpy, parent[0], &wattr);	3167	XGetWindowAttributes (dpy, parent, &wattr);
3130	XTranslateCoordinates (dpy, parent[0], wattr.root,	3168	XTranslateCoordinates (dpy, parent, wattr.root,
3131	-wattr.border_width, -wattr.border_width,	3169	-wattr.border_width, -wattr.border_width,
3132	&x, &y, &wdummy);	3170	&x, &y, &wdummy);
3133	tt_printf ("\033[3;%d;%dt", x, y);	3171	tt_printf ("\033[3;%d;%dt", x, y);
3134	break;	3172	break;
3135	case 14: /* report window size (pixels) */	3173	case 14: /* report window size (pixels) */
3136	XGetWindowAttributes (dpy, parent[0], &wattr);	3174	XGetWindowAttributes (dpy, parent, &wattr);
3137	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3175	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3138	break;	3176	break;
3139	case 18: /* report text area size (chars) */	3177	case 18: /* report text area size (chars) */
3140	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3178	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3141	break;	3179	break;
…		…
3143	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3181	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3144	break;	3182	break;
3145	case 20: /* report icon label */	3183	case 20: /* report icon label */
3146	{	3184	{
3147	char *s;	3185	char *s;
3148	XGetIconName (dpy, parent[0], &s);	3186	XGetIconName (dpy, parent, &s);
3149	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3187	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3150	XFree (s);	3188	XFree (s);
3151	}	3189	}
3152	break;	3190	break;
3153	case 21: /* report window title */	3191	case 21: /* report window title */
3154	{	3192	{
3155	char *s;	3193	char *s;
3156	XFetchName (dpy, parent[0], &s);	3194	XFetchName (dpy, parent, &s);
3157	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3195	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3158	XFree (s);	3196	XFree (s);
3159	}	3197	}
3160	break;	3198	break;
3161	}	3199	}
…		…
3217	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3255	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3218	*/	3256	*/
3219	void	3257	void
3220	rxvt_term::process_dcs_seq ()	3258	rxvt_term::process_dcs_seq ()
3221	{	3259	{
3222	char *s;
3223	unicode_t eh;
3224
3225	/*	3260	/*
3226	* Not handled yet	3261	* Not handled yet
3227	*/	3262	*/
		3263
		3264	unicode_t eh;
3228	s = get_to_st (eh);	3265	char *s = get_to_st (eh);
3229	if (s)	3266	if (s)
3230	free (s);	3267	free (s);
3231		3268
3232	return;	3269	return;
3233	}	3270	}
…		…
3237	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'	3274	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3238	*/	3275	*/
3239	void	3276	void
3240	rxvt_term::process_osc_seq ()	3277	rxvt_term::process_osc_seq ()
3241	{	3278	{
3242	unicode_t ch, eh;
3243	int arg;	3279	int arg;
3244		3280
3245	ch = cmd_getc ();	3281	unicode_t ch = cmd_getc ();
3246	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3282	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3247	arg = arg * 10 + (ch - '0');	3283	arg = arg * 10 + (ch - '0');
3248		3284
3249	if (ch == ';')	3285	if (ch == ';')
3250	{	3286	{
		3287	unicode_t eh;
3251	char *s = get_to_st (eh);	3288	char *s = get_to_st (eh);
3252		3289
3253	if (s)	3290	if (s)
3254	{	3291	{
3255	process_xterm_seq (arg, s, eh);	3292	process_xterm_seq (arg, s, eh);
…		…
3279		3316
3280	/*	3317	/*
3281	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3318	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3282	*/	3319	*/
3283	void	3320	void
3284	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3321	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3285	{	3322	{
3286	int color;	3323	int color;
3287	char *buf, *name;	3324	char *buf, *name;
3288	bool query = str[0] == '?' && !str[1];	3325	bool query = str[0] == '?' && !str[1];
3289	int saveop = op;	3326	int saveop = op;
…		…
3316	unsigned long bytes_after;	3353	unsigned long bytes_after;
3317	unsigned char *value = 0;	3354	unsigned char *value = 0;
3318	const char *str = "";	3355	const char *str = "";
3319		3356
3320	if (prop	3357	if (prop
3321	&& XGetWindowProperty (dpy, parent[0],	3358	&& XGetWindowProperty (dpy, parent,
3322	prop, 0, 1<<16, 0, AnyPropertyType,	3359	prop, 0, 1<<16, 0, AnyPropertyType,
3323	&actual_type, &actual_format,	3360	&actual_type, &actual_format,
3324	&nitems, &bytes_after, &value) == Success	3361	&nitems, &bytes_after, &value) == Success
3325	&& actual_type != None	3362	&& actual_type != None
3326	&& actual_format == 8)	3363	&& actual_format == 8)
…		…
3330		3367
3331	XFree (value);	3368	XFree (value);
3332	}	3369	}
3333	else	3370	else
3334	{	3371	{
3335	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3372	char *eq = strchr (str, '=');
3336		3373
3337	if (eq)	3374	if (eq)
3338	{	3375	{
3339	*eq = 0;	3376	*eq = 0;
3340	set_utf8_property (display->atom (str), eq + 1);	3377	set_utf8_property (display->atom (str), eq + 1);
3341	}	3378	}
3342	else	3379	else
3343	XDeleteProperty (dpy, parent[0],	3380	XDeleteProperty (dpy, parent,
3344	display->atom (str));	3381	display->atom (str));
3345	}	3382	}
3346	break;	3383	break;
3347		3384
3348	case XTerm_Color:	3385	case XTerm_Color:
…		…
3380	process_color_seq (op, Color_pointer_fg, str, resp);	3417	process_color_seq (op, Color_pointer_fg, str, resp);
3381	break;	3418	break;
3382	case XTerm_Color_pointer_bg:	3419	case XTerm_Color_pointer_bg:
3383	process_color_seq (op, Color_pointer_bg, str, resp);	3420	process_color_seq (op, Color_pointer_bg, str, resp);
3384	break;	3421	break;
		3422	#ifdef OPTION_HC
		3423	case XTerm_Color_HC:
		3424	process_color_seq (op, Color_HC, str, resp);
		3425	break;
		3426	case XTerm_Color_HTC:
		3427	process_color_seq (op, Color_HTC, str, resp);
		3428	break;
		3429	#endif
3385	#ifndef NO_BOLD_UNDERLINE_REVERSE	3430	#ifndef NO_BOLD_UNDERLINE_REVERSE
3386	case XTerm_Color_RV:
3387	process_color_seq (op, Color_RV, str, resp);
3388	break;
3389	case Rxvt_Color_BD:
3390	case URxvt_Color_BD:	3431	case URxvt_Color_BD:
3391	process_color_seq (op, Color_BD, str, resp);	3432	process_color_seq (op, Color_BD, str, resp);
3392	break;	3433	break;
3393	case Rxvt_Color_UL:
3394	case URxvt_Color_UL:	3434	case URxvt_Color_UL:
3395	process_color_seq (op, Color_UL, str, resp);	3435	process_color_seq (op, Color_UL, str, resp);
3396	break;	3436	break;
3397	case URxvt_Color_IT:	3437	case URxvt_Color_IT:
3398	process_color_seq (op, Color_IT, str, resp);	3438	process_color_seq (op, Color_IT, str, resp);
3399	break;	3439	break;
3400	#endif	3440	#endif
		3441	case URxvt_Color_border:
		3442	process_color_seq (op, Color_border, str, resp);
		3443	break;
3401	#if ENABLE_TRANSPARENCY	3444	#if ENABLE_TRANSPARENCY
3402	case URxvt_Color_tint:	3445	case URxvt_Color_tint:
3403	process_color_seq (op, Color_tint, str, resp);	3446	process_color_seq (op, Color_tint, str, resp);
3404	{	3447	{
3405	bool changed = false;	3448	bool changed = false;
3406		3449
3407	if (ISSET_PIXCOLOR (Color_tint))	3450	if (ISSET_PIXCOLOR (Color_tint))
3408	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3451	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3409	else
3410	changed = bgPixmap.unset_tint ();
3411		3452
3412	if (changed)	3453	if (changed)
3413	update_background ();	3454	update_background ();
3414	}	3455	}
3415		3456
…		…
3420	case Rxvt_Pixmap:	3461	case Rxvt_Pixmap:
3421	if (!strcmp (str, "?"))	3462	if (!strcmp (str, "?"))
3422	{	3463	{
3423	char str[256];	3464	char str[256];
3424		3465
3425	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3466	sprintf (str, "[%dx%d+%d+%d]",
3426	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3467	min (h_scale, 32767), min (v_scale, 32767),
3427	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3468	min (h_align, 32767), min (v_align, 32767));
3428	process_xterm_seq (XTerm_title, str, CHAR_ST);	3469	process_xterm_seq (XTerm_title, str, CHAR_ST);
3429	}	3470	}
3430	else	3471	else
3431	{	3472	{
3432	int changed = 0;	3473	int changed = 0;
3433		3474
3434	if (*str != ';')	3475	if (*str != ';')
3435	{	3476	{
3436	/* reset to default scaling :*/
3437	bgPixmap.unset_geometry ();
3438	if (bgPixmap.set_file (str)) /* change pixmap */	3477	if (bg_set_file (str)) /* change pixmap */
		3478	{
3439	changed++;	3479	changed++;
3440	str = strchr (str, ';');	3480	str = strchr (str, ';');
3441	if (str == NULL)	3481	if (str == NULL)
3442	bgPixmap.set_defaultGeometry ();	3482	bg_set_default_geometry ();
		3483	else
		3484	bg_set_geometry (str+1);
		3485	}
3443	}	3486	}
3444		3487	else
3445	while (str)
3446	{	3488	{
3447	str++;	3489	str++;
3448	if (bgPixmap.set_geometry (str))	3490	if (bg_set_geometry (str, true))
3449	changed++;	3491	changed++;
3450	str = strchr (str, ';');
3451	}	3492	}
3452		3493
3453	if (changed)	3494	if (changed)
		3495	{
		3496	if (bg_window_position_sensitive ())
		3497	{
		3498	int x, y;
		3499	get_window_origin (x, y);
		3500	bg_set_position (x, y);
		3501	}
3454	update_background ();	3502	update_background ();
		3503	}
3455	}	3504	}
3456	break;	3505	break;
3457	#endif	3506	#endif
3458		3507
3459	case XTerm_logfile:	3508	case XTerm_logfile:
…		…
3529	break;	3578	break;
3530	#endif	3579	#endif
3531		3580
3532	#if ENABLE_PERL	3581	#if ENABLE_PERL
3533	case URxvt_perl:	3582	case URxvt_perl:
3534	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3583	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3535	; // no responses yet
3536	break;	3584	break;
3537	#endif	3585	#endif
3538	}	3586	}
3539	}	3587	}
3540	/*----------------------------------------------------------------------*/	3588	/*----------------------------------------------------------------------*/
…		…
3563	{	3611	{
3564	if (mode == 'r')	3612	if (mode == 'r')
3565	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3613	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566	else	3614	else
3567	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3615	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568	PrivMode (state, bit);	3616
		3617	set_privmode (bit, state);
3569	}	3618	}
3570		3619
3571	return state;	3620	return state;
3572	}	3621	}
3573		3622
…		…
3581	static const struct	3630	static const struct
3582	{	3631	{
3583	const int argval;	3632	const int argval;
3584	const unsigned long bit;	3633	const unsigned long bit;
3585	} argtopriv[] = {	3634	} argtopriv[] = {
3586	{ 1, PrivMode_aplCUR },	3635	{ 1, PrivMode_aplCUR }, // DECCKM
3587	{ 2, PrivMode_vt52 },	3636	{ 2, PrivMode_vt52 },
3588	{ 3, PrivMode_132 },	3637	{ 3, PrivMode_132 }, // DECCOLM
3589	{ 4, PrivMode_smoothScroll },	3638	{ 4, PrivMode_smoothScroll }, // DECSCLM
3590	{ 5, PrivMode_rVideo },	3639	{ 5, PrivMode_rVideo }, // DECSCNM
3591	{ 6, PrivMode_relOrigin },	3640	{ 6, PrivMode_relOrigin }, // DECOM
3592	{ 7, PrivMode_Autowrap },	3641	{ 7, PrivMode_Autowrap }, // DECAWM
3593	// 8, bi-directional support mode	3642	// 8, auto-repeat keys // DECARM
3594	{ 9, PrivMode_MouseX10 },	3643	{ 9, PrivMode_MouseX10 },
3595	// 18, 19 printing-related	3644	// 18 end FF to printer after print screen
		3645	// 19 Print screen prints full screen/scroll region
3596	{ 25, PrivMode_VisibleCursor },	3646	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3597	#ifdef scrollBar_esc	3647	#ifdef scrollBar_esc
3598	{ scrollBar_esc, PrivMode_scrollBar },	3648	{ scrollBar_esc, PrivMode_scrollBar },
3599	#endif	3649	#endif
3600	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3650	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3651	// 38, tektronix mode // DECTEK
3601	{ 40, PrivMode_132OK },	3652	{ 40, PrivMode_132OK },
3602	// 41 xterm more fixes NYI	3653	// 41 xterm more fixes NYI
3603	// 45 margin bell NYI	3654	// 45 margin bell NYI
3604	// 46 start logging	3655	// 46 start logging
3605	{ 47, PrivMode_Screen },	3656	{ 47, PrivMode_Screen },
3606	{ 66, PrivMode_aplKP },	3657	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3607	#ifndef NO_BACKSPACE_KEY	3658	#ifndef NO_BACKSPACE_KEY
3608	{ 67, PrivMode_BackSpace },	3659	{ 67, PrivMode_BackSpace }, // DECBKM
3609	#endif	3660	#endif
3610	{ 1000, PrivMode_MouseX11 },	3661	{ 1000, PrivMode_MouseX11 },
3611	{ 1002, PrivMode_MouseBtnEvent },	3662	{ 1002, PrivMode_MouseBtnEvent },
3612	{ 1003, PrivMode_MouseAnyEvent },	3663	{ 1003, PrivMode_MouseAnyEvent },
		3664	#if ENABLE_FRILLS
		3665	{ 1005, PrivMode_ExtModeMouse },
		3666	#endif
3613	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3667	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3614	{ 1011, PrivMode_Keypress }, // rxvt extension	3668	{ 1011, PrivMode_Keypress }, // rxvt extension
		3669	#if ENABLE_FRILLS
		3670	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3671	#endif
3615	// 1035 enable modifiers for alt, numlock NYI	3672	// 1035 enable modifiers for alt, numlock NYI
3616	// 1036 send ESC for meta keys NYI	3673	// 1036 send ESC for meta keys NYI
3617	// 1037 send DEL for keypad delete NYI	3674	// 1037 send DEL for keypad delete NYI
3618	{ 1047, PrivMode_Screen },	3675	{ 1047, PrivMode_Screen },
3619	// 1048 save and restore cursor	3676	// 1048 save and restore cursor, implemented in code
3620	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3677	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3621	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3678	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3622	{ 2004, PrivMode_BracketPaste },	3679	{ 2004, PrivMode_BracketPaste },
3623	};	3680	};
3624		3681
…		…
3634	for (i = 0; i < nargs; i++)	3691	for (i = 0; i < nargs; i++)
3635	{	3692	{
3636	state = -1;	3693	state = -1;
3637		3694
3638	/* basic handling */	3695	/* basic handling */
3639	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3696	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3640	if (argtopriv[j].argval == arg[i])	3697	if (argtopriv[j].argval == arg[i])
3641	{	3698	{
3642	state = privcases (mode, argtopriv[j].bit);	3699	state = privcases (mode, argtopriv[j].bit);
3643	break;	3700	break;
3644	}	3701	}
…		…
3652		3709
3653	scr_touch (true);	3710	scr_touch (true);
3654	break;	3711	break;
3655	#endif	3712	#endif
3656	case 1048: /* alternative cursor save */	3713	case 1048: /* alternative cursor save */
3657	case 1049:
3658	if (option (Opt_secondaryScreen))	3714	if (option (Opt_secondaryScreen))
3659	if (mode == 0)	3715	if (mode == 0)
3660	scr_cursor (RESTORE);	3716	scr_cursor (RESTORE);
3661	else if (mode == 1)	3717	else if (mode == 1)
3662	scr_cursor (SAVE);	3718	scr_cursor (SAVE);
…		…
3671	case 2: /* VT52 mode */	3727	case 2: /* VT52 mode */
3672	/* oddball mode. should be set regardless of set/reset	3728	/* oddball mode. should be set regardless of set/reset
3673	* parameter. Return from VT52 mode with an ESC < from	3729	* parameter. Return from VT52 mode with an ESC < from
3674	* within VT52 mode	3730	* within VT52 mode
3675	*/	3731	*/
3676	PrivMode (1, PrivMode_vt52);	3732	set_privmode (PrivMode_vt52, 1);
3677	break;	3733	break;
3678	case 3: /* 80/132 */	3734	case 3: /* 80/132 */
3679	if (priv_modes & PrivMode_132OK)	3735	if (priv_modes & PrivMode_132OK)
3680	{
3681	scr_poweron ();
3682	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3736	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3683	}
3684	break;	3737	break;
3685	case 4: /* smooth scrolling */	3738	case 4: /* smooth scrolling */
3686	set_option (Opt_jumpScroll, !state);	3739	set_option (Opt_jumpScroll, !state);
3687	break;	3740	break;
3688	case 5: /* reverse video */	3741	case 5: /* reverse video */
…		…
3699	if (state) /* orthogonal */	3752	if (state) /* orthogonal */
3700	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3753	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3701	break;	3754	break;
3702	#ifdef scrollBar_esc	3755	#ifdef scrollBar_esc
3703	case scrollBar_esc:	3756	case scrollBar_esc:
3704	if (scrollbar_mapping (state))	3757	if (scrollBar.map (state))
3705	{	3758	{
3706	resize_all_windows (0, 0, 0);	3759	resize_all_windows (0, 0, 0);
3707	scr_touch (true);	3760	scr_touch (true);
3708	}	3761	}
3709	break;	3762	break;
…		…
3726	case 1003:	3779	case 1003:
3727	if (state)	3780	if (state)
3728	{	3781	{
3729	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);	3782	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3783	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3784	mouse_row = mouse_col = 0;
3731	vt_emask_mouse = PointerMotionMask;	3785	vt_emask_mouse = PointerMotionMask;
3732	}	3786	}
3733	else	3787	else
3734	vt_emask_mouse = NoEventMask;	3788	vt_emask_mouse = NoEventMask;
		3789
3735	vt_select_input ();	3790	vt_select_input ();
3736	break;	3791	break;
3737	case 1010: /* scroll to bottom on TTY output inhibit */	3792	case 1010: /* scroll to bottom on TTY output inhibit */
3738	set_option (Opt_scrollTtyOutput, !state);	3793	set_option (Opt_scrollTtyOutput, !state);
3739	break;	3794	break;
3740	case 1011: /* scroll to bottom on key press */	3795	case 1011: /* scroll to bottom on key press */
3741	set_option (Opt_scrollTtyKeypress, state);	3796	set_option (Opt_scrollTtyKeypress, state);
3742	break;	3797	break;
3743	case 1047: /* secondary screen w/ clearing last */	3798	case 1047: /* secondary screen w/ clearing last */
3744	if (option (Opt_secondaryScreen))	3799	if (option (Opt_secondaryScreen))
3745	if (current_screen != PRIMARY)	3800	if (!state)
3746	scr_erase_screen (2);	3801	scr_erase_screen (2);
		3802
3747	scr_change_screen (state);	3803	scr_change_screen (state);
3748	break;	3804	break;
3749	case 1049: /* secondary screen w/ clearing first */	3805	case 1049: /* secondary screen w/ clearing first */
		3806	if (option (Opt_secondaryScreen))
		3807	if (state)
		3808	scr_cursor (SAVE);
		3809
3750	scr_change_screen (state);	3810	scr_change_screen (state);
		3811
3751	if (option (Opt_secondaryScreen))	3812	if (option (Opt_secondaryScreen))
3752	if (current_screen != PRIMARY)	3813	if (state)
3753	scr_erase_screen (2);	3814	scr_erase_screen (2);
		3815	else
		3816	scr_cursor (RESTORE);
3754	break;	3817	break;
3755	default:	3818	default:
3756	break;	3819	break;
3757	}	3820	}
3758	}	3821	}
…		…
3911	}	3974	}
3912	}	3975	}
3913	}	3976	}
3914	/*}}} */	3977	/*}}} */
3915		3978
3916	/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3917	void
3918	rxvt_term::process_graphics ()
3919	{
3920	unicode_t ch, cmd = cmd_getc ();
3921
3922	if (cmd == 'Q')
3923	{
3924	/* query graphics */
3925	tt_printf ("\033G0\012"); /* no graphics */
3926	return;
3927	}
3928	/* swallow other graphics sequences until terminating ':' */
3929	do
3930	ch = cmd_getc ();
3931	while (ch != ':');
3932	}
3933	/*}}} */
3934
3935	/* ------------------------------------------------------------------------- */	3979	/* ------------------------------------------------------------------------- */
3936		3980
3937	/*	3981	/*
3938	* Send printf () formatted output to the command.	3982	* Send printf () formatted output to the command.
3939	* Only use for small amounts of data.	3983	* Only use for small amounts of data.
…		…
3952		3996
3953	/* ---------------------------------------------------------------------- */	3997	/* ---------------------------------------------------------------------- */
3954	/* Write data to the pty as typed by the user, pasted with the mouse,	3998	/* Write data to the pty as typed by the user, pasted with the mouse,
3955	* or generated by us in response to a query ESC sequence.	3999	* or generated by us in response to a query ESC sequence.
3956	*/	4000	*/
3957	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4001	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958		4002
3959	void	4003	void
3960	rxvt_term::tt_write (const char *data, unsigned int len)	4004	rxvt_term::tt_write (const char *data, unsigned int len)
3961	{	4005	{
3962	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4006	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3967		4011
3968	if (v_buflen == 0)	4012	if (v_buflen == 0)
3969	{	4013	{
3970	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	4014	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3971		4015
		4016	max_it (written, 0);
		4017
3972	if ((unsigned int)written == len)	4018	if (written == len)
3973	return;	4019	return;
3974		4020
3975	data += written;	4021	data += written;
3976	len -= written;	4022	len -= written;
3977	}	4023	}
3978		4024
3979	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4025	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980		4026
3981	memcpy (v_buffer + v_buflen, data, len);	4027	memcpy (v_buffer + v_buflen, data, len);
3982	v_buflen += len;	4028	v_buflen += len;
3983		4029
3984	pty_ev.set (ev::READ | ev::WRITE);	4030	pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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