[ViewVC] Diff of: 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.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

…		…
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
…		…
989	rxvt_term::flush ()	975	rxvt_term::flush ()
990	{	976	{
991	flush_ev.stop ();	977	flush_ev.stop ();
992		978
993	#ifdef HAVE_BG_PIXMAP	979	#ifdef HAVE_BG_PIXMAP
994	if (bgPixmap.check_clearChanged ())	980	if (bgPixmap.flags & bgPixmap_t::hasChanged)
995	{	981	{
		982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;
996	// scr_clear (true); This needs to be researched further!	983	// scr_clear (true); This needs to be researched further!
997	scr_touch (false);	984	scr_touch (false);
998	}	985	}
999	#endif	986	#endif
1000		987
…		…
1037	}	1024	}
1038	while (row < end_row);	1025	while (row < end_row);
1039	}	1026	}
1040		1027
1041	scr_refresh ();	1028	scr_refresh ();
1042	scrollbar_show (1);	1029	scrollBar.show (1);
1043	#ifdef USE_XIM	1030	#ifdef USE_XIM
1044	IMSendSpot ();	1031	IMSendSpot ();
1045	#endif	1032	#endif
1046	}	1033	}
1047		1034
1048	display->flush ();	1035	display->flush ();
1049	}	1036	}
1050		1037
1051	/* checks wether a refresh is requested and starts the refresh timer */	1038	/* checks whether a refresh is requested and starts the refresh timer */
1052	void	1039	void
1053	rxvt_term::refresh_check ()	1040	rxvt_term::refresh_check ()
1054	{	1041	{
1055	if (want_refresh && !flush_ev.is_active ())	1042	if (want_refresh && !flush_ev.is_active ())
1056	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1043	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1149	{	1136	{
1150	// this should really be sched_yield(), but the linux guys thought	1137	// this should really be sched_yield(), but the linux guys thought
1151	// that giving a process calling sched_yield () less cpu time than	1138	// 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	1139	// ones with high nice levels is a useful thing to do. It surely is is
1153	// allowed by the sus... as is returning ENOSYS.	1140	// allowed by the sus... as is returning ENOSYS.
		1141	// since the linux guys additionally thought that breaking the only
		1142	// known workaround against their unusable sched_yield hack is cool,
		1143	// we just nanosleep a bit and hope for the best.
1154		1144
1155	struct timespec ts = { 0, 0 };	1145	struct timespec ts = { 0, 1000 };
1156	nanosleep (&ts, 0);	1146	nanosleep (&ts, 0);
1157		1147
1158	w.stop ();	1148	w.stop ();
1159	}	1149	}
1160		1150
…		…
1210	{	1200	{
1211	make_current ();	1201	make_current ();
1212		1202
1213	if (revents & ev::READ)	1203	if (revents & ev::READ)
1214	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1215	while (pty_fill ())	1205	for (int i = CBUFCNT; i-- && pty_fill (); )
1216	if (cmd_parse ())	1206	cmd_parse ();
1217	break;
1218		1207
1219	if (revents & ev::WRITE)	1208	if (revents & ev::WRITE)
1220	pty_write ();	1209	pty_write ();
1221		1210
1222	refresh_check ();	1211	refresh_check ();
…		…
1442	&& ev.xfocus.mode != NotifyGrab)	1431	&& ev.xfocus.mode != NotifyGrab)
1443	focus_out ();	1432	focus_out ();
1444	break;	1433	break;
1445		1434
1446	case ConfigureNotify:	1435	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])	1436	if (ev.xconfigure.window == parent[0])
1451	{	1437	{
1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1438	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453	;	1439	;
1454		1440
…		…
1481	selection_property (ev.xproperty.window, ev.xproperty.atom);	1467	selection_property (ev.xproperty.window, ev.xproperty.atom);
1482		1468
1483	break;	1469	break;
1484		1470
1485	case SelectionClear:	1471	case SelectionClear:
1486	selection_clear ();	1472	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1487	break;	1473	break;
1488		1474
1489	case SelectionNotify:	1475	case SelectionNotify:
1490	if (selection_wait == Sel_normal)	1476	if (selection_wait == Sel_normal)
1491	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1477	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1495	selection_send (ev.xselectionrequest);	1481	selection_send (ev.xselectionrequest);
1496	break;	1482	break;
1497		1483
1498	case MapNotify:	1484	case MapNotify:
1499	#ifdef HAVE_BG_PIXMAP	1485	#ifdef HAVE_BG_PIXMAP
1500	/* This is needed spcifically to fix the case of no window manager or a	1486	/* 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	1487	* non-reparenting window manager. In those cases we never get first
1502	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1488	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1503	* care of multiplicity of ConfigureNotify events arriwing while WM does	1489	* care of multiplicity of ConfigureNotify events arriving while WM does
1504	* reparenting.	1490	* reparenting.
1505	* We should not render background immidiately, as there could be several	1491	* 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	1492	* 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	1493	* by scheduling background redraw as soon as we can, but giving a short
1508	* bit of time for ConfigureNotifies to arrive.	1494	* bit of time for ConfigureNotifies to arrive.
1509	* We should render background PRIOR to drawing any text, but AFTER all	1495	* We should render background PRIOR to drawing any text, but AFTER all
1510	* of ConfigureNotifys for the best results.	1496	* of ConfigureNotifys for the best results.
…		…
1558	;	1544	;
1559		1545
1560	if (scrollBar.state && ev.xany.window == scrollBar.win)	1546	if (scrollBar.state && ev.xany.window == scrollBar.win)
1561	{	1547	{
1562	scrollBar.state = STATE_IDLE;	1548	scrollBar.state = STATE_IDLE;
1563	scrollbar_show (0);	1549	scrollBar.show (0);
1564	}	1550	}
1565	}	1551	}
1566	break;	1552	break;
1567		1553
1568	case MotionNotify:	1554	case MotionNotify:
…		…
1667	&unused_root, &unused_child,	1653	&unused_root, &unused_child,
1668	&unused_root_x, &unused_root_y,	1654	&unused_root_x, &unused_root_y,
1669	&ev.xbutton.x, &ev.xbutton.y,	1655	&ev.xbutton.x, &ev.xbutton.y,
1670	&unused_mask);	1656	&unused_mask);
1671	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1657	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1672	scrollbar_size ());	1658	scrollBar.size ());
1673	want_refresh = 1;	1659	want_refresh = 1;
1674	scrollbar_show (1);	1660	scrollBar.show (1);
1675	}	1661	}
1676	break;	1662	break;
1677	}	1663	}
1678		1664
1679	#if defined(CURSOR_BLINK)	1665	#if defined(CURSOR_BLINK)
…		…
1704	#endif	1690	#endif
1705		1691
1706	refresh_check ();	1692	refresh_check ();
1707	}	1693	}
1708		1694
		1695	#if ENABLE_FRILLS
		1696	void
		1697	rxvt_term::set_urgency (bool enable)
		1698	{
		1699	if (enable == urgency_hint)
		1700	return;
		1701
		1702	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1703	{
		1704	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1705	XSetWMHints (dpy, parent[0], h);
		1706	urgency_hint = enable;
		1707	}
		1708	}
		1709	#endif
		1710
1709	void	1711	void
1710	rxvt_term::focus_in ()	1712	rxvt_term::focus_in ()
1711	{	1713	{
1712	if (!focus)	1714	if (!focus)
1713	{	1715	{
1714	focus = 1;	1716	focus = 1;
1715	want_refresh = 1;	1717	want_refresh = 1;
1716
1717	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718		1718
1719	#if USE_XIM	1719	#if USE_XIM
1720	if (Input_Context != NULL)	1720	if (Input_Context != NULL)
1721	{	1721	{
1722	IMSetPosition ();	1722	IMSetPosition ();
…		…
1734	scr_recolour ();	1734	scr_recolour ();
1735	}	1735	}
1736	#endif	1736	#endif
1737	#if ENABLE_FRILLS	1737	#if ENABLE_FRILLS
1738	if (option (Opt_urgentOnBell))	1738	if (option (Opt_urgentOnBell))
1739	{	1739	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	1740	#endif
		1741
		1742	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747	}	1743	}
1748	}	1744	}
1749		1745
1750	void	1746	void
1751	rxvt_term::focus_out ()	1747	rxvt_term::focus_out ()
…		…
1753	if (focus)	1749	if (focus)
1754	{	1750	{
1755	focus = 0;	1751	focus = 0;
1756	want_refresh = 1;	1752	want_refresh = 1;
1757		1753
1758	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1754	#if ENABLE_FRILLS
1759		1755	if (option (Opt_urgentOnBell))
		1756	set_urgency (0);
		1757	#endif
1760	#if ENABLE_FRILLS \|\| ISO_14755	1758	#if ENABLE_FRILLS \|\| ISO_14755
1761	if (iso14755buf)	1759	if (iso14755buf)
1762	{	1760	{
1763	iso14755buf = 0;	1761	iso14755buf = 0;
1764	# if ISO_14755	1762	# if ISO_14755
…		…
1781	{	1779	{
1782	pix_colors = pix_colors_unfocused;	1780	pix_colors = pix_colors_unfocused;
1783	scr_recolour ();	1781	scr_recolour ();
1784	}	1782	}
1785	#endif	1783	#endif
		1784
		1785	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786	}	1786	}
1787	}	1787	}
1788		1788
1789	void	1789	void
1790	rxvt_term::update_fade_color (unsigned int idx)	1790	rxvt_term::update_fade_color (unsigned int idx)
…		…
1867	/* save the xbutton state (for ButtonRelease) */	1867	/* save the xbutton state (for ButtonRelease) */
1868	MEvent.state = ev.state;	1868	MEvent.state = ev.state;
1869	#ifdef MOUSE_REPORT_DOUBLECLICK	1869	#ifdef MOUSE_REPORT_DOUBLECLICK
1870	if (ev.button == MEvent.button && clickintime)	1870	if (ev.button == MEvent.button && clickintime)
1871	{	1871	{
1872	/* same button, within alloted time */	1872	/* same button, within allowed time */
1873	MEvent.clicks++;	1873	MEvent.clicks++;
1874		1874
1875	if (MEvent.clicks > 1)	1875	if (MEvent.clicks > 1)
1876	{	1876	{
1877	/* only report double clicks */	1877	/* only report double clicks */
…		…
2032	}	2032	}
2033		2033
2034	if (scrollBar.style == R_SB_XTERM	2034	if (scrollBar.style == R_SB_XTERM
2035	\|\| scrollbar_above_slider (ev.y)	2035	\|\| scrollbar_above_slider (ev.y)
2036	\|\| scrollbar_below_slider (ev.y))	2036	\|\| scrollbar_below_slider (ev.y))
2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2038		2038
2039	scrollBar.state = STATE_MOTION;	2039	scrollBar.state = STATE_MOTION;
2040	break;	2040	break;
2041		2041
2042	case Button1:	2042	case Button1:
…		…
2065	else	2065	else
2066	{	2066	{
2067	scr_page ((ev.button == Button1 ? DN : UP),	2067	scr_page ((ev.button == Button1 ? DN : UP),
2068	(nrow	2068	(nrow
2069	* scrollbar_position (ev.y)	2069	* scrollbar_position (ev.y)
2070	/ scrollbar_size ()));	2070	/ scrollBar.size ()));
2071	}	2071	}
2072		2072
2073	break;	2073	break;
2074	}	2074	}
2075	}	2075	}
…		…
2088	reportmode = !! (priv_modes & PrivMode_mouse_report);	2088	reportmode = !! (priv_modes & PrivMode_mouse_report);
2089		2089
2090	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2090	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2091	{	2091	{
2092	scrollBar.state = STATE_IDLE;	2092	scrollBar.state = STATE_IDLE;
2093	scrollbar_show (0);	2093	scrollBar.show (0);
2094	}	2094	}
2095		2095
2096	#ifdef SELECTION_SCROLLING	2096	#ifdef SELECTION_SCROLLING
2097	sel_scroll_ev.stop();	2097	sel_scroll_ev.stop();
2098	#endif	2098	#endif
…		…
2148	selection_make (ev.time);	2148	selection_make (ev.time);
2149	break;	2149	break;
2150		2150
2151	case Button2:	2151	case Button2:
2152	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2152	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);	2153	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154	break;	2154	break;
2155		2155
2156	#ifdef MOUSE_WHEEL	2156	#ifdef MOUSE_WHEEL
2157	case Button4:	2157	case Button4:
2158	case Button5:	2158	case Button5:
…		…
2181	}	2181	}
2182	else	2182	else
2183	# endif	2183	# endif
2184	{	2184	{
2185	scr_page (v, i);	2185	scr_page (v, i);
2186	scrollbar_show (1);	2186	scrollBar.show (1);
2187	}	2187	}
2188	}	2188	}
2189	break;	2189	break;
2190	#endif	2190	#endif
2191	}	2191	}
2192	}	2192	}
2193	}	2193	}
2194		2194
2195	/}}} /	2195	/}}} /
2196		2196
2197	bool	2197	void
2198	rxvt_term::cmd_parse ()	2198	rxvt_term::cmd_parse ()
2199	{	2199	{
2200	bool flag = false;
2201	wchar_t ch = NOCHAR;	2200	wchar_t ch = NOCHAR;
2202	char *seq_begin; // remember start of esc-sequence here	2201	char *seq_begin; // remember start of esc-sequence here
2203		2202
2204	for (;;)	2203	for (;;)
2205	{	2204	{
2206	if (ch == NOCHAR)	2205	if (expect_false (ch == NOCHAR))
2207	{	2206	{
2208	seq_begin = cmdbuf_ptr;	2207	seq_begin = cmdbuf_ptr;
2209	ch = next_char ();	2208	ch = next_char ();
2210		2209
2211	if (ch == NOCHAR)	2210	if (ch == NOCHAR)
2212	break;	2211	break;
2213	}	2212	}
2214		2213
2215	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2214	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2216	{	2215	{
2217	if (!seen_input)	2216	if (expect_false (!seen_input))
2218	{	2217	{
2219	seen_input = 1;	2218	seen_input = 1;
2220	// many badly-written programs (e.g. jed) contain a race condition:	2219	// many badly-written programs (e.g. jed) contain a race condition:
2221	// they first read the screensize and then install a SIGWINCH handler.	2220	// they first read the screensize and then install a SIGWINCH handler.
2222	// some window managers resize the window early, and these programs	2221	// some window managers resize the window early, and these programs
…		…
2235	wchar_t *str = buf;	2234	wchar_t *str = buf;
2236	wchar_t *eol = str + min (ncol, UBUFSIZ);	2235	wchar_t *eol = str + min (ncol, UBUFSIZ);
2237		2236
2238	for (;;)	2237	for (;;)
2239	{	2238	{
2240	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2239	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2241	break;	2240	break;
2242		2241
2243	*str++ = ch;	2242	*str++ = ch;
2244		2243
2245	if (ch == C0_LF \|\| str >= eol)	2244	if (expect_false (ch == C0_LF \|\| str >= eol))
2246	{	2245	{
2247	if (ch == C0_LF)	2246	if (ch == C0_LF)
2248	nlines++;	2247	nlines++;
2249		2248
2250	refresh_count++;	2249	refresh_count++;
…		…
2299	* What the heck we'll cheat and only refresh less than every page-full.	2298	* What the heck we'll cheat and only refresh less than every page-full.
2300	* if skipScroll is enabled.	2299	* if skipScroll is enabled.
2301	*/	2300	*/
2302	if (refreshnow)	2301	if (refreshnow)
2303	{	2302	{
2304	flag = true;
2305	scr_refresh ();	2303	scr_refresh ();
2306	want_refresh = 1;	2304	want_refresh = 1;
2307	}	2305	}
2308
2309	}	2306	}
2310	else	2307	else
2311	{	2308	{
2312	try	2309	try
2313	{	2310	{
…		…
2321	}	2318	}
2322		2319
2323	ch = NOCHAR;	2320	ch = NOCHAR;
2324	}	2321	}
2325	}	2322	}
2326
2327	return flag;
2328	}	2323	}
2329		2324
2330	// read the next character	2325	// read the next character
2331	wchar_t	2326	wchar_t
2332	rxvt_term::next_char () NOTHROW	2327	rxvt_term::next_char () NOTHROW
2333	{	2328	{
2334	while (cmdbuf_ptr < cmdbuf_endp)	2329	while (cmdbuf_ptr < cmdbuf_endp)
2335	{	2330	{
2336	// assume 7-bit to be ascii ALWAYS	2331	// assume 7-bit to be ascii ALWAYS
2337	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2332	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2338	return *cmdbuf_ptr++;	2333	return *cmdbuf_ptr++;
2339		2334
2340	wchar_t wc;	2335	wchar_t wc;
2341	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2336	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2342		2337
…		…
2346	cmdbuf_ptr = cmdbuf_endp;	2341	cmdbuf_ptr = cmdbuf_endp;
2347	break;	2342	break;
2348	}	2343	}
2349		2344
2350	if (len == (size_t)-1)	2345	if (len == (size_t)-1)
		2346	{
		2347	mbstate.reset (); // reset now undefined conversion state
2351	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2348	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2349	}
2352		2350
2353	// assume wchar == unicode	2351	// assume wchar == unicode
2354	cmdbuf_ptr += len;	2352	cmdbuf_ptr += len;
2355	return wc & UNICODE_MASK;	2353	return wc & UNICODE_MASK;
2356	}	2354	}
…		…
2400	/----------------------------------------------------------------------/	2398	/----------------------------------------------------------------------/
2401	#ifdef PRINTPIPE	2399	#ifdef PRINTPIPE
2402	FILE *	2400	FILE *
2403	rxvt_term::popen_printer ()	2401	rxvt_term::popen_printer ()
2404	{	2402	{
2405	FILE *stream = popen (rs[Rs_print_pipe], "w");	2403	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406		2404
2407	if (stream == NULL)	2405	if (stream == NULL)
2408	rxvt_warn ("can't open printer pipe, not printing.\n");	2406	rxvt_warn ("can't open printer pipe, not printing.\n");
2409		2407
2410	return stream;	2408	return stream;
…		…
2421	* simulate attached vt100 printer	2419	* simulate attached vt100 printer
2422	*/	2420	*/
2423	void	2421	void
2424	rxvt_term::process_print_pipe ()	2422	rxvt_term::process_print_pipe ()
2425	{	2423	{
2426	int done;	2424	FILE *fd = popen_printer ();
2427	FILE *fd;
2428		2425
2429	if ((fd = popen_printer ()) == NULL)	2426	if (!fd)
2430	return;	2427	return;
2431		2428
2432	/*	2429	/*
2433	* Send all input to the printer until either ESC[4i or ESC[?4i	2430	* Send all input to the printer until either ESC[4i or ESC[?4i
2434	* is received.	2431	* is received.
2435	*/	2432	*/
2436	for (done = 0; !done;)	2433	for (int done = 0; !done; )
2437	{	2434	{
2438	unsigned char buf[8];	2435	unsigned char buf[8];
2439	unicode_t ch;	2436	unicode_t ch;
2440	unsigned int i, len;	2437	unsigned int i, len;
2441		2438
…		…
2586	break;	2583	break;
2587	case 'Z': /* identify the terminal type */	2584	case 'Z': /* identify the terminal type */
2588	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2585	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589	break;	2586	break;
2590	case '<': /* turn off VT52 mode */	2587	case '<': /* turn off VT52 mode */
2591	PrivMode (0, PrivMode_vt52);	2588	set_privmode (PrivMode_vt52, 0);
2592	break;	2589	break;
2593	case 'F': /* use special graphics character set */	2590	case 'F': /* use special graphics character set */
2594	case 'G': /* use regular character set */	2591	case 'G': /* use regular character set */
2595	/* unimplemented */	2592	/* unimplemented */
2596	break;	2593	break;
…		…
2650	scr_forwardindex ();	2647	scr_forwardindex ();
2651	break;	2648	break;
2652	#endif	2649	#endif
2653	case '=':	2650	case '=':
2654	case '>':	2651	case '>':
2655	PrivMode ((ch == '='), PrivMode_aplKP);	2652	set_privmode (PrivMode_aplKP, ch == '=');
2656	break;	2653	break;
2657		2654
2658	case C1_40:	2655	case C1_40:
2659	cmd_getc ();	2656	cmd_getc ();
2660	break;	2657	break;
…		…
2699	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2696	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700	case C1_SCI: /* ESC Z */	2697	case C1_SCI: /* ESC Z */
2701	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2698	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702	break; /* steal obsolete ESC [ c */	2699	break; /* steal obsolete ESC [ c */
2703		2700
2704	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2701	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705	case C1_CSI: /* ESC [ */	2702	case C1_CSI: /* ESC [ */
2706	process_csi_seq ();	2703	process_csi_seq ();
2707	break;	2704	break;
2708		2705
2709	/* 8.3.90: OPERATING SYSTEM COMMAND */	2706	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710	case C1_OSC: /* ESC ] */	2707	case C1_OSC: /* ESC ] */
2711	process_osc_seq ();	2708	process_osc_seq ();
2712	break;	2709	break;
2713		2710
2714	/* 8.3.106: RESET TO INITIAL STATE */	2711	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715	case 'c':	2712	case 'c':
2716	mbstate.reset ();	2713	mbstate.reset ();
2717	scr_poweron ();	2714	scr_poweron ();
2718	scrollbar_show (1);	2715	scrollBar.show (1);
2719	break;	2716	break;
2720		2717
2721	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2718	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722	case 'n':	2719	case 'n':
2723	scr_charset_choose (2);	2720	scr_charset_choose (2);
…		…
2774		2771
2775	nargs = 0;	2772	nargs = 0;
2776		2773
2777	priv = 0;	2774	priv = 0;
2778	ch = cmd_getc ();	2775	ch = cmd_getc ();
2779	if (ch >= '<' && ch <= '?')	2776	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2780	{	2777	{
2781	/* '<' '=' '>' '?' */	2778	/* '<' '=' '>' '?' '!' */
2782	priv = ch;	2779	priv = ch;
2783	ch = cmd_getc ();	2780	ch = cmd_getc ();
2784	}	2781	}
2785		2782
2786	/* read any numerical arguments */	2783	/* read any numerical arguments */
…		…
2840		2837
2841	case '?':	2838	case '?':
2842	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2839	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2843	process_terminal_mode (ch, priv, nargs, arg);	2840	process_terminal_mode (ch, priv, nargs, arg);
2844	break;	2841	break;
		2842
		2843	case '!':
		2844	if (ch == CSI_70)
		2845	{
		2846	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2847	scr_soft_reset ();
		2848
		2849	static const int pm_h[] = { 7, 25 };
		2850	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2851
		2852	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2853	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2845	}	2854	}
		2855	break;
		2856	}
		2857
2846	return;	2858	return;
2847	}	2859	}
2848		2860
2849	switch (ch)	2861	switch (ch)
2850	{	2862	{
…		…
3217	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3229	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3218	*/	3230	*/
3219	void	3231	void
3220	rxvt_term::process_dcs_seq ()	3232	rxvt_term::process_dcs_seq ()
3221	{	3233	{
3222	char *s;
3223	unicode_t eh;
3224
3225	/*	3234	/*
3226	* Not handled yet	3235	* Not handled yet
3227	*/	3236	*/
		3237
		3238	unicode_t eh;
3228	s = get_to_st (eh);	3239	char *s = get_to_st (eh);
3229	if (s)	3240	if (s)
3230	free (s);	3241	free (s);
3231		3242
3232	return;	3243	return;
3233	}	3244	}
…		…
3237	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3248	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3238	*/	3249	*/
3239	void	3250	void
3240	rxvt_term::process_osc_seq ()	3251	rxvt_term::process_osc_seq ()
3241	{	3252	{
3242	unicode_t ch, eh;
3243	int arg;	3253	int arg;
3244		3254
3245	ch = cmd_getc ();	3255	unicode_t ch = cmd_getc ();
3246	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3256	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3247	arg = arg * 10 + (ch - '0');	3257	arg = arg * 10 + (ch - '0');
3248		3258
3249	if (ch == ';')	3259	if (ch == ';')
3250	{	3260	{
		3261	unicode_t eh;
3251	char *s = get_to_st (eh);	3262	char *s = get_to_st (eh);
3252		3263
3253	if (s)	3264	if (s)
3254	{	3265	{
3255	process_xterm_seq (arg, s, eh);	3266	process_xterm_seq (arg, s, eh);
…		…
3279		3290
3280	/*	3291	/*
3281	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3292	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3282	*/	3293	*/
3283	void	3294	void
3284	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3295	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3285	{	3296	{
3286	int color;	3297	int color;
3287	char buf, name;	3298	char buf, name;
3288	bool query = str[0] == '?' && !str[1];	3299	bool query = str[0] == '?' && !str[1];
3289	int saveop = op;	3300	int saveop = op;
…		…
3330		3341
3331	XFree (value);	3342	XFree (value);
3332	}	3343	}
3333	else	3344	else
3334	{	3345	{
3335	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3346	char *eq = strchr (str, '=');
3336		3347
3337	if (eq)	3348	if (eq)
3338	{	3349	{
3339	*eq = 0;	3350	*eq = 0;
3340	set_utf8_property (display->atom (str), eq + 1);	3351	set_utf8_property (display->atom (str), eq + 1);
…		…
3380	process_color_seq (op, Color_pointer_fg, str, resp);	3391	process_color_seq (op, Color_pointer_fg, str, resp);
3381	break;	3392	break;
3382	case XTerm_Color_pointer_bg:	3393	case XTerm_Color_pointer_bg:
3383	process_color_seq (op, Color_pointer_bg, str, resp);	3394	process_color_seq (op, Color_pointer_bg, str, resp);
3384	break;	3395	break;
		3396	#ifdef OPTION_HC
		3397	case XTerm_Color_HC:
		3398	process_color_seq (op, Color_HC, str, resp);
		3399	break;
		3400	case XTerm_Color_HTC:
		3401	process_color_seq (op, Color_HTC, str, resp);
		3402	break;
		3403	#endif
3385	#ifndef NO_BOLD_UNDERLINE_REVERSE	3404	#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:	3405	case URxvt_Color_BD:
3391	process_color_seq (op, Color_BD, str, resp);	3406	process_color_seq (op, Color_BD, str, resp);
3392	break;	3407	break;
3393	case Rxvt_Color_UL:
3394	case URxvt_Color_UL:	3408	case URxvt_Color_UL:
3395	process_color_seq (op, Color_UL, str, resp);	3409	process_color_seq (op, Color_UL, str, resp);
3396	break;	3410	break;
3397	case URxvt_Color_IT:	3411	case URxvt_Color_IT:
3398	process_color_seq (op, Color_IT, str, resp);	3412	process_color_seq (op, Color_IT, str, resp);
3399	break;	3413	break;
3400	#endif	3414	#endif
		3415	case URxvt_Color_border:
		3416	process_color_seq (op, Color_border, str, resp);
		3417	break;
3401	#if ENABLE_TRANSPARENCY	3418	#if ENABLE_TRANSPARENCY
3402	case URxvt_Color_tint:	3419	case URxvt_Color_tint:
3403	process_color_seq (op, Color_tint, str, resp);	3420	process_color_seq (op, Color_tint, str, resp);
3404	{	3421	{
3405	bool changed = false;	3422	bool changed = false;
…		…
3420	case Rxvt_Pixmap:	3437	case Rxvt_Pixmap:
3421	if (!strcmp (str, "?"))	3438	if (!strcmp (str, "?"))
3422	{	3439	{
3423	char str[256];	3440	char str[256];
3424		3441
3425	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3442	sprintf (str, "[%dx%d+%d+%d]",
3426	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3443	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3427	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3444	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428	process_xterm_seq (XTerm_title, str, CHAR_ST);	3445	process_xterm_seq (XTerm_title, str, CHAR_ST);
3429	}	3446	}
3430	else	3447	else
3431	{	3448	{
3432	int changed = 0;	3449	int changed = 0;
3433		3450
3434	if (*str != ';')	3451	if (*str != ';')
3435	{	3452	{
3436	/* reset to default scaling :*/
3437	bgPixmap.unset_geometry ();
3438	if (bgPixmap.set_file (str)) /* change pixmap */	3453	if (bgPixmap.set_file (str)) /* change pixmap */
3439	changed++;	3454	changed++;
3440	str = strchr (str, ';');	3455	str = strchr (str, ';');
3441	if (str == NULL)	3456	if (str == NULL)
3442	bgPixmap.set_defaultGeometry ();	3457	bgPixmap.set_defaultGeometry ();
		3458	else
		3459	bgPixmap.set_geometry (str+1);
3443	}	3460	}
3444		3461	else
3445	while (str)
3446	{	3462	{
3447	str++;	3463	str++;
3448	if (bgPixmap.set_geometry (str))	3464	if (bgPixmap.set_geometry (str, true))
3449	changed++;	3465	changed++;
3450	str = strchr (str, ';');
3451	}	3466	}
3452		3467
3453	if (changed)	3468	if (changed)
3454	update_background ();	3469	update_background ();
3455	}	3470	}
…		…
3529	break;	3544	break;
3530	#endif	3545	#endif
3531		3546
3532	#if ENABLE_PERL	3547	#if ENABLE_PERL
3533	case URxvt_perl:	3548	case URxvt_perl:
3534	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3549	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3535	; // no responses yet
3536	break;	3550	break;
3537	#endif	3551	#endif
3538	}	3552	}
3539	}	3553	}
3540	/----------------------------------------------------------------------/	3554	/----------------------------------------------------------------------/
…		…
3563	{	3577	{
3564	if (mode == 'r')	3578	if (mode == 'r')
3565	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3579	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566	else	3580	else
3567	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3581	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568	PrivMode (state, bit);	3582
		3583	set_privmode (bit, state);
3569	}	3584	}
3570		3585
3571	return state;	3586	return state;
3572	}	3587	}
3573		3588
…		…
3581	static const struct	3596	static const struct
3582	{	3597	{
3583	const int argval;	3598	const int argval;
3584	const unsigned long bit;	3599	const unsigned long bit;
3585	} argtopriv[] = {	3600	} argtopriv[] = {
3586	{ 1, PrivMode_aplCUR },	3601	{ 1, PrivMode_aplCUR }, // DECCKM
3587	{ 2, PrivMode_vt52 },	3602	{ 2, PrivMode_vt52 },
3588	{ 3, PrivMode_132 },	3603	{ 3, PrivMode_132 }, // DECCOLM
3589	{ 4, PrivMode_smoothScroll },	3604	{ 4, PrivMode_smoothScroll }, // DECSCLM
3590	{ 5, PrivMode_rVideo },	3605	{ 5, PrivMode_rVideo }, // DECSCNM
3591	{ 6, PrivMode_relOrigin },	3606	{ 6, PrivMode_relOrigin }, // DECOM
3592	{ 7, PrivMode_Autowrap },	3607	{ 7, PrivMode_Autowrap }, // DECAWM
3593	// 8, bi-directional support mode	3608	// 8, auto-repeat keys // DECARM
3594	{ 9, PrivMode_MouseX10 },	3609	{ 9, PrivMode_MouseX10 },
3595	// 18, 19 printing-related	3610	// 18 end FF to printer after print screen
		3611	// 19 Print screen prints full screen/scroll region
3596	{ 25, PrivMode_VisibleCursor },	3612	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3597	#ifdef scrollBar_esc	3613	#ifdef scrollBar_esc
3598	{ scrollBar_esc, PrivMode_scrollBar },	3614	{ scrollBar_esc, PrivMode_scrollBar },
3599	#endif	3615	#endif
3600	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3616	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3617	// 38, tektronix mode // DECTEK
3601	{ 40, PrivMode_132OK },	3618	{ 40, PrivMode_132OK },
3602	// 41 xterm more fixes NYI	3619	// 41 xterm more fixes NYI
3603	// 45 margin bell NYI	3620	// 45 margin bell NYI
3604	// 46 start logging	3621	// 46 start logging
3605	{ 47, PrivMode_Screen },	3622	{ 47, PrivMode_Screen },
3606	{ 66, PrivMode_aplKP },	3623	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3607	#ifndef NO_BACKSPACE_KEY	3624	#ifndef NO_BACKSPACE_KEY
3608	{ 67, PrivMode_BackSpace },	3625	{ 67, PrivMode_BackSpace }, // DECBKM
3609	#endif	3626	#endif
3610	{ 1000, PrivMode_MouseX11 },	3627	{ 1000, PrivMode_MouseX11 },
3611	{ 1002, PrivMode_MouseBtnEvent },	3628	{ 1002, PrivMode_MouseBtnEvent },
3612	{ 1003, PrivMode_MouseAnyEvent },	3629	{ 1003, PrivMode_MouseAnyEvent },
3613	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3630	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3652		3669
3653	scr_touch (true);	3670	scr_touch (true);
3654	break;	3671	break;
3655	#endif	3672	#endif
3656	case 1048: /* alternative cursor save */	3673	case 1048: /* alternative cursor save */
3657	case 1049:
3658	if (option (Opt_secondaryScreen))	3674	if (option (Opt_secondaryScreen))
3659	if (mode == 0)	3675	if (mode == 0)
3660	scr_cursor (RESTORE);	3676	scr_cursor (RESTORE);
3661	else if (mode == 1)	3677	else if (mode == 1)
3662	scr_cursor (SAVE);	3678	scr_cursor (SAVE);
…		…
3671	case 2: /* VT52 mode */	3687	case 2: /* VT52 mode */
3672	/* oddball mode. should be set regardless of set/reset	3688	/* oddball mode. should be set regardless of set/reset
3673	* parameter. Return from VT52 mode with an ESC < from	3689	* parameter. Return from VT52 mode with an ESC < from
3674	* within VT52 mode	3690	* within VT52 mode
3675	*/	3691	*/
3676	PrivMode (1, PrivMode_vt52);	3692	set_privmode (PrivMode_vt52, 1);
3677	break;	3693	break;
3678	case 3: /* 80/132 */	3694	case 3: /* 80/132 */
3679	if (priv_modes & PrivMode_132OK)	3695	if (priv_modes & PrivMode_132OK)
3680	{
3681	scr_poweron ();
3682	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3696	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3683	}
3684	break;	3697	break;
3685	case 4: /* smooth scrolling */	3698	case 4: /* smooth scrolling */
3686	set_option (Opt_jumpScroll, !state);	3699	set_option (Opt_jumpScroll, !state);
3687	break;	3700	break;
3688	case 5: /* reverse video */	3701	case 5: /* reverse video */
…		…
3699	if (state) /* orthogonal */	3712	if (state) /* orthogonal */
3700	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3713	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3701	break;	3714	break;
3702	#ifdef scrollBar_esc	3715	#ifdef scrollBar_esc
3703	case scrollBar_esc:	3716	case scrollBar_esc:
3704	if (scrollbar_mapping (state))	3717	if (scrollBar.map (state))
3705	{	3718	{
3706	resize_all_windows (0, 0, 0);	3719	resize_all_windows (0, 0, 0);
3707	scr_touch (true);	3720	scr_touch (true);
3708	}	3721	}
3709	break;	3722	break;
…		…
3730	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3743	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3731	vt_emask_mouse = PointerMotionMask;	3744	vt_emask_mouse = PointerMotionMask;
3732	}	3745	}
3733	else	3746	else
3734	vt_emask_mouse = NoEventMask;	3747	vt_emask_mouse = NoEventMask;
		3748
3735	vt_select_input ();	3749	vt_select_input ();
3736	break;	3750	break;
3737	case 1010: /* scroll to bottom on TTY output inhibit */	3751	case 1010: /* scroll to bottom on TTY output inhibit */
3738	set_option (Opt_scrollTtyOutput, !state);	3752	set_option (Opt_scrollTtyOutput, !state);
3739	break;	3753	break;
3740	case 1011: /* scroll to bottom on key press */	3754	case 1011: /* scroll to bottom on key press */
3741	set_option (Opt_scrollTtyKeypress, state);	3755	set_option (Opt_scrollTtyKeypress, state);
3742	break;	3756	break;
3743	case 1047: /* secondary screen w/ clearing last */	3757	case 1047: /* secondary screen w/ clearing last */
3744	if (option (Opt_secondaryScreen))	3758	if (option (Opt_secondaryScreen))
3745	if (current_screen != PRIMARY)	3759	if (!state)
3746	scr_erase_screen (2);	3760	scr_erase_screen (2);
		3761
3747	scr_change_screen (state);	3762	scr_change_screen (state);
3748	break;	3763	break;
3749	case 1049: /* secondary screen w/ clearing first */	3764	case 1049: /* secondary screen w/ clearing first */
		3765	if (option (Opt_secondaryScreen))
		3766	if (state)
		3767	scr_cursor (SAVE);
		3768
3750	scr_change_screen (state);	3769	scr_change_screen (state);
		3770
3751	if (option (Opt_secondaryScreen))	3771	if (option (Opt_secondaryScreen))
3752	if (current_screen != PRIMARY)	3772	if (state)
3753	scr_erase_screen (2);	3773	scr_erase_screen (2);
		3774	else
		3775	scr_cursor (RESTORE);
3754	break;	3776	break;
3755	default:	3777	default:
3756	break;	3778	break;
3757	}	3779	}
3758	}	3780	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs. Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC