[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC vs.
Revision 1.439 by sf-exg, Wed Feb 10 16:05:42 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 (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
…		…
279	}	285	}
280		286
281	iso14755buf = 0;	287	iso14755buf = 0;
282	}	288	}
283		289
284	int	290	static int
285	rxvt_term::hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
286	{	292	{
287	// check wether this event corresponds to a hex digit	293	// check wether 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	{
…		…
297	}	303	}
298		304
299	return -1;	305	return -1;
300	}	306	}
301	#endif	307	#endif
		308
		309	static inline KeySym
		310	translate_keypad (KeySym keysym, bool kp)
		311	{
		312	#ifdef XK_KP_Home
		313	static const KeySym keypadtrans[] = {
		314	XK_KP_7, // XK_KP_Home
		315	XK_KP_4, // XK_KP_Left
		316	XK_KP_8, // XK_KP_Up
		317	XK_KP_6, // XK_KP_Right
		318	XK_KP_2, // XK_KP_Down
		319	# ifndef UNSHIFTED_SCROLLKEYS
		320	XK_KP_9, // XK_KP_Prior
		321	XK_KP_3, // XK_KP_Next
		322	# else
		323	XK_Prior,
		324	XK_Next,
		325	# endif
		326	XK_KP_1, // XK_KP_End
		327	XK_KP_5, // XK_KP_Begin
		328	};
		329
		330	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		331	{
		332	unsigned int index = keysym - XK_KP_Home;
		333	keysym = kp ? keypadtrans[index] : XK_Home + index;
		334	}
		335	else if (keysym == XK_KP_Insert)
		336	keysym = kp ? XK_KP_0 : XK_Insert;
		337	# ifndef NO_DELETE_KEY
		338	else if (keysym == XK_KP_Delete)
		339	keysym = kp ? XK_KP_Decimal : XK_Delete;
		340	# endif
		341	#endif
		342	return keysym;
		343	}
		344
		345	static inline int
		346	map_function_key (KeySym keysym)
		347	{
		348	int param = 0;
		349
		350	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		351	{
		352	param = 11 + keysym - XK_F1;
		353	if (keysym >= XK_F17)
		354	param += 4;
		355	else if (keysym >= XK_F15)
		356	param += 3;
		357	else if (keysym >= XK_F11)
		358	param += 2;
		359	else if (keysym >= XK_F6)
		360	param += 1;
		361	}
		362	else
		363	switch (keysym)
		364	{
		365	case XK_Find:
		366	param = 1;
		367	break;
		368	case XK_Insert:
		369	param = 2;
		370	break;
		371	#ifdef DXK_Remove
		372	case DXK_Remove:
		373	#endif
		374	case XK_Execute:
		375	param = 3;
		376	break;
		377	case XK_Select:
		378	param = 4;
		379	break;
		380	#ifndef UNSHIFTED_SCROLLKEYS
		381	case XK_Prior:
		382	param = 5;
		383	break;
		384	case XK_Next:
		385	param = 6;
		386	break;
		387	case XK_Home:
		388	param = 7;
		389	break;
		390	case XK_End:
		391	param = 8;
		392	break;
		393	#endif
		394	case XK_Help:
		395	param = 28;
		396	break;
		397	case XK_Menu:
		398	param = 29;
		399	break;
		400	}
		401	return param;
		402	}
302		403
303	void	404	void
304	rxvt_term::key_press (XKeyEvent &ev)	405	rxvt_term::key_press (XKeyEvent &ev)
305	{	406	{
306	int ctrl, meta, shft, len;	407	int ctrl, meta, shft, len;
…		…
324	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
325		426
326	if (numlock_state \|\| (ev.state & ModNumLockMask))	427	if (numlock_state \|\| (ev.state & ModNumLockMask))
327	{	428	{
328	numlock_state = (ev.state & ModNumLockMask);	429	numlock_state = (ev.state & ModNumLockMask);
329	PrivMode ((!numlock_state), PrivMode_aplKP);	430	set_privmode (PrivMode_aplKP, !numlock_state);
330	}	431	}
331		432
332	kbuf[0] = 0;	433	kbuf[0] = 0;
333		434
334	#ifdef USE_XIM	435	#ifdef USE_XIM
…		…
410	#ifdef PAGING_CONTEXT_LINES	511	#ifdef PAGING_CONTEXT_LINES
411	lnsppg = nrow - PAGING_CONTEXT_LINES;	512	lnsppg = nrow - PAGING_CONTEXT_LINES;
412	#else	513	#else
413	lnsppg = nrow * 4 / 5;	514	lnsppg = nrow * 4 / 5;
414	#endif	515	#endif
		516	max_it (lnsppg, 1);
		517
415	if (keysym == XK_Prior)	518	if (keysym == XK_Prior)
416	{	519	{
417	scr_page (UP, lnsppg);	520	scr_page (UP, lnsppg);
418	return;	521	return;
419	}	522	}
…		…
484	}	587	}
485	}	588	}
486		589
487	#if ENABLE_FRILLS \|\| ISO_14755	590	#if ENABLE_FRILLS \|\| ISO_14755
488	// ISO 14755 support	591	// ISO 14755 support
489	if (shft && ctrl)	592	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
490	{	593	{
491	int hv;	594	int hv;
492		595
493	if (iso14755buf & ISO_14755_51	596	if (iso14755buf & ISO_14755_51
494	&& (keysym == XK_space \|\| keysym == XK_KP_Space	597	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
524	scr_overlay_off ();	627	scr_overlay_off ();
525	# endif	628	# endif
526	iso14755buf = 0;	629	iso14755buf = 0;
527	}	630	}
528	}	631	}
		632	else if (option (Opt_iso14755) &&
529	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	633	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
530	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	634	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
531	if (!(iso14755buf & ISO_14755_STARTED))	635	if (!(iso14755buf & ISO_14755_STARTED))
532	{	636	{
533	iso14755buf \|= ISO_14755_STARTED;	637	iso14755buf \|= ISO_14755_STARTED;
534	# if ISO_14755	638	# if ISO_14755
535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	639	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
546	}	650	}
547	#endif	651	#endif
548		652
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	653	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	654	{
551	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	655	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552	unsigned int newlen = 1;	656	unsigned int newlen = 1;
553	#ifdef XK_KP_Home	657
554	static const KeySym keypadtrans[] = {	658	switch (translate_keypad (keysym, kp))
555	XK_KP_7, // XK_KP_Home	659	{
556	XK_KP_4, // XK_KP_Left	660	#ifndef NO_BACKSPACE_KEY
557	XK_KP_8, // XK_KP_Up	661	case XK_BackSpace:
558	XK_KP_6, // XK_KP_Right	662	if (priv_modes & PrivMode_HaveBackSpace)
559	XK_KP_2, // XK_KP_Down	663	{
560	#ifndef UNSHIFTED_SCROLLKEYS	664	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	XK_KP_9, // XK_KP_Prior	665	^ !!ctrl) ? '\b' : '\177';
562	XK_KP_3, // XK_KP_Next	666	kbuf[1] = '\0';
563	#else
564	XK_Prior,
565	XK_Next,
566	#endif
567	XK_KP_1, // XK_KP_End
568	XK_KP_5, // XK_KP_Begin
569	};	667	}
		668	else
		669	strcpy (kbuf, rs[Rs_backspace_key]);
		670	break;
		671	#endif
		672	#ifndef NO_DELETE_KEY
		673	case XK_Delete:
		674	strcpy (kbuf, rs[Rs_delete_key]);
		675	break;
		676	#endif
		677	case XK_Tab:
		678	if (shft)
		679	strcpy (kbuf, "\033[Z");
		680	else
		681	{
		682	#ifdef CTRL_TAB_MAKES_META
		683	if (ctrl)
		684	meta = 1;
		685	#endif
		686	#ifdef MOD4_TAB_MAKES_META
		687	if (ev.state & Mod4Mask)
		688	meta = 1;
		689	#endif
		690	newlen = 0;
		691	}
		692	break;
570		693
571	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	694	case XK_Up: /* "\033[A" */
		695	case XK_Down: /* "\033[B" */
		696	case XK_Right: /* "\033[C" */
		697	case XK_Left: /* "\033[D" */
		698	strcpy (kbuf, "\033[Z");
		699	kbuf[2] = "DACB"[keysym - XK_Left];
		700	/* do Shift first */
		701	if (shft)
		702	kbuf[2] = "dacb"[keysym - XK_Left];
		703	else if (ctrl)
		704	{
		705	kbuf[1] = 'O';
		706	kbuf[2] = "dacb"[keysym - XK_Left];
		707	}
		708	else if (priv_modes & PrivMode_aplCUR)
		709	kbuf[1] = 'O';
		710	break;
		711
		712	case XK_KP_Enter:
		713	/* allow shift to override */
		714	if (kp)
		715	{
		716	strcpy (kbuf, "\033OM");
		717	break;
		718	}
		719
		720	/* FALLTHROUGH */
		721
		722	case XK_Return:
		723	if (priv_modes & PrivMode_LFNL)
		724	{
		725	kbuf[0] = '\015';
		726	kbuf[1] = '\012';
		727	kbuf[2] = '\0';
		728	}
		729	else
		730	{
		731	kbuf[0] = '\015';
		732	kbuf[1] = '\0';
		733	}
		734	break;
		735
		736	case XK_KP_F1: /* "\033OP" */
		737	case XK_KP_F2: /* "\033OQ" */
		738	case XK_KP_F3: /* "\033OR" */
		739	case XK_KP_F4: /* "\033OS" */
		740	strcpy (kbuf, "\033OP");
		741	kbuf[2] += (keysym - XK_KP_F1);
		742	break;
		743
		744	case XK_KP_Multiply: /* "\033Oj" : "" /
		745	case XK_KP_Add: /* "\033Ok" : "+" */
		746	case XK_KP_Separator: /* "\033Ol" : "," */
		747	case XK_KP_Subtract: /* "\033Om" : "-" */
		748	case XK_KP_Decimal: /* "\033On" : "." */
		749	case XK_KP_Divide: /* "\033Oo" : "/" */
		750	case XK_KP_0: /* "\033Op" : "0" */
		751	case XK_KP_1: /* "\033Oq" : "1" */
		752	case XK_KP_2: /* "\033Or" : "2" */
		753	case XK_KP_3: /* "\033Os" : "3" */
		754	case XK_KP_4: /* "\033Ot" : "4" */
		755	case XK_KP_5: /* "\033Ou" : "5" */
		756	case XK_KP_6: /* "\033Ov" : "6" */
		757	case XK_KP_7: /* "\033Ow" : "7" */
		758	case XK_KP_8: /* "\033Ox" : "8" */
		759	case XK_KP_9: /* "\033Oy" : "9" */
		760	/* allow shift to override */
		761	if (kp)
		762	{
		763	strcpy (kbuf, "\033Oj");
		764	kbuf[2] += (keysym - XK_KP_Multiply);
		765	}
		766	else
		767	{
		768	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		769	kbuf[1] = '\0';
		770	}
		771	break;
		772
		773	default:
572	{	774	{
573	unsigned int index = keysym - XK_KP_Home;	775	int param = map_function_key (keysym);
574	keysym = kp ? keypadtrans[index] : XK_Home + index;	776	if (param > 0)
		777	sprintf (kbuf,"\033[%d~", param);
		778	else
		779	newlen = 0;
575	}	780	}
576	else if (keysym == XK_KP_Insert)
577	keysym = kp ? XK_KP_0 : XK_Insert;
578	#ifndef NO_DELETE_KEY
579	else if (keysym == XK_KP_Delete)
580	keysym = kp ? XK_KP_Decimal : XK_Delete;
581	#endif
582	#endif
583	switch (keysym)
584	{
585	#ifndef NO_BACKSPACE_KEY
586	case XK_BackSpace:
587	if (priv_modes & PrivMode_HaveBackSpace)
588	{
589	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
590	^ !!ctrl) ? '\b' : '\177';
591	kbuf[1] = '\0';
592	}
593	else
594	strcpy (kbuf, rs[Rs_backspace_key]);
595	break;	781	break;
596	#endif
597	#ifndef NO_DELETE_KEY
598	case XK_Delete:
599	strcpy (kbuf, rs[Rs_delete_key]);
600	break;
601	#endif
602	case XK_Tab:
603	if (shft)
604	strcpy (kbuf, "\033[Z");
605	else
606	{
607	#ifdef CTRL_TAB_MAKES_META
608	if (ctrl)
609	meta = 1;
610	#endif
611	#ifdef MOD4_TAB_MAKES_META
612	if (ev.state & Mod4Mask)
613	meta = 1;
614	#endif
615	newlen = 0;
616	}
617	break;
618
619	case XK_Up: /* "\033[A" */
620	case XK_Down: /* "\033[B" */
621	case XK_Right: /* "\033[C" */
622	case XK_Left: /* "\033[D" */
623	strcpy (kbuf, "\033[Z");
624	kbuf[2] = "DACB"[keysym - XK_Left];
625	/* do Shift first */
626	if (shft)
627	kbuf[2] = "dacb"[keysym - XK_Left];
628	else if (ctrl)
629	{
630	kbuf[1] = 'O';
631	kbuf[2] = "dacb"[keysym - XK_Left];
632	}
633	else if (priv_modes & PrivMode_aplCUR)
634	kbuf[1] = 'O';
635	break;
636
637	#ifndef UNSHIFTED_SCROLLKEYS
638	case XK_Prior:
639	strcpy (kbuf, "\033[5~");
640	break;
641	case XK_Next:
642	strcpy (kbuf, "\033[6~");
643	break;
644	#endif
645	case XK_KP_Enter:
646	/* allow shift to override */
647	if (kp)
648	{
649	strcpy (kbuf, "\033OM");
650	break;
651	}
652
653	/* FALLTHROUGH */
654
655	case XK_Return:
656	if (priv_modes & PrivMode_LFNL)
657	{
658	kbuf[0] = '\015';
659	kbuf[1] = '\012';
660	kbuf[2] = '\0';
661	}
662	else
663	{
664	kbuf[0] = '\015';
665	kbuf[1] = '\0';
666	}
667	break;
668
669	case XK_KP_F1: /* "\033OP" */
670	case XK_KP_F2: /* "\033OQ" */
671	case XK_KP_F3: /* "\033OR" */
672	case XK_KP_F4: /* "\033OS" */
673	strcpy (kbuf, "\033OP");
674	kbuf[2] += (keysym - XK_KP_F1);
675	break;
676
677	case XK_KP_Multiply: /* "\033Oj" : "" /
678	case XK_KP_Add: /* "\033Ok" : "+" */
679	case XK_KP_Separator: /* "\033Ol" : "," */
680	case XK_KP_Subtract: /* "\033Om" : "-" */
681	case XK_KP_Decimal: /* "\033On" : "." */
682	case XK_KP_Divide: /* "\033Oo" : "/" */
683	case XK_KP_0: /* "\033Op" : "0" */
684	case XK_KP_1: /* "\033Oq" : "1" */
685	case XK_KP_2: /* "\033Or" : "2" */
686	case XK_KP_3: /* "\033Os" : "3" */
687	case XK_KP_4: /* "\033Ot" : "4" */
688	case XK_KP_5: /* "\033Ou" : "5" */
689	case XK_KP_6: /* "\033Ov" : "6" */
690	case XK_KP_7: /* "\033Ow" : "7" */
691	case XK_KP_8: /* "\033Ox" : "8" */
692	case XK_KP_9: /* "\033Oy" : "9" */
693	/* allow shift to override */
694	if (kp)
695	{
696	strcpy (kbuf, "\033Oj");
697	kbuf[2] += (keysym - XK_KP_Multiply);
698	}
699	else
700	{
701	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
702	kbuf[1] = '\0';
703	}
704	break;
705
706	case XK_Find:
707	strcpy (kbuf, "\033[1~");
708	break;
709
710	case XK_Insert:
711	strcpy (kbuf, "\033[2~");
712	break;
713	#ifdef DXK_Remove /* support for DEC remove like key */
714	case DXK_Remove:
715	/* FALLTHROUGH */
716	#endif
717	case XK_Execute:
718	strcpy (kbuf, "\033[3~");
719	break;
720	case XK_Select:
721	strcpy (kbuf, "\033[4~");
722	break;
723	case XK_End:
724	strcpy (kbuf, KS_END);
725	break;
726	case XK_Home:
727	strcpy (kbuf, KS_HOME);
728	break;
729
730	#define FKEY(n, fkey) \
731	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
732
733	case XK_F1: /* "\033[11~" */
734	case XK_F2: /* "\033[12~" */
735	case XK_F3: /* "\033[13~" */
736	case XK_F4: /* "\033[14~" */
737	case XK_F5: /* "\033[15~" */
738	FKEY (11, XK_F1);
739	break;
740	case XK_F6: /* "\033[17~" */
741	case XK_F7: /* "\033[18~" */
742	case XK_F8: /* "\033[19~" */
743	case XK_F9: /* "\033[20~" */
744	case XK_F10: /* "\033[21~" */
745	FKEY (17, XK_F6);
746	break;
747	case XK_F11: /* "\033[23~" */
748	case XK_F12: /* "\033[24~" */
749	case XK_F13: /* "\033[25~" */
750	case XK_F14: /* "\033[26~" */
751	FKEY (23, XK_F11);
752	break;
753	case XK_F15: /* "\033[28~" */
754	case XK_F16: /* "\033[29~" */
755	FKEY (28, XK_F15);
756	break;
757	case XK_Help: /* "\033[28~" */
758	FKEY (28, XK_Help);
759	break;
760	case XK_Menu: /* "\033[29~" */
761	FKEY (29, XK_Menu);
762	break;
763	case XK_F17: /* "\033[31~" */
764	case XK_F18: /* "\033[32~" */
765	case XK_F19: /* "\033[33~" */
766	case XK_F20: /* "\033[34~" */
767	case XK_F21: /* "\033[35~" */
768	case XK_F22: /* "\033[36~" */
769	case XK_F23: /* "\033[37~" */
770	case XK_F24: /* "\033[38~" */
771	case XK_F25: /* "\033[39~" */
772	case XK_F26: /* "\033[40~" */
773	case XK_F27: /* "\033[41~" */
774	case XK_F28: /* "\033[42~" */
775	case XK_F29: /* "\033[43~" */
776	case XK_F30: /* "\033[44~" */
777	case XK_F31: /* "\033[45~" */
778	case XK_F32: /* "\033[46~" */
779	case XK_F33: /* "\033[47~" */
780	case XK_F34: /* "\033[48~" */
781	case XK_F35: /* "\033[49~" */
782	FKEY (31, XK_F17);
783	break;
784	#undef FKEY
785	default:
786	newlen = 0;
787	break;
788	}	782	}
789		783
790	if (newlen)	784	if (newlen)
791	len = strlen (kbuf);	785	len = strlen (kbuf);
792		786
793	/*	787	/*
794	* Pass meta for all function keys, if 'meta' option set	788	* Pass meta for all function keys, if 'meta' option set
795	*/	789	*/
796	#ifdef META8_OPTION	790	#ifdef META8_OPTION
…		…
1030	}	1024	}
1031	while (row < end_row);	1025	while (row < end_row);
1032	}	1026	}
1033		1027
1034	scr_refresh ();	1028	scr_refresh ();
1035	scrollbar_show (1);	1029	scrollBar.show (1);
1036	#ifdef USE_XIM	1030	#ifdef USE_XIM
1037	IMSendSpot ();	1031	IMSendSpot ();
1038	#endif	1032	#endif
1039	}	1033	}
1040		1034
…		…
1142	{	1136	{
1143	// this should really be sched_yield(), but the linux guys thought	1137	// this should really be sched_yield(), but the linux guys thought
1144	// that giving a process calling sched_yield () less cpu time than	1138	// that giving a process calling sched_yield () less cpu time than
1145	// 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
1146	// 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 workaroudn against their unusable sched_yield hack is cool,
		1143	// we just nanosleep a bit and hope for the best.
1147		1144
1148	struct timespec ts = { 0, 0 };	1145	struct timespec ts = { 0, 1000 };
1149	nanosleep (&ts, 0);	1146	nanosleep (&ts, 0);
1150		1147
1151	w.stop ();	1148	w.stop ();
1152	}	1149	}
1153		1150
…		…
1203	{	1200	{
1204	make_current ();	1201	make_current ();
1205		1202
1206	if (revents & ev::READ)	1203	if (revents & ev::READ)
1207	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1208	while (pty_fill ())	1205	for (int i = CBUFCNT; i-- && pty_fill (); )
1209	if (cmd_parse ())	1206	cmd_parse ();
1210	break;
1211		1207
1212	if (revents & ev::WRITE)	1208	if (revents & ev::WRITE)
1213	pty_write ();	1209	pty_write ();
1214		1210
1215	refresh_check ();	1211	refresh_check ();
…		…
1474	selection_property (ev.xproperty.window, ev.xproperty.atom);	1470	selection_property (ev.xproperty.window, ev.xproperty.atom);
1475		1471
1476	break;	1472	break;
1477		1473
1478	case SelectionClear:	1474	case SelectionClear:
1479	selection_clear ();	1475	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1480	break;	1476	break;
1481		1477
1482	case SelectionNotify:	1478	case SelectionNotify:
1483	if (selection_wait == Sel_normal)	1479	if (selection_wait == Sel_normal)
1484	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1480	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1551	;	1547	;
1552		1548
1553	if (scrollBar.state && ev.xany.window == scrollBar.win)	1549	if (scrollBar.state && ev.xany.window == scrollBar.win)
1554	{	1550	{
1555	scrollBar.state = STATE_IDLE;	1551	scrollBar.state = STATE_IDLE;
1556	scrollbar_show (0);	1552	scrollBar.show (0);
1557	}	1553	}
1558	}	1554	}
1559	break;	1555	break;
1560		1556
1561	case MotionNotify:	1557	case MotionNotify:
…		…
1660	&unused_root, &unused_child,	1656	&unused_root, &unused_child,
1661	&unused_root_x, &unused_root_y,	1657	&unused_root_x, &unused_root_y,
1662	&ev.xbutton.x, &ev.xbutton.y,	1658	&ev.xbutton.x, &ev.xbutton.y,
1663	&unused_mask);	1659	&unused_mask);
1664	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1660	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1665	scrollbar_size ());	1661	scrollBar.size ());
1666	want_refresh = 1;	1662	want_refresh = 1;
1667	scrollbar_show (1);	1663	scrollBar.show (1);
1668	}	1664	}
1669	break;	1665	break;
1670	}	1666	}
1671		1667
1672	#if defined(CURSOR_BLINK)	1668	#if defined(CURSOR_BLINK)
…		…
1697	#endif	1693	#endif
1698		1694
1699	refresh_check ();	1695	refresh_check ();
1700	}	1696	}
1701		1697
		1698	#if ENABLE_FRILLS
		1699	void
		1700	rxvt_term::set_urgency (bool enable)
		1701	{
		1702	if (enable == urgency_hint)
		1703	return;
		1704
		1705	if (XWMHints *h = XGetWMHints (dpy, parent[0]))
		1706	{
		1707	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
		1708	XSetWMHints (dpy, parent[0], h);
		1709	urgency_hint = enable;
		1710	}
		1711	}
		1712	#endif
		1713
1702	void	1714	void
1703	rxvt_term::focus_in ()	1715	rxvt_term::focus_in ()
1704	{	1716	{
1705	if (!focus)	1717	if (!focus)
1706	{	1718	{
1707	focus = 1;	1719	focus = 1;
1708	want_refresh = 1;	1720	want_refresh = 1;
1709
1710	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711		1721
1712	#if USE_XIM	1722	#if USE_XIM
1713	if (Input_Context != NULL)	1723	if (Input_Context != NULL)
1714	{	1724	{
1715	IMSetPosition ();	1725	IMSetPosition ();
…		…
1727	scr_recolour ();	1737	scr_recolour ();
1728	}	1738	}
1729	#endif	1739	#endif
1730	#if ENABLE_FRILLS	1740	#if ENABLE_FRILLS
1731	if (option (Opt_urgentOnBell))	1741	if (option (Opt_urgentOnBell))
1732	{	1742	set_urgency (0);
1733	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734	{
1735	h->flags &= ~XUrgencyHint;
1736	XSetWMHints (dpy, parent[0], h);
1737	}
1738	}
1739	#endif	1743	#endif
		1744
		1745	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1740	}	1746	}
1741	}	1747	}
1742		1748
1743	void	1749	void
1744	rxvt_term::focus_out ()	1750	rxvt_term::focus_out ()
…		…
1746	if (focus)	1752	if (focus)
1747	{	1753	{
1748	focus = 0;	1754	focus = 0;
1749	want_refresh = 1;	1755	want_refresh = 1;
1750		1756
1751	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1757	#if ENABLE_FRILLS
1752		1758	if (option (Opt_urgentOnBell))
		1759	set_urgency (0);
		1760	#endif
1753	#if ENABLE_FRILLS \|\| ISO_14755	1761	#if ENABLE_FRILLS \|\| ISO_14755
1754	if (iso14755buf)	1762	if (iso14755buf)
1755	{	1763	{
1756	iso14755buf = 0;	1764	iso14755buf = 0;
1757	# if ISO_14755	1765	# if ISO_14755
…		…
1774	{	1782	{
1775	pix_colors = pix_colors_unfocused;	1783	pix_colors = pix_colors_unfocused;
1776	scr_recolour ();	1784	scr_recolour ();
1777	}	1785	}
1778	#endif	1786	#endif
		1787
		1788	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779	}	1789	}
1780	}	1790	}
1781		1791
1782	void	1792	void
1783	rxvt_term::update_fade_color (unsigned int idx)	1793	rxvt_term::update_fade_color (unsigned int idx)
…		…
2025	}	2035	}
2026		2036
2027	if (scrollBar.style == R_SB_XTERM	2037	if (scrollBar.style == R_SB_XTERM
2028	\|\| scrollbar_above_slider (ev.y)	2038	\|\| scrollbar_above_slider (ev.y)
2029	\|\| scrollbar_below_slider (ev.y))	2039	\|\| scrollbar_below_slider (ev.y))
2030	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2040	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2031		2041
2032	scrollBar.state = STATE_MOTION;	2042	scrollBar.state = STATE_MOTION;
2033	break;	2043	break;
2034		2044
2035	case Button1:	2045	case Button1:
…		…
2058	else	2068	else
2059	{	2069	{
2060	scr_page ((ev.button == Button1 ? DN : UP),	2070	scr_page ((ev.button == Button1 ? DN : UP),
2061	(nrow	2071	(nrow
2062	* scrollbar_position (ev.y)	2072	* scrollbar_position (ev.y)
2063	/ scrollbar_size ()));	2073	/ scrollBar.size ()));
2064	}	2074	}
2065		2075
2066	break;	2076	break;
2067	}	2077	}
2068	}	2078	}
…		…
2081	reportmode = !! (priv_modes & PrivMode_mouse_report);	2091	reportmode = !! (priv_modes & PrivMode_mouse_report);
2082		2092
2083	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2093	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2084	{	2094	{
2085	scrollBar.state = STATE_IDLE;	2095	scrollBar.state = STATE_IDLE;
2086	scrollbar_show (0);	2096	scrollBar.show (0);
2087	}	2097	}
2088		2098
2089	#ifdef SELECTION_SCROLLING	2099	#ifdef SELECTION_SCROLLING
2090	sel_scroll_ev.stop();	2100	sel_scroll_ev.stop();
2091	#endif	2101	#endif
…		…
2174	}	2184	}
2175	else	2185	else
2176	# endif	2186	# endif
2177	{	2187	{
2178	scr_page (v, i);	2188	scr_page (v, i);
2179	scrollbar_show (1);	2189	scrollBar.show (1);
2180	}	2190	}
2181	}	2191	}
2182	break;	2192	break;
2183	#endif	2193	#endif
2184	}	2194	}
2185	}	2195	}
2186	}	2196	}
2187		2197
2188	/}}} /	2198	/}}} /
2189		2199
2190	bool	2200	void
2191	rxvt_term::cmd_parse ()	2201	rxvt_term::cmd_parse ()
2192	{	2202	{
2193	bool flag = false;
2194	wchar_t ch = NOCHAR;	2203	wchar_t ch = NOCHAR;
2195	char *seq_begin; // remember start of esc-sequence here	2204	char *seq_begin; // remember start of esc-sequence here
2196		2205
2197	for (;;)	2206	for (;;)
2198	{	2207	{
2199	if (ch == NOCHAR)	2208	if (expect_false (ch == NOCHAR))
2200	{	2209	{
2201	seq_begin = cmdbuf_ptr;	2210	seq_begin = cmdbuf_ptr;
2202	ch = next_char ();	2211	ch = next_char ();
2203		2212
2204	if (ch == NOCHAR)	2213	if (ch == NOCHAR)
2205	break;	2214	break;
2206	}	2215	}
2207		2216
2208	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2217	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2209	{	2218	{
2210	if (!seen_input)	2219	if (expect_false (!seen_input))
2211	{	2220	{
2212	seen_input = 1;	2221	seen_input = 1;
2213	// many badly-written programs (e.g. jed) contain a race condition:	2222	// many badly-written programs (e.g. jed) contain a race condition:
2214	// they first read the screensize and then install a SIGWINCH handler.	2223	// they first read the screensize and then install a SIGWINCH handler.
2215	// some window managers resize the window early, and these programs	2224	// some window managers resize the window early, and these programs
…		…
2228	wchar_t *str = buf;	2237	wchar_t *str = buf;
2229	wchar_t *eol = str + min (ncol, UBUFSIZ);	2238	wchar_t *eol = str + min (ncol, UBUFSIZ);
2230		2239
2231	for (;;)	2240	for (;;)
2232	{	2241	{
2233	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2242	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234	break;	2243	break;
2235		2244
2236	*str++ = ch;	2245	*str++ = ch;
2237		2246
2238	if (ch == C0_LF \|\| str >= eol)	2247	if (expect_false (ch == C0_LF \|\| str >= eol))
2239	{	2248	{
2240	if (ch == C0_LF)	2249	if (ch == C0_LF)
2241	nlines++;	2250	nlines++;
2242		2251
2243	refresh_count++;	2252	refresh_count++;
…		…
2292	* What the heck we'll cheat and only refresh less than every page-full.	2301	* What the heck we'll cheat and only refresh less than every page-full.
2293	* if skipScroll is enabled.	2302	* if skipScroll is enabled.
2294	*/	2303	*/
2295	if (refreshnow)	2304	if (refreshnow)
2296	{	2305	{
2297	flag = true;
2298	scr_refresh ();	2306	scr_refresh ();
2299	want_refresh = 1;	2307	want_refresh = 1;
2300	}	2308	}
2301
2302	}	2309	}
2303	else	2310	else
2304	{	2311	{
2305	try	2312	try
2306	{	2313	{
…		…
2314	}	2321	}
2315		2322
2316	ch = NOCHAR;	2323	ch = NOCHAR;
2317	}	2324	}
2318	}	2325	}
2319
2320	return flag;
2321	}	2326	}
2322		2327
2323	// read the next character	2328	// read the next character
2324	wchar_t	2329	wchar_t
2325	rxvt_term::next_char () NOTHROW	2330	rxvt_term::next_char () NOTHROW
2326	{	2331	{
2327	while (cmdbuf_ptr < cmdbuf_endp)	2332	while (cmdbuf_ptr < cmdbuf_endp)
2328	{	2333	{
2329	// assume 7-bit to be ascii ALWAYS	2334	// assume 7-bit to be ascii ALWAYS
2330	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2335	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2331	return *cmdbuf_ptr++;	2336	return *cmdbuf_ptr++;
2332		2337
2333	wchar_t wc;	2338	wchar_t wc;
2334	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2339	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335		2340
…		…
2339	cmdbuf_ptr = cmdbuf_endp;	2344	cmdbuf_ptr = cmdbuf_endp;
2340	break;	2345	break;
2341	}	2346	}
2342		2347
2343	if (len == (size_t)-1)	2348	if (len == (size_t)-1)
		2349	{
		2350	mbstate.reset (); // reset now undefined conversion state
2344	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2351	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		2352	}
2345		2353
2346	// assume wchar == unicode	2354	// assume wchar == unicode
2347	cmdbuf_ptr += len;	2355	cmdbuf_ptr += len;
2348	return wc & UNICODE_MASK;	2356	return wc & UNICODE_MASK;
2349	}	2357	}
…		…
2393	/----------------------------------------------------------------------/	2401	/----------------------------------------------------------------------/
2394	#ifdef PRINTPIPE	2402	#ifdef PRINTPIPE
2395	FILE *	2403	FILE *
2396	rxvt_term::popen_printer ()	2404	rxvt_term::popen_printer ()
2397	{	2405	{
2398	FILE *stream = popen (rs[Rs_print_pipe], "w");	2406	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399		2407
2400	if (stream == NULL)	2408	if (stream == NULL)
2401	rxvt_warn ("can't open printer pipe, not printing.\n");	2409	rxvt_warn ("can't open printer pipe, not printing.\n");
2402		2410
2403	return stream;	2411	return stream;
…		…
2414	* simulate attached vt100 printer	2422	* simulate attached vt100 printer
2415	*/	2423	*/
2416	void	2424	void
2417	rxvt_term::process_print_pipe ()	2425	rxvt_term::process_print_pipe ()
2418	{	2426	{
2419	int done;	2427	FILE *fd = popen_printer ();
2420	FILE *fd;
2421		2428
2422	if ((fd = popen_printer ()) == NULL)	2429	if (!fd)
2423	return;	2430	return;
2424		2431
2425	/*	2432	/*
2426	* Send all input to the printer until either ESC[4i or ESC[?4i	2433	* Send all input to the printer until either ESC[4i or ESC[?4i
2427	* is received.	2434	* is received.
2428	*/	2435	*/
2429	for (done = 0; !done;)	2436	for (int done = 0; !done; )
2430	{	2437	{
2431	unsigned char buf[8];	2438	unsigned char buf[8];
2432	unicode_t ch;	2439	unicode_t ch;
2433	unsigned int i, len;	2440	unsigned int i, len;
2434		2441
…		…
2579	break;	2586	break;
2580	case 'Z': /* identify the terminal type */	2587	case 'Z': /* identify the terminal type */
2581	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2588	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582	break;	2589	break;
2583	case '<': /* turn off VT52 mode */	2590	case '<': /* turn off VT52 mode */
2584	PrivMode (0, PrivMode_vt52);	2591	set_privmode (PrivMode_vt52, 0);
2585	break;	2592	break;
2586	case 'F': /* use special graphics character set */	2593	case 'F': /* use special graphics character set */
2587	case 'G': /* use regular character set */	2594	case 'G': /* use regular character set */
2588	/* unimplemented */	2595	/* unimplemented */
2589	break;	2596	break;
…		…
2643	scr_forwardindex ();	2650	scr_forwardindex ();
2644	break;	2651	break;
2645	#endif	2652	#endif
2646	case '=':	2653	case '=':
2647	case '>':	2654	case '>':
2648	PrivMode ((ch == '='), PrivMode_aplKP);	2655	set_privmode (PrivMode_aplKP, ch == '=');
2649	break;	2656	break;
2650		2657
2651	case C1_40:	2658	case C1_40:
2652	cmd_getc ();	2659	cmd_getc ();
2653	break;	2660	break;
…		…
2692	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2699	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693	case C1_SCI: /* ESC Z */	2700	case C1_SCI: /* ESC Z */
2694	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2701	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695	break; /* steal obsolete ESC [ c */	2702	break; /* steal obsolete ESC [ c */
2696		2703
2697	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2704	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698	case C1_CSI: /* ESC [ */	2705	case C1_CSI: /* ESC [ */
2699	process_csi_seq ();	2706	process_csi_seq ();
2700	break;	2707	break;
2701		2708
2702	/* 8.3.90: OPERATING SYSTEM COMMAND */	2709	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703	case C1_OSC: /* ESC ] */	2710	case C1_OSC: /* ESC ] */
2704	process_osc_seq ();	2711	process_osc_seq ();
2705	break;	2712	break;
2706		2713
2707	/* 8.3.106: RESET TO INITIAL STATE */	2714	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708	case 'c':	2715	case 'c':
2709	mbstate.reset ();	2716	mbstate.reset ();
2710	scr_poweron ();	2717	scr_poweron ();
2711	scrollbar_show (1);	2718	scrollBar.show (1);
2712	break;	2719	break;
2713		2720
2714	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2721	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715	case 'n':	2722	case 'n':
2716	scr_charset_choose (2);	2723	scr_charset_choose (2);
…		…
2767		2774
2768	nargs = 0;	2775	nargs = 0;
2769		2776
2770	priv = 0;	2777	priv = 0;
2771	ch = cmd_getc ();	2778	ch = cmd_getc ();
2772	if (ch >= '<' && ch <= '?')	2779	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2773	{	2780	{
2774	/* '<' '=' '>' '?' */	2781	/* '<' '=' '>' '?' '!' */
2775	priv = ch;	2782	priv = ch;
2776	ch = cmd_getc ();	2783	ch = cmd_getc ();
2777	}	2784	}
2778		2785
2779	/* read any numerical arguments */	2786	/* read any numerical arguments */
…		…
2833		2840
2834	case '?':	2841	case '?':
2835	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2842	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2836	process_terminal_mode (ch, priv, nargs, arg);	2843	process_terminal_mode (ch, priv, nargs, arg);
2837	break;	2844	break;
		2845
		2846	case '!':
		2847	if (ch == CSI_70)
		2848	{
		2849	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
		2850	scr_soft_reset ();
		2851
		2852	static const int pm_h[] = { 7, 25 };
		2853	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
		2854
		2855	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
		2856	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2838	}	2857	}
		2858	break;
		2859	}
		2860
2839	return;	2861	return;
2840	}	2862	}
2841		2863
2842	switch (ch)	2864	switch (ch)
2843	{	2865	{
…		…
3272		3294
3273	/*	3295	/*
3274	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3296	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3275	*/	3297	*/
3276	void	3298	void
3277	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3299	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3278	{	3300	{
3279	int color;	3301	int color;
3280	char buf, name;	3302	char buf, name;
3281	bool query = str[0] == '?' && !str[1];	3303	bool query = str[0] == '?' && !str[1];
3282	int saveop = op;	3304	int saveop = op;
…		…
3323		3345
3324	XFree (value);	3346	XFree (value);
3325	}	3347	}
3326	else	3348	else
3327	{	3349	{
3328	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3350	char *eq = strchr (str, '=');
3329		3351
3330	if (eq)	3352	if (eq)
3331	{	3353	{
3332	*eq = 0;	3354	*eq = 0;
3333	set_utf8_property (display->atom (str), eq + 1);	3355	set_utf8_property (display->atom (str), eq + 1);
…		…
3389	break;	3411	break;
3390	case URxvt_Color_IT:	3412	case URxvt_Color_IT:
3391	process_color_seq (op, Color_IT, str, resp);	3413	process_color_seq (op, Color_IT, str, resp);
3392	break;	3414	break;
3393	#endif	3415	#endif
		3416	case URxvt_Color_border:
		3417	process_color_seq (op, Color_border, str, resp);
		3418	break;
3394	#if ENABLE_TRANSPARENCY	3419	#if ENABLE_TRANSPARENCY
3395	case URxvt_Color_tint:	3420	case URxvt_Color_tint:
3396	process_color_seq (op, Color_tint, str, resp);	3421	process_color_seq (op, Color_tint, str, resp);
3397	{	3422	{
3398	bool changed = false;	3423	bool changed = false;
…		…
3413	case Rxvt_Pixmap:	3438	case Rxvt_Pixmap:
3414	if (!strcmp (str, "?"))	3439	if (!strcmp (str, "?"))
3415	{	3440	{
3416	char str[256];	3441	char str[256];
3417		3442
3418	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3443	sprintf (str, "[%dx%d+%d+%d]",
3419	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3444	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3420	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3445	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421	process_xterm_seq (XTerm_title, str, CHAR_ST);	3446	process_xterm_seq (XTerm_title, str, CHAR_ST);
3422	}	3447	}
3423	else	3448	else
…		…
3522	break;	3547	break;
3523	#endif	3548	#endif
3524		3549
3525	#if ENABLE_PERL	3550	#if ENABLE_PERL
3526	case URxvt_perl:	3551	case URxvt_perl:
3527	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))	3552	HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3528	; // no responses yet
3529	break;	3553	break;
3530	#endif	3554	#endif
3531	}	3555	}
3532	}	3556	}
3533	/----------------------------------------------------------------------/	3557	/----------------------------------------------------------------------/
…		…
3556	{	3580	{
3557	if (mode == 'r')	3581	if (mode == 'r')
3558	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3582	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559	else	3583	else
3560	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3584	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561	PrivMode (state, bit);	3585	set_privmode (bit, state);
3562	}	3586	}
3563		3587
3564	return state;	3588	return state;
3565	}	3589	}
3566		3590
…		…
3574	static const struct	3598	static const struct
3575	{	3599	{
3576	const int argval;	3600	const int argval;
3577	const unsigned long bit;	3601	const unsigned long bit;
3578	} argtopriv[] = {	3602	} argtopriv[] = {
3579	{ 1, PrivMode_aplCUR },	3603	{ 1, PrivMode_aplCUR }, // DECCKM
3580	{ 2, PrivMode_vt52 },	3604	{ 2, PrivMode_vt52 },
3581	{ 3, PrivMode_132 },	3605	{ 3, PrivMode_132 }, // DECCOLM
3582	{ 4, PrivMode_smoothScroll },	3606	{ 4, PrivMode_smoothScroll }, // DECSCLM
3583	{ 5, PrivMode_rVideo },	3607	{ 5, PrivMode_rVideo }, // DECSCNM
3584	{ 6, PrivMode_relOrigin },	3608	{ 6, PrivMode_relOrigin }, // DECOM
3585	{ 7, PrivMode_Autowrap },	3609	{ 7, PrivMode_Autowrap }, // DECAWM
3586	// 8, bi-directional support mode	3610	// 8, auto-repeat keys // DECARM
3587	{ 9, PrivMode_MouseX10 },	3611	{ 9, PrivMode_MouseX10 },
3588	// 18, 19 printing-related	3612	// 18 end FF to printer after print screen
		3613	// 19 Print screen prints full screen/scorll region
3589	{ 25, PrivMode_VisibleCursor },	3614	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3590	#ifdef scrollBar_esc	3615	#ifdef scrollBar_esc
3591	{ scrollBar_esc, PrivMode_scrollBar },	3616	{ scrollBar_esc, PrivMode_scrollBar },
3592	#endif	3617	#endif
3593	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3618	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3619	// 38, tektronix mode // DECTEK
3594	{ 40, PrivMode_132OK },	3620	{ 40, PrivMode_132OK },
3595	// 41 xterm more fixes NYI	3621	// 41 xterm more fixes NYI
3596	// 45 margin bell NYI	3622	// 45 margin bell NYI
3597	// 46 start logging	3623	// 46 start logging
3598	{ 47, PrivMode_Screen },	3624	{ 47, PrivMode_Screen },
3599	{ 66, PrivMode_aplKP },	3625	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3600	#ifndef NO_BACKSPACE_KEY	3626	#ifndef NO_BACKSPACE_KEY
3601	{ 67, PrivMode_BackSpace },	3627	{ 67, PrivMode_BackSpace }, // DECBKM
3602	#endif	3628	#endif
3603	{ 1000, PrivMode_MouseX11 },	3629	{ 1000, PrivMode_MouseX11 },
3604	{ 1002, PrivMode_MouseBtnEvent },	3630	{ 1002, PrivMode_MouseBtnEvent },
3605	{ 1003, PrivMode_MouseAnyEvent },	3631	{ 1003, PrivMode_MouseAnyEvent },
3606	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3632	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3645		3671
3646	scr_touch (true);	3672	scr_touch (true);
3647	break;	3673	break;
3648	#endif	3674	#endif
3649	case 1048: /* alternative cursor save */	3675	case 1048: /* alternative cursor save */
3650	case 1049:
3651	if (option (Opt_secondaryScreen))	3676	if (option (Opt_secondaryScreen))
3652	if (mode == 0)	3677	if (mode == 0)
3653	scr_cursor (RESTORE);	3678	scr_cursor (RESTORE);
3654	else if (mode == 1)	3679	else if (mode == 1)
3655	scr_cursor (SAVE);	3680	scr_cursor (SAVE);
…		…
3664	case 2: /* VT52 mode */	3689	case 2: /* VT52 mode */
3665	/* oddball mode. should be set regardless of set/reset	3690	/* oddball mode. should be set regardless of set/reset
3666	* parameter. Return from VT52 mode with an ESC < from	3691	* parameter. Return from VT52 mode with an ESC < from
3667	* within VT52 mode	3692	* within VT52 mode
3668	*/	3693	*/
3669	PrivMode (1, PrivMode_vt52);	3694	set_privmode (PrivMode_vt52, 1);
3670	break;	3695	break;
3671	case 3: /* 80/132 */	3696	case 3: /* 80/132 */
3672	if (priv_modes & PrivMode_132OK)	3697	if (priv_modes & PrivMode_132OK)
3673	{
3674	scr_poweron ();
3675	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3698	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3676	}
3677	break;	3699	break;
3678	case 4: /* smooth scrolling */	3700	case 4: /* smooth scrolling */
3679	set_option (Opt_jumpScroll, !state);	3701	set_option (Opt_jumpScroll, !state);
3680	break;	3702	break;
3681	case 5: /* reverse video */	3703	case 5: /* reverse video */
…		…
3692	if (state) /* orthogonal */	3714	if (state) /* orthogonal */
3693	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3715	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3694	break;	3716	break;
3695	#ifdef scrollBar_esc	3717	#ifdef scrollBar_esc
3696	case scrollBar_esc:	3718	case scrollBar_esc:
3697	if (scrollbar_mapping (state))	3719	if (scrollBar.map (state))
3698	{	3720	{
3699	resize_all_windows (0, 0, 0);	3721	resize_all_windows (0, 0, 0);
3700	scr_touch (true);	3722	scr_touch (true);
3701	}	3723	}
3702	break;	3724	break;
…		…
3723	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3745	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724	vt_emask_mouse = PointerMotionMask;	3746	vt_emask_mouse = PointerMotionMask;
3725	}	3747	}
3726	else	3748	else
3727	vt_emask_mouse = NoEventMask;	3749	vt_emask_mouse = NoEventMask;
		3750
3728	vt_select_input ();	3751	vt_select_input ();
3729	break;	3752	break;
3730	case 1010: /* scroll to bottom on TTY output inhibit */	3753	case 1010: /* scroll to bottom on TTY output inhibit */
3731	set_option (Opt_scrollTtyOutput, !state);	3754	set_option (Opt_scrollTtyOutput, !state);
3732	break;	3755	break;
3733	case 1011: /* scroll to bottom on key press */	3756	case 1011: /* scroll to bottom on key press */
3734	set_option (Opt_scrollTtyKeypress, state);	3757	set_option (Opt_scrollTtyKeypress, state);
3735	break;	3758	break;
3736	case 1047: /* secondary screen w/ clearing last */	3759	case 1047: /* secondary screen w/ clearing last */
3737	if (option (Opt_secondaryScreen))	3760	if (option (Opt_secondaryScreen))
3738	if (current_screen != PRIMARY)	3761	if (!state)
3739	scr_erase_screen (2);	3762	scr_erase_screen (2);
		3763
3740	scr_change_screen (state);	3764	scr_change_screen (state);
3741	break;	3765	break;
3742	case 1049: /* secondary screen w/ clearing first */	3766	case 1049: /* secondary screen w/ clearing first */
		3767	if (option (Opt_secondaryScreen))
		3768	if (state)
		3769	scr_cursor (SAVE);
		3770
3743	scr_change_screen (state);	3771	scr_change_screen (state);
		3772
3744	if (option (Opt_secondaryScreen))	3773	if (option (Opt_secondaryScreen))
3745	if (current_screen != PRIMARY)	3774	if (state)
3746	scr_erase_screen (2);	3775	scr_erase_screen (2);
		3776	else
		3777	scr_cursor (RESTORE);
3747	break;	3778	break;
3748	default:	3779	default:
3749	break;	3780	break;
3750	}	3781	}
3751	}	3782	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC vs. Revision 1.439 by sf-exg, Wed Feb 10 16:05:42 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC vs.
Revision 1.439 by sf-exg, Wed Feb 10 16:05:42 2010 UTC