[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.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
…		…
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
		655	keysym = translate_keypad (keysym, kp);
		656
		657	switch (keysym)
551	{	658	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	659	#ifndef NO_BACKSPACE_KEY
553	unsigned int newlen = 1;	660	case XK_BackSpace:
554	#ifdef XK_KP_Home	661	if (priv_modes & PrivMode_HaveBackSpace)
555	static const KeySym keypadtrans[] = {	662	{
556	XK_KP_7, // XK_KP_Home	663	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557	XK_KP_4, // XK_KP_Left	664	^ !!ctrl) ? '\b' : '\177';
558	XK_KP_8, // XK_KP_Up	665	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	};	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;
571		692
572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	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:
573	{	773	{
574	unsigned int index = keysym - XK_KP_Home;	774	int param = map_function_key (keysym);
575	keysym = kp ? keypadtrans[index] : XK_Home + index;	775	if (param > 0)
		776	sprintf (kbuf,"\033[%d~", param);
		777	else
		778	newlen = 0;
576	}	779	}
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;	780	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	}	781	}
		782
		783	if (newlen)
		784	len = strlen (kbuf);
794		785
795	/*	786	/*
796	* Pass meta for all function keys, if 'meta' option set	787	* Pass meta for all function keys, if 'meta' option set
797	*/	788	*/
798	#ifdef META8_OPTION	789	#ifdef META8_OPTION
…		…
984	rxvt_term::flush ()	975	rxvt_term::flush ()
985	{	976	{
986	flush_ev.stop ();	977	flush_ev.stop ();
987		978
988	#ifdef HAVE_BG_PIXMAP	979	#ifdef HAVE_BG_PIXMAP
989	if (bgPixmap.check_clearChanged ())	980	if (bgPixmap.flags & bgPixmap_t::hasChanged)
990	{	981	{
		982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;
991	// scr_clear (true); This needs to be researched further!	983	// scr_clear (true); This needs to be researched further!
992	scr_touch (false);	984	scr_touch (false);
993	}	985	}
994	#endif	986	#endif
995		987
…		…
1032	}	1024	}
1033	while (row < end_row);	1025	while (row < end_row);
1034	}	1026	}
1035		1027
1036	scr_refresh ();	1028	scr_refresh ();
1037	scrollbar_show (1);	1029	scrollBar.show (1);
1038	#ifdef USE_XIM	1030	#ifdef USE_XIM
1039	IMSendSpot ();	1031	IMSendSpot ();
1040	#endif	1032	#endif
1041	}	1033	}
1042		1034
1043	display->flush ();	1035	display->flush ();
1044	}	1036	}
1045		1037
1046	/* checks wether a refresh is requested and starts the refresh timer */	1038	/* checks whether a refresh is requested and starts the refresh timer */
1047	void	1039	void
1048	rxvt_term::refresh_check ()	1040	rxvt_term::refresh_check ()
1049	{	1041	{
1050	if (want_refresh && !flush_ev.is_active ())	1042	if (want_refresh && !flush_ev.is_active ())
1051	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1043	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1144	{	1136	{
1145	// this should really be sched_yield(), but the linux guys thought	1137	// this should really be sched_yield(), but the linux guys thought
1146	// that giving a process calling sched_yield () less cpu time than	1138	// 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	1139	// ones with high nice levels is a useful thing to do. It surely is is
1148	// 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.
1149		1144
1150	struct timespec ts = { 0, 0 };	1145	struct timespec ts = { 0, 1000 };
1151	nanosleep (&ts, 0);	1146	nanosleep (&ts, 0);
1152		1147
1153	w.stop ();	1148	w.stop ();
1154	}	1149	}
1155		1150
…		…
1205	{	1200	{
1206	make_current ();	1201	make_current ();
1207		1202
1208	if (revents & ev::READ)	1203	if (revents & ev::READ)
1209	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1210	while (pty_fill ())	1205	for (int i = CBUFCNT; i-- && pty_fill (); )
1211	if (cmd_parse ())	1206	cmd_parse ();
1212	break;
1213		1207
1214	if (revents & ev::WRITE)	1208	if (revents & ev::WRITE)
1215	pty_write ();	1209	pty_write ();
1216		1210
1217	refresh_check ();	1211	refresh_check ();
…		…
1437	&& ev.xfocus.mode != NotifyGrab)	1431	&& ev.xfocus.mode != NotifyGrab)
1438	focus_out ();	1432	focus_out ();
1439	break;	1433	break;
1440		1434
1441	case ConfigureNotify:	1435	case ConfigureNotify:
1442	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444	szHint.width, szHint.height);*/
1445	if (ev.xconfigure.window == parent[0])	1436	if (ev.xconfigure.window == parent[0])
1446	{	1437	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1438	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1439	;
1449		1440
…		…
1476	selection_property (ev.xproperty.window, ev.xproperty.atom);	1467	selection_property (ev.xproperty.window, ev.xproperty.atom);
1477		1468
1478	break;	1469	break;
1479		1470
1480	case SelectionClear:	1471	case SelectionClear:
1481	selection_clear ();	1472	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1482	break;	1473	break;
1483		1474
1484	case SelectionNotify:	1475	case SelectionNotify:
1485	if (selection_wait == Sel_normal)	1476	if (selection_wait == Sel_normal)
1486	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1477	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1490	selection_send (ev.xselectionrequest);	1481	selection_send (ev.xselectionrequest);
1491	break;	1482	break;
1492		1483
1493	case MapNotify:	1484	case MapNotify:
1494	#ifdef HAVE_BG_PIXMAP	1485	#ifdef HAVE_BG_PIXMAP
1495	/* 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
1496	* non-reparenting window manager. In those cases we never get first	1487	* non-reparenting window manager. In those cases we never get first
1497	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1488	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1498	* care of multiplicity of ConfigureNotify events arriwing while WM does	1489	* care of multiplicity of ConfigureNotify events arriving while WM does
1499	* reparenting.	1490	* reparenting.
1500	* We should not render background immidiately, as there could be several	1491	* We should not render background immediately, as there could be several
1501	* 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
1502	* 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
1503	* bit of time for ConfigureNotifies to arrive.	1494	* bit of time for ConfigureNotifies to arrive.
1504	* 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
1505	* of ConfigureNotifys for the best results.	1496	* of ConfigureNotifys for the best results.
…		…
1553	;	1544	;
1554		1545
1555	if (scrollBar.state && ev.xany.window == scrollBar.win)	1546	if (scrollBar.state && ev.xany.window == scrollBar.win)
1556	{	1547	{
1557	scrollBar.state = STATE_IDLE;	1548	scrollBar.state = STATE_IDLE;
1558	scrollbar_show (0);	1549	scrollBar.show (0);
1559	}	1550	}
1560	}	1551	}
1561	break;	1552	break;
1562		1553
1563	case MotionNotify:	1554	case MotionNotify:
…		…
1662	&unused_root, &unused_child,	1653	&unused_root, &unused_child,
1663	&unused_root_x, &unused_root_y,	1654	&unused_root_x, &unused_root_y,
1664	&ev.xbutton.x, &ev.xbutton.y,	1655	&ev.xbutton.x, &ev.xbutton.y,
1665	&unused_mask);	1656	&unused_mask);
1666	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1657	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667	scrollbar_size ());	1658	scrollBar.size ());
1668	want_refresh = 1;	1659	want_refresh = 1;
1669	scrollbar_show (1);	1660	scrollBar.show (1);
1670	}	1661	}
1671	break;	1662	break;
1672	}	1663	}
1673		1664
1674	#if defined(CURSOR_BLINK)	1665	#if defined(CURSOR_BLINK)
…		…
1699	#endif	1690	#endif
1700		1691
1701	refresh_check ();	1692	refresh_check ();
1702	}	1693	}
1703		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
1704	void	1711	void
1705	rxvt_term::focus_in ()	1712	rxvt_term::focus_in ()
1706	{	1713	{
1707	if (!focus)	1714	if (!focus)
1708	{	1715	{
1709	focus = 1;	1716	focus = 1;
1710	want_refresh = 1;	1717	want_refresh = 1;
1711
1712	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1713		1718
1714	#if USE_XIM	1719	#if USE_XIM
1715	if (Input_Context != NULL)	1720	if (Input_Context != NULL)
1716	{	1721	{
1717	IMSetPosition ();	1722	IMSetPosition ();
…		…
1729	scr_recolour ();	1734	scr_recolour ();
1730	}	1735	}
1731	#endif	1736	#endif
1732	#if ENABLE_FRILLS	1737	#if ENABLE_FRILLS
1733	if (option (Opt_urgentOnBell))	1738	if (option (Opt_urgentOnBell))
1734	{	1739	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	1740	#endif
		1741
		1742	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1742	}	1743	}
1743	}	1744	}
1744		1745
1745	void	1746	void
1746	rxvt_term::focus_out ()	1747	rxvt_term::focus_out ()
…		…
1748	if (focus)	1749	if (focus)
1749	{	1750	{
1750	focus = 0;	1751	focus = 0;
1751	want_refresh = 1;	1752	want_refresh = 1;
1752		1753
1753	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1754	#if ENABLE_FRILLS
1754		1755	if (option (Opt_urgentOnBell))
		1756	set_urgency (0);
		1757	#endif
1755	#if ENABLE_FRILLS \|\| ISO_14755	1758	#if ENABLE_FRILLS \|\| ISO_14755
1756	if (iso14755buf)	1759	if (iso14755buf)
1757	{	1760	{
1758	iso14755buf = 0;	1761	iso14755buf = 0;
1759	# if ISO_14755	1762	# if ISO_14755
…		…
1776	{	1779	{
1777	pix_colors = pix_colors_unfocused;	1780	pix_colors = pix_colors_unfocused;
1778	scr_recolour ();	1781	scr_recolour ();
1779	}	1782	}
1780	#endif	1783	#endif
		1784
		1785	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1781	}	1786	}
1782	}	1787	}
1783		1788
1784	void	1789	void
1785	rxvt_term::update_fade_color (unsigned int idx)	1790	rxvt_term::update_fade_color (unsigned int idx)
…		…
1862	/* save the xbutton state (for ButtonRelease) */	1867	/* save the xbutton state (for ButtonRelease) */
1863	MEvent.state = ev.state;	1868	MEvent.state = ev.state;
1864	#ifdef MOUSE_REPORT_DOUBLECLICK	1869	#ifdef MOUSE_REPORT_DOUBLECLICK
1865	if (ev.button == MEvent.button && clickintime)	1870	if (ev.button == MEvent.button && clickintime)
1866	{	1871	{
1867	/* same button, within alloted time */	1872	/* same button, within allowed time */
1868	MEvent.clicks++;	1873	MEvent.clicks++;
1869		1874
1870	if (MEvent.clicks > 1)	1875	if (MEvent.clicks > 1)
1871	{	1876	{
1872	/* only report double clicks */	1877	/* only report double clicks */
…		…
2027	}	2032	}
2028		2033
2029	if (scrollBar.style == R_SB_XTERM	2034	if (scrollBar.style == R_SB_XTERM
2030	\|\| scrollbar_above_slider (ev.y)	2035	\|\| scrollbar_above_slider (ev.y)
2031	\|\| scrollbar_below_slider (ev.y))	2036	\|\| scrollbar_below_slider (ev.y))
2032	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2033		2038
2034	scrollBar.state = STATE_MOTION;	2039	scrollBar.state = STATE_MOTION;
2035	break;	2040	break;
2036		2041
2037	case Button1:	2042	case Button1:
…		…
2060	else	2065	else
2061	{	2066	{
2062	scr_page ((ev.button == Button1 ? DN : UP),	2067	scr_page ((ev.button == Button1 ? DN : UP),
2063	(nrow	2068	(nrow
2064	* scrollbar_position (ev.y)	2069	* scrollbar_position (ev.y)
2065	/ scrollbar_size ()));	2070	/ scrollBar.size ()));
2066	}	2071	}
2067		2072
2068	break;	2073	break;
2069	}	2074	}
2070	}	2075	}
…		…
2083	reportmode = !! (priv_modes & PrivMode_mouse_report);	2088	reportmode = !! (priv_modes & PrivMode_mouse_report);
2084		2089
2085	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2090	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2086	{	2091	{
2087	scrollBar.state = STATE_IDLE;	2092	scrollBar.state = STATE_IDLE;
2088	scrollbar_show (0);	2093	scrollBar.show (0);
2089	}	2094	}
2090		2095
2091	#ifdef SELECTION_SCROLLING	2096	#ifdef SELECTION_SCROLLING
2092	sel_scroll_ev.stop();	2097	sel_scroll_ev.stop();
2093	#endif	2098	#endif
…		…
2143	selection_make (ev.time);	2148	selection_make (ev.time);
2144	break;	2149	break;
2145		2150
2146	case Button2:	2151	case Button2:
2147	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?
2148	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2153	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2149	break;	2154	break;
2150		2155
2151	#ifdef MOUSE_WHEEL	2156	#ifdef MOUSE_WHEEL
2152	case Button4:	2157	case Button4:
2153	case Button5:	2158	case Button5:
…		…
2176	}	2181	}
2177	else	2182	else
2178	# endif	2183	# endif
2179	{	2184	{
2180	scr_page (v, i);	2185	scr_page (v, i);
2181	scrollbar_show (1);	2186	scrollBar.show (1);
2182	}	2187	}
2183	}	2188	}
2184	break;	2189	break;
2185	#endif	2190	#endif
2186	}	2191	}
2187	}	2192	}
2188	}	2193	}
2189		2194
2190	/}}} /	2195	/}}} /
2191		2196
2192	bool	2197	void
2193	rxvt_term::cmd_parse ()	2198	rxvt_term::cmd_parse ()
2194	{	2199	{
2195	bool flag = false;
2196	wchar_t ch = NOCHAR;	2200	wchar_t ch = NOCHAR;
2197	char *seq_begin; // remember start of esc-sequence here	2201	char *seq_begin; // remember start of esc-sequence here
2198		2202
2199	for (;;)	2203	for (;;)
2200	{	2204	{
2201	if (ch == NOCHAR)	2205	if (expect_false (ch == NOCHAR))
2202	{	2206	{
2203	seq_begin = cmdbuf_ptr;	2207	seq_begin = cmdbuf_ptr;
2204	ch = next_char ();	2208	ch = next_char ();
2205		2209
2206	if (ch == NOCHAR)	2210	if (ch == NOCHAR)
2207	break;	2211	break;
2208	}	2212	}
2209		2213
2210	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))
2211	{	2215	{
2212	if (!seen_input)	2216	if (expect_false (!seen_input))
2213	{	2217	{
2214	seen_input = 1;	2218	seen_input = 1;
2215	// many badly-written programs (e.g. jed) contain a race condition:	2219	// many badly-written programs (e.g. jed) contain a race condition:
2216	// they first read the screensize and then install a SIGWINCH handler.	2220	// they first read the screensize and then install a SIGWINCH handler.
2217	// some window managers resize the window early, and these programs	2221	// some window managers resize the window early, and these programs
…		…
2230	wchar_t *str = buf;	2234	wchar_t *str = buf;
2231	wchar_t *eol = str + min (ncol, UBUFSIZ);	2235	wchar_t *eol = str + min (ncol, UBUFSIZ);
2232		2236
2233	for (;;)	2237	for (;;)
2234	{	2238	{
2235	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)))
2236	break;	2240	break;
2237		2241
2238	*str++ = ch;	2242	*str++ = ch;
2239		2243
2240	if (ch == C0_LF \|\| str >= eol)	2244	if (expect_false (ch == C0_LF \|\| str >= eol))
2241	{	2245	{
2242	if (ch == C0_LF)	2246	if (ch == C0_LF)
2243	nlines++;	2247	nlines++;
2244		2248
2245	refresh_count++;	2249	refresh_count++;
…		…
2294	* 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.
2295	* if skipScroll is enabled.	2299	* if skipScroll is enabled.
2296	*/	2300	*/
2297	if (refreshnow)	2301	if (refreshnow)
2298	{	2302	{
2299	flag = true;
2300	scr_refresh ();	2303	scr_refresh ();
2301	want_refresh = 1;	2304	want_refresh = 1;
2302	}	2305	}
2303
2304	}	2306	}
2305	else	2307	else
2306	{	2308	{
2307	try	2309	try
2308	{	2310	{
…		…
2316	}	2318	}
2317		2319
2318	ch = NOCHAR;	2320	ch = NOCHAR;
2319	}	2321	}
2320	}	2322	}
2321
2322	return flag;
2323	}	2323	}
2324		2324
2325	// read the next character	2325	// read the next character
2326	wchar_t	2326	wchar_t
2327	rxvt_term::next_char () NOTHROW	2327	rxvt_term::next_char () NOTHROW
2328	{	2328	{
2329	while (cmdbuf_ptr < cmdbuf_endp)	2329	while (cmdbuf_ptr < cmdbuf_endp)
2330	{	2330	{
2331	// assume 7-bit to be ascii ALWAYS	2331	// assume 7-bit to be ascii ALWAYS
2332	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2332	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2333	return *cmdbuf_ptr++;	2333	return *cmdbuf_ptr++;
2334		2334
2335	wchar_t wc;	2335	wchar_t wc;
2336	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);
2337		2337
…		…
2341	cmdbuf_ptr = cmdbuf_endp;	2341	cmdbuf_ptr = cmdbuf_endp;
2342	break;	2342	break;
2343	}	2343	}
2344		2344
2345	if (len == (size_t)-1)	2345	if (len == (size_t)-1)
		2346	{
		2347	mbstate.reset (); // reset now undefined conversion state
2346	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	}
2347		2350
2348	// assume wchar == unicode	2351	// assume wchar == unicode
2349	cmdbuf_ptr += len;	2352	cmdbuf_ptr += len;
2350	return wc & UNICODE_MASK;	2353	return wc & UNICODE_MASK;
2351	}	2354	}
…		…
2395	/----------------------------------------------------------------------/	2398	/----------------------------------------------------------------------/
2396	#ifdef PRINTPIPE	2399	#ifdef PRINTPIPE
2397	FILE *	2400	FILE *
2398	rxvt_term::popen_printer ()	2401	rxvt_term::popen_printer ()
2399	{	2402	{
2400	FILE *stream = popen (rs[Rs_print_pipe], "w");	2403	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2401		2404
2402	if (stream == NULL)	2405	if (stream == NULL)
2403	rxvt_warn ("can't open printer pipe, not printing.\n");	2406	rxvt_warn ("can't open printer pipe, not printing.\n");
2404		2407
2405	return stream;	2408	return stream;
…		…
2416	* simulate attached vt100 printer	2419	* simulate attached vt100 printer
2417	*/	2420	*/
2418	void	2421	void
2419	rxvt_term::process_print_pipe ()	2422	rxvt_term::process_print_pipe ()
2420	{	2423	{
2421	int done;	2424	FILE *fd = popen_printer ();
2422	FILE *fd;
2423		2425
2424	if ((fd = popen_printer ()) == NULL)	2426	if (!fd)
2425	return;	2427	return;
2426		2428
2427	/*	2429	/*
2428	* 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
2429	* is received.	2431	* is received.
2430	*/	2432	*/
2431	for (done = 0; !done;)	2433	for (int done = 0; !done; )
2432	{	2434	{
2433	unsigned char buf[8];	2435	unsigned char buf[8];
2434	unicode_t ch;	2436	unicode_t ch;
2435	unsigned int i, len;	2437	unsigned int i, len;
2436		2438
…		…
2581	break;	2583	break;
2582	case 'Z': /* identify the terminal type */	2584	case 'Z': /* identify the terminal type */
2583	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2585	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2584	break;	2586	break;
2585	case '<': /* turn off VT52 mode */	2587	case '<': /* turn off VT52 mode */
2586	PrivMode (0, PrivMode_vt52);	2588	set_privmode (PrivMode_vt52, 0);
2587	break;	2589	break;
2588	case 'F': /* use special graphics character set */	2590	case 'F': /* use special graphics character set */
2589	case 'G': /* use regular character set */	2591	case 'G': /* use regular character set */
2590	/* unimplemented */	2592	/* unimplemented */
2591	break;	2593	break;
…		…
2645	scr_forwardindex ();	2647	scr_forwardindex ();
2646	break;	2648	break;
2647	#endif	2649	#endif
2648	case '=':	2650	case '=':
2649	case '>':	2651	case '>':
2650	PrivMode ((ch == '='), PrivMode_aplKP);	2652	set_privmode (PrivMode_aplKP, ch == '=');
2651	break;	2653	break;
2652		2654
2653	case C1_40:	2655	case C1_40:
2654	cmd_getc ();	2656	cmd_getc ();
2655	break;	2657	break;
…		…
2694	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2696	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2695	case C1_SCI: /* ESC Z */	2697	case C1_SCI: /* ESC Z */
2696	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2698	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2697	break; /* steal obsolete ESC [ c */	2699	break; /* steal obsolete ESC [ c */
2698		2700
2699	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2701	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2700	case C1_CSI: /* ESC [ */	2702	case C1_CSI: /* ESC [ */
2701	process_csi_seq ();	2703	process_csi_seq ();
2702	break;	2704	break;
2703		2705
2704	/* 8.3.90: OPERATING SYSTEM COMMAND */	2706	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2705	case C1_OSC: /* ESC ] */	2707	case C1_OSC: /* ESC ] */
2706	process_osc_seq ();	2708	process_osc_seq ();
2707	break;	2709	break;
2708		2710
2709	/* 8.3.106: RESET TO INITIAL STATE */	2711	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2710	case 'c':	2712	case 'c':
2711	mbstate.reset ();	2713	mbstate.reset ();
2712	scr_poweron ();	2714	scr_poweron ();
2713	scrollbar_show (1);	2715	scrollBar.show (1);
2714	break;	2716	break;
2715		2717
2716	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2718	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2717	case 'n':	2719	case 'n':
2718	scr_charset_choose (2);	2720	scr_charset_choose (2);
…		…
2769		2771
2770	nargs = 0;	2772	nargs = 0;
2771		2773
2772	priv = 0;	2774	priv = 0;
2773	ch = cmd_getc ();	2775	ch = cmd_getc ();
2774	if (ch >= '<' && ch <= '?')	2776	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2775	{	2777	{
2776	/* '<' '=' '>' '?' */	2778	/* '<' '=' '>' '?' '!' */
2777	priv = ch;	2779	priv = ch;
2778	ch = cmd_getc ();	2780	ch = cmd_getc ();
2779	}	2781	}
2780		2782
2781	/* read any numerical arguments */	2783	/* read any numerical arguments */
…		…
2835		2837
2836	case '?':	2838	case '?':
2837	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2839	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2838	process_terminal_mode (ch, priv, nargs, arg);	2840	process_terminal_mode (ch, priv, nargs, arg);
2839	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);
2840	}	2854	}
		2855	break;
		2856	}
		2857
2841	return;	2858	return;
2842	}	2859	}
2843		2860
2844	switch (ch)	2861	switch (ch)
2845	{	2862	{
…		…
3212	* 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)'
3213	*/	3230	*/
3214	void	3231	void
3215	rxvt_term::process_dcs_seq ()	3232	rxvt_term::process_dcs_seq ()
3216	{	3233	{
3217	char *s;
3218	unicode_t eh;
3219
3220	/*	3234	/*
3221	* Not handled yet	3235	* Not handled yet
3222	*/	3236	*/
		3237
		3238	unicode_t eh;
3223	s = get_to_st (eh);	3239	char *s = get_to_st (eh);
3224	if (s)	3240	if (s)
3225	free (s);	3241	free (s);
3226		3242
3227	return;	3243	return;
3228	}	3244	}
…		…
3232	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3248	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3233	*/	3249	*/
3234	void	3250	void
3235	rxvt_term::process_osc_seq ()	3251	rxvt_term::process_osc_seq ()
3236	{	3252	{
3237	unicode_t ch, eh;
3238	int arg;	3253	int arg;
3239		3254
3240	ch = cmd_getc ();	3255	unicode_t ch = cmd_getc ();
3241	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3256	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3242	arg = arg * 10 + (ch - '0');	3257	arg = arg * 10 + (ch - '0');
3243		3258
3244	if (ch == ';')	3259	if (ch == ';')
3245	{	3260	{
		3261	unicode_t eh;
3246	char *s = get_to_st (eh);	3262	char *s = get_to_st (eh);
3247		3263
3248	if (s)	3264	if (s)
3249	{	3265	{
3250	process_xterm_seq (arg, s, eh);	3266	process_xterm_seq (arg, s, eh);
…		…
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);
…		…
3375	process_color_seq (op, Color_pointer_fg, str, resp);	3391	process_color_seq (op, Color_pointer_fg, str, resp);
3376	break;	3392	break;
3377	case XTerm_Color_pointer_bg:	3393	case XTerm_Color_pointer_bg:
3378	process_color_seq (op, Color_pointer_bg, str, resp);	3394	process_color_seq (op, Color_pointer_bg, str, resp);
3379	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
3380	#ifndef NO_BOLD_UNDERLINE_REVERSE	3404	#ifndef NO_BOLD_UNDERLINE_REVERSE
3381	case XTerm_Color_RV:
3382	process_color_seq (op, Color_RV, str, resp);
3383	break;
3384	case Rxvt_Color_BD:
3385	case URxvt_Color_BD:	3405	case URxvt_Color_BD:
3386	process_color_seq (op, Color_BD, str, resp);	3406	process_color_seq (op, Color_BD, str, resp);
3387	break;	3407	break;
3388	case Rxvt_Color_UL:
3389	case URxvt_Color_UL:	3408	case URxvt_Color_UL:
3390	process_color_seq (op, Color_UL, str, resp);	3409	process_color_seq (op, Color_UL, str, resp);
3391	break;	3410	break;
3392	case URxvt_Color_IT:	3411	case URxvt_Color_IT:
3393	process_color_seq (op, Color_IT, str, resp);	3412	process_color_seq (op, Color_IT, str, resp);
3394	break;	3413	break;
3395	#endif	3414	#endif
		3415	case URxvt_Color_border:
		3416	process_color_seq (op, Color_border, str, resp);
		3417	break;
3396	#if ENABLE_TRANSPARENCY	3418	#if ENABLE_TRANSPARENCY
3397	case URxvt_Color_tint:	3419	case URxvt_Color_tint:
3398	process_color_seq (op, Color_tint, str, resp);	3420	process_color_seq (op, Color_tint, str, resp);
3399	{	3421	{
3400	bool changed = false;	3422	bool changed = false;
…		…
3415	case Rxvt_Pixmap:	3437	case Rxvt_Pixmap:
3416	if (!strcmp (str, "?"))	3438	if (!strcmp (str, "?"))
3417	{	3439	{
3418	char str[256];	3440	char str[256];
3419		3441
3420	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3442	sprintf (str, "[%dx%d+%d+%d]",
3421	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3443	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3422	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3444	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3423	process_xterm_seq (XTerm_title, str, CHAR_ST);	3445	process_xterm_seq (XTerm_title, str, CHAR_ST);
3424	}	3446	}
3425	else	3447	else
3426	{	3448	{
3427	int changed = 0;	3449	int changed = 0;
3428		3450
3429	if (*str != ';')	3451	if (*str != ';')
3430	{	3452	{
3431	/* reset to default scaling :*/
3432	bgPixmap.unset_geometry ();
3433	if (bgPixmap.set_file (str)) /* change pixmap */	3453	if (bgPixmap.set_file (str)) /* change pixmap */
3434	changed++;	3454	changed++;
3435	str = strchr (str, ';');	3455	str = strchr (str, ';');
3436	if (str == NULL)	3456	if (str == NULL)
3437	bgPixmap.set_defaultGeometry ();	3457	bgPixmap.set_defaultGeometry ();
		3458	else
		3459	bgPixmap.set_geometry (str+1);
3438	}	3460	}
3439		3461	else
3440	while (str)
3441	{	3462	{
3442	str++;	3463	str++;
3443	if (bgPixmap.set_geometry (str))	3464	if (bgPixmap.set_geometry (str, true))
3444	changed++;	3465	changed++;
3445	str = strchr (str, ';');
3446	}	3466	}
3447		3467
3448	if (changed)	3468	if (changed)
3449	update_background ();	3469	update_background ();
3450	}	3470	}
…		…
3524	break;	3544	break;
3525	#endif	3545	#endif
3526		3546
3527	#if ENABLE_PERL	3547	#if ENABLE_PERL
3528	case URxvt_perl:	3548	case URxvt_perl:
3529	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));
3530	; // no responses yet
3531	break;	3550	break;
3532	#endif	3551	#endif
3533	}	3552	}
3534	}	3553	}
3535	/----------------------------------------------------------------------/	3554	/----------------------------------------------------------------------/
…		…
3558	{	3577	{
3559	if (mode == 'r')	3578	if (mode == 'r')
3560	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3579	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3561	else	3580	else
3562	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3581	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3563	PrivMode (state, bit);	3582
		3583	set_privmode (bit, state);
3564	}	3584	}
3565		3585
3566	return state;	3586	return state;
3567	}	3587	}
3568		3588
…		…
3576	static const struct	3596	static const struct
3577	{	3597	{
3578	const int argval;	3598	const int argval;
3579	const unsigned long bit;	3599	const unsigned long bit;
3580	} argtopriv[] = {	3600	} argtopriv[] = {
3581	{ 1, PrivMode_aplCUR },	3601	{ 1, PrivMode_aplCUR }, // DECCKM
3582	{ 2, PrivMode_vt52 },	3602	{ 2, PrivMode_vt52 },
3583	{ 3, PrivMode_132 },	3603	{ 3, PrivMode_132 }, // DECCOLM
3584	{ 4, PrivMode_smoothScroll },	3604	{ 4, PrivMode_smoothScroll }, // DECSCLM
3585	{ 5, PrivMode_rVideo },	3605	{ 5, PrivMode_rVideo }, // DECSCNM
3586	{ 6, PrivMode_relOrigin },	3606	{ 6, PrivMode_relOrigin }, // DECOM
3587	{ 7, PrivMode_Autowrap },	3607	{ 7, PrivMode_Autowrap }, // DECAWM
3588	// 8, bi-directional support mode	3608	// 8, auto-repeat keys // DECARM
3589	{ 9, PrivMode_MouseX10 },	3609	{ 9, PrivMode_MouseX10 },
3590	// 18, 19 printing-related	3610	// 18 end FF to printer after print screen
		3611	// 19 Print screen prints full screen/scroll region
3591	{ 25, PrivMode_VisibleCursor },	3612	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3592	#ifdef scrollBar_esc	3613	#ifdef scrollBar_esc
3593	{ scrollBar_esc, PrivMode_scrollBar },	3614	{ scrollBar_esc, PrivMode_scrollBar },
3594	#endif	3615	#endif
3595	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3616	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3617	// 38, tektronix mode // DECTEK
3596	{ 40, PrivMode_132OK },	3618	{ 40, PrivMode_132OK },
3597	// 41 xterm more fixes NYI	3619	// 41 xterm more fixes NYI
3598	// 45 margin bell NYI	3620	// 45 margin bell NYI
3599	// 46 start logging	3621	// 46 start logging
3600	{ 47, PrivMode_Screen },	3622	{ 47, PrivMode_Screen },
3601	{ 66, PrivMode_aplKP },	3623	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3602	#ifndef NO_BACKSPACE_KEY	3624	#ifndef NO_BACKSPACE_KEY
3603	{ 67, PrivMode_BackSpace },	3625	{ 67, PrivMode_BackSpace }, // DECBKM
3604	#endif	3626	#endif
3605	{ 1000, PrivMode_MouseX11 },	3627	{ 1000, PrivMode_MouseX11 },
3606	{ 1002, PrivMode_MouseBtnEvent },	3628	{ 1002, PrivMode_MouseBtnEvent },
3607	{ 1003, PrivMode_MouseAnyEvent },	3629	{ 1003, PrivMode_MouseAnyEvent },
3608	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3630	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3647		3669
3648	scr_touch (true);	3670	scr_touch (true);
3649	break;	3671	break;
3650	#endif	3672	#endif
3651	case 1048: /* alternative cursor save */	3673	case 1048: /* alternative cursor save */
3652	case 1049:
3653	if (option (Opt_secondaryScreen))	3674	if (option (Opt_secondaryScreen))
3654	if (mode == 0)	3675	if (mode == 0)
3655	scr_cursor (RESTORE);	3676	scr_cursor (RESTORE);
3656	else if (mode == 1)	3677	else if (mode == 1)
3657	scr_cursor (SAVE);	3678	scr_cursor (SAVE);
…		…
3666	case 2: /* VT52 mode */	3687	case 2: /* VT52 mode */
3667	/* oddball mode. should be set regardless of set/reset	3688	/* oddball mode. should be set regardless of set/reset
3668	* parameter. Return from VT52 mode with an ESC < from	3689	* parameter. Return from VT52 mode with an ESC < from
3669	* within VT52 mode	3690	* within VT52 mode
3670	*/	3691	*/
3671	PrivMode (1, PrivMode_vt52);	3692	set_privmode (PrivMode_vt52, 1);
3672	break;	3693	break;
3673	case 3: /* 80/132 */	3694	case 3: /* 80/132 */
3674	if (priv_modes & PrivMode_132OK)	3695	if (priv_modes & PrivMode_132OK)
3675	{
3676	scr_poweron ();
3677	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3696	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3678	}
3679	break;	3697	break;
3680	case 4: /* smooth scrolling */	3698	case 4: /* smooth scrolling */
3681	set_option (Opt_jumpScroll, !state);	3699	set_option (Opt_jumpScroll, !state);
3682	break;	3700	break;
3683	case 5: /* reverse video */	3701	case 5: /* reverse video */
…		…
3694	if (state) /* orthogonal */	3712	if (state) /* orthogonal */
3695	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3713	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3696	break;	3714	break;
3697	#ifdef scrollBar_esc	3715	#ifdef scrollBar_esc
3698	case scrollBar_esc:	3716	case scrollBar_esc:
3699	if (scrollbar_mapping (state))	3717	if (scrollBar.map (state))
3700	{	3718	{
3701	resize_all_windows (0, 0, 0);	3719	resize_all_windows (0, 0, 0);
3702	scr_touch (true);	3720	scr_touch (true);
3703	}	3721	}
3704	break;	3722	break;
…		…
3725	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3743	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3726	vt_emask_mouse = PointerMotionMask;	3744	vt_emask_mouse = PointerMotionMask;
3727	}	3745	}
3728	else	3746	else
3729	vt_emask_mouse = NoEventMask;	3747	vt_emask_mouse = NoEventMask;
		3748
3730	vt_select_input ();	3749	vt_select_input ();
3731	break;	3750	break;
3732	case 1010: /* scroll to bottom on TTY output inhibit */	3751	case 1010: /* scroll to bottom on TTY output inhibit */
3733	set_option (Opt_scrollTtyOutput, !state);	3752	set_option (Opt_scrollTtyOutput, !state);
3734	break;	3753	break;
3735	case 1011: /* scroll to bottom on key press */	3754	case 1011: /* scroll to bottom on key press */
3736	set_option (Opt_scrollTtyKeypress, state);	3755	set_option (Opt_scrollTtyKeypress, state);
3737	break;	3756	break;
3738	case 1047: /* secondary screen w/ clearing last */	3757	case 1047: /* secondary screen w/ clearing last */
3739	if (option (Opt_secondaryScreen))	3758	if (option (Opt_secondaryScreen))
3740	if (current_screen != PRIMARY)	3759	if (!state)
3741	scr_erase_screen (2);	3760	scr_erase_screen (2);
		3761
3742	scr_change_screen (state);	3762	scr_change_screen (state);
3743	break;	3763	break;
3744	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
3745	scr_change_screen (state);	3769	scr_change_screen (state);
		3770
3746	if (option (Opt_secondaryScreen))	3771	if (option (Opt_secondaryScreen))
3747	if (current_screen != PRIMARY)	3772	if (state)
3748	scr_erase_screen (2);	3773	scr_erase_screen (2);
		3774	else
		3775	scr_cursor (RESTORE);
3749	break;	3776	break;
3750	default:	3777	default:
3751	break;	3778	break;
3752	}	3779	}
3753	}	3780	}

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