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

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

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.405 by ayin, Thu Feb 14 23:51:46 2008 UTC vs. Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.405 by ayin, Thu Feb 14 23:51:46 2008 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC