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

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

…		…
162		162
163	void	163	void
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font f = (fs)[fs->find_font (ch)];
168	wchar_t chr, alloc, ch2, *fname;	167	wchar_t chr, alloc, ch2, **fname;
169	int len;	168	int len;
170
171	fname = rxvt_utf8towcs (f->name);
172		169
173	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
174	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
175	{	172	{
176	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
197	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
198	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
199	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
201		198
		199	int width = 0;
		200	fname = rxvt_temp_buf<wchar_t *> (len);
		201	for (int i = 0; i < len; i++)
		202	{
		203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
		204	fname[i] = rxvt_utf8towcs (f->name);
202	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
203		207
204	max_it (width, 8+5); // for char + hex	208	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
206		210
207	if (y >= 0)	211	if (y >= 0)
208	{	212	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210	x = 0;	214	x = 0;
211	}	215	}
212		216
213	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
214		218
215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216		220
217	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
218	{	222	{
…		…
237	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
238	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
239	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
240	// }	244	// }
241	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
242	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
243
244	free (fname);	249	free (fname[i]);
		250	}
245		251
246	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
247	if (alloc)	253	if (alloc)
248	delete [] alloc;	254	delete [] alloc;
249	# endif	255	# endif
…		…
282	}	288	}
283		289
284	static int	290	static int
285	hex_keyval (XKeyEvent &ev)	291	hex_keyval (XKeyEvent &ev)
286	{	292	{
287	// check wether this event corresponds to a hex digit	293	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	294	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	295	for (int index = 0; index < 8; index++)
290	{	296	{
291	KeySym k = XLookupKeysym (&ev, index);	297	KeySym k = XLookupKeysym (&ev, index);
292		298
…		…
376	param = 5;	382	param = 5;
377	break;	383	break;
378	case XK_Next:	384	case XK_Next:
379	param = 6;	385	param = 6;
380	break;	386	break;
		387	case XK_Home:
		388	param = 7;
		389	break;
		390	case XK_End:
		391	param = 8;
		392	break;
381	#endif	393	#endif
382	case XK_Help:	394	case XK_Help:
383	param = 28;	395	param = 28;
384	break;	396	break;
385	case XK_Menu:	397	case XK_Menu:
…		…
409	* Always permit `shift' to override the current setting	421	* Always permit `shift' to override the current setting
410	*/	422	*/
411	shft = ev.state & ShiftMask;	423	shft = ev.state & ShiftMask;
412	ctrl = ev.state & ControlMask;	424	ctrl = ev.state & ControlMask;
413	meta = ev.state & ModMetaMask;	425	meta = ev.state & ModMetaMask;
414
415	if (numlock_state \|\| (ev.state & ModNumLockMask))
416	{
417	numlock_state = (ev.state & ModNumLockMask);
418	PrivMode ((!numlock_state), PrivMode_aplKP);
419	}
420		426
421	kbuf[0] = 0;	427	kbuf[0] = 0;
422		428
423	#ifdef USE_XIM	429	#ifdef USE_XIM
424	if (Input_Context)	430	if (Input_Context)
…		…
499	#ifdef PAGING_CONTEXT_LINES	505	#ifdef PAGING_CONTEXT_LINES
500	lnsppg = nrow - PAGING_CONTEXT_LINES;	506	lnsppg = nrow - PAGING_CONTEXT_LINES;
501	#else	507	#else
502	lnsppg = nrow * 4 / 5;	508	lnsppg = nrow * 4 / 5;
503	#endif	509	#endif
		510	max_it (lnsppg, 1);
		511
504	if (keysym == XK_Prior)	512	if (keysym == XK_Prior)
505	{	513	{
506	scr_page (UP, lnsppg);	514	scr_page (UP, lnsppg);
507	return;	515	return;
508	}	516	}
…		…
573	}	581	}
574	}	582	}
575		583
576	#if ENABLE_FRILLS \|\| ISO_14755	584	#if ENABLE_FRILLS \|\| ISO_14755
577	// ISO 14755 support	585	// ISO 14755 support
578	if (shft && ctrl)	586	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
579	{	587	{
580	int hv;	588	int hv;
581		589
582	if (iso14755buf & ISO_14755_51	590	if (iso14755buf & ISO_14755_51
583	&& (keysym == XK_space \|\| keysym == XK_KP_Space	591	&& (keysym == XK_space \|\| keysym == XK_KP_Space
…		…
613	scr_overlay_off ();	621	scr_overlay_off ();
614	# endif	622	# endif
615	iso14755buf = 0;	623	iso14755buf = 0;
616	}	624	}
617	}	625	}
		626	else if (option (Opt_iso14755) &&
618	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	627	((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
619	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	628	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R))))
620	if (!(iso14755buf & ISO_14755_STARTED))	629	if (!(iso14755buf & ISO_14755_STARTED))
621	{	630	{
622	iso14755buf \|= ISO_14755_STARTED;	631	iso14755buf \|= ISO_14755_STARTED;
623	# if ISO_14755	632	# if ISO_14755
624	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	633	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
635	}	644	}
636	#endif	645	#endif
637		646
638	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639	{	648	{
640	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	649	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641	unsigned int newlen = 1;	650	unsigned int newlen = 1;
642		651
		652	if (ev.state & ModNumLockMask)
		653	kp = false;
		654
643	switch (translate_keypad (keysym, kp))	655	keysym = translate_keypad (keysym, kp);
		656
		657	switch (keysym)
		658	{
		659	#ifndef NO_BACKSPACE_KEY
		660	case XK_BackSpace:
		661	if (priv_modes & PrivMode_HaveBackSpace)
		662	{
		663	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		664	^ !!ctrl) ? '\b' : '\177';
		665	kbuf[1] = '\0';
		666	}
		667	else
		668	strcpy (kbuf, rs[Rs_backspace_key]);
		669	break;
		670	#endif
		671	#ifndef NO_DELETE_KEY
		672	case XK_Delete:
		673	strcpy (kbuf, rs[Rs_delete_key]);
		674	break;
		675	#endif
		676	case XK_Tab:
		677	if (shft)
		678	strcpy (kbuf, "\033[Z");
		679	else
		680	{
		681	#ifdef CTRL_TAB_MAKES_META
		682	if (ctrl)
		683	meta = 1;
		684	#endif
		685	#ifdef MOD4_TAB_MAKES_META
		686	if (ev.state & Mod4Mask)
		687	meta = 1;
		688	#endif
		689	newlen = 0;
		690	}
		691	break;
		692
		693	case XK_Up: /* "\033[A" */
		694	case XK_Down: /* "\033[B" */
		695	case XK_Right: /* "\033[C" */
		696	case XK_Left: /* "\033[D" */
		697	strcpy (kbuf, "\033[Z");
		698	kbuf[2] = "DACB"[keysym - XK_Left];
		699	/* do Shift first */
		700	if (shft)
		701	kbuf[2] = "dacb"[keysym - XK_Left];
		702	else if (ctrl)
		703	{
		704	kbuf[1] = 'O';
		705	kbuf[2] = "dacb"[keysym - XK_Left];
		706	}
		707	else if (priv_modes & PrivMode_aplCUR)
		708	kbuf[1] = 'O';
		709	break;
		710
		711	case XK_KP_Enter:
		712	/* allow shift to override */
		713	if (kp)
		714	{
		715	strcpy (kbuf, "\033OM");
		716	break;
		717	}
		718
		719	/* FALLTHROUGH */
		720
		721	case XK_Return:
		722	if (priv_modes & PrivMode_LFNL)
		723	{
		724	kbuf[0] = '\015';
		725	kbuf[1] = '\012';
		726	kbuf[2] = '\0';
		727	}
		728	else
		729	{
		730	kbuf[0] = '\015';
		731	kbuf[1] = '\0';
		732	}
		733	break;
		734
		735	case XK_KP_F1: /* "\033OP" */
		736	case XK_KP_F2: /* "\033OQ" */
		737	case XK_KP_F3: /* "\033OR" */
		738	case XK_KP_F4: /* "\033OS" */
		739	strcpy (kbuf, "\033OP");
		740	kbuf[2] += (keysym - XK_KP_F1);
		741	break;
		742
		743	case XK_KP_Multiply: /* "\033Oj" : "" /
		744	case XK_KP_Add: /* "\033Ok" : "+" */
		745	case XK_KP_Separator: /* "\033Ol" : "," */
		746	case XK_KP_Subtract: /* "\033Om" : "-" */
		747	case XK_KP_Decimal: /* "\033On" : "." */
		748	case XK_KP_Divide: /* "\033Oo" : "/" */
		749	case XK_KP_0: /* "\033Op" : "0" */
		750	case XK_KP_1: /* "\033Oq" : "1" */
		751	case XK_KP_2: /* "\033Or" : "2" */
		752	case XK_KP_3: /* "\033Os" : "3" */
		753	case XK_KP_4: /* "\033Ot" : "4" */
		754	case XK_KP_5: /* "\033Ou" : "5" */
		755	case XK_KP_6: /* "\033Ov" : "6" */
		756	case XK_KP_7: /* "\033Ow" : "7" */
		757	case XK_KP_8: /* "\033Ox" : "8" */
		758	case XK_KP_9: /* "\033Oy" : "9" */
		759	/* allow shift to override */
		760	if (kp)
		761	{
		762	strcpy (kbuf, "\033Oj");
		763	kbuf[2] += (keysym - XK_KP_Multiply);
		764	}
		765	else
		766	{
		767	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		768	kbuf[1] = '\0';
		769	}
		770	break;
		771
		772	default:
644	{	773	{
645	#ifndef NO_BACKSPACE_KEY
646	case XK_BackSpace:
647	if (priv_modes & PrivMode_HaveBackSpace)
648	{
649	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650	^ !!ctrl) ? '\b' : '\177';
651	kbuf[1] = '\0';
652	}
653	else
654	strcpy (kbuf, rs[Rs_backspace_key]);
655	break;
656	#endif
657	#ifndef NO_DELETE_KEY
658	case XK_Delete:
659	strcpy (kbuf, rs[Rs_delete_key]);
660	break;
661	#endif
662	case XK_Tab:
663	if (shft)
664	strcpy (kbuf, "\033[Z");
665	else
666	{
667	#ifdef CTRL_TAB_MAKES_META
668	if (ctrl)
669	meta = 1;
670	#endif
671	#ifdef MOD4_TAB_MAKES_META
672	if (ev.state & Mod4Mask)
673	meta = 1;
674	#endif
675	newlen = 0;
676	}
677	break;
678
679	case XK_Up: /* "\033[A" */
680	case XK_Down: /* "\033[B" */
681	case XK_Right: /* "\033[C" */
682	case XK_Left: /* "\033[D" */
683	strcpy (kbuf, "\033[Z");
684	kbuf[2] = "DACB"[keysym - XK_Left];
685	/* do Shift first */
686	if (shft)
687	kbuf[2] = "dacb"[keysym - XK_Left];
688	else if (ctrl)
689	{
690	kbuf[1] = 'O';
691	kbuf[2] = "dacb"[keysym - XK_Left];
692	}
693	else if (priv_modes & PrivMode_aplCUR)
694	kbuf[1] = 'O';
695	break;
696
697	case XK_KP_Enter:
698	/* allow shift to override */
699	if (kp)
700	{
701	strcpy (kbuf, "\033OM");
702	break;
703	}
704
705	/* FALLTHROUGH */
706
707	case XK_Return:
708	if (priv_modes & PrivMode_LFNL)
709	{
710	kbuf[0] = '\015';
711	kbuf[1] = '\012';
712	kbuf[2] = '\0';
713	}
714	else
715	{
716	kbuf[0] = '\015';
717	kbuf[1] = '\0';
718	}
719	break;
720
721	case XK_KP_F1: /* "\033OP" */
722	case XK_KP_F2: /* "\033OQ" */
723	case XK_KP_F3: /* "\033OR" */
724	case XK_KP_F4: /* "\033OS" */
725	strcpy (kbuf, "\033OP");
726	kbuf[2] += (keysym - XK_KP_F1);
727	break;
728
729	case XK_KP_Multiply: /* "\033Oj" : "" /
730	case XK_KP_Add: /* "\033Ok" : "+" */
731	case XK_KP_Separator: /* "\033Ol" : "," */
732	case XK_KP_Subtract: /* "\033Om" : "-" */
733	case XK_KP_Decimal: /* "\033On" : "." */
734	case XK_KP_Divide: /* "\033Oo" : "/" */
735	case XK_KP_0: /* "\033Op" : "0" */
736	case XK_KP_1: /* "\033Oq" : "1" */
737	case XK_KP_2: /* "\033Or" : "2" */
738	case XK_KP_3: /* "\033Os" : "3" */
739	case XK_KP_4: /* "\033Ot" : "4" */
740	case XK_KP_5: /* "\033Ou" : "5" */
741	case XK_KP_6: /* "\033Ov" : "6" */
742	case XK_KP_7: /* "\033Ow" : "7" */
743	case XK_KP_8: /* "\033Ox" : "8" */
744	case XK_KP_9: /* "\033Oy" : "9" */
745	/* allow shift to override */
746	if (kp)
747	{
748	strcpy (kbuf, "\033Oj");
749	kbuf[2] += (keysym - XK_KP_Multiply);
750	}
751	else
752	{
753	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754	kbuf[1] = '\0';
755	}
756	break;
757
758	case XK_End:
759	strcpy (kbuf, KS_END);
760	break;
761	case XK_Home:
762	strcpy (kbuf, KS_HOME);
763	break;
764
765	default:
766	{
767	int param = map_function_key (keysym);	774	int param = map_function_key (keysym);
768	if (param > 0)	775	if (param > 0)
769	sprintf (kbuf,"\033[%d~", param);	776	sprintf (kbuf,"\033[%d~", param);
770	else	777	else
771	newlen = 0;	778	newlen = 0;
772	}
773	break;
774	}	779	}
		780	break;
		781	}
775		782
776	if (newlen)	783	if (newlen)
777	len = strlen (kbuf);	784	len = strlen (kbuf);
778		785
779	/*	786	/*
780	* Pass meta for all function keys, if 'meta' option set	787	* Pass meta for all function keys, if 'meta' option set
781	*/	788	*/
782	#ifdef META8_OPTION	789	#ifdef META8_OPTION
…		…
968	rxvt_term::flush ()	975	rxvt_term::flush ()
969	{	976	{
970	flush_ev.stop ();	977	flush_ev.stop ();
971		978
972	#ifdef HAVE_BG_PIXMAP	979	#ifdef HAVE_BG_PIXMAP
973	if (bgPixmap.check_clearChanged ())	980	if (bgPixmap.flags & bgPixmap_t::hasChanged)
974	{	981	{
		982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;
975	// scr_clear (true); This needs to be researched further!	983	// scr_clear (true); This needs to be researched further!
976	scr_touch (false);	984	scr_touch (false);
977	}	985	}
978	#endif	986	#endif
979		987
…		…
1016	}	1024	}
1017	while (row < end_row);	1025	while (row < end_row);
1018	}	1026	}
1019		1027
1020	scr_refresh ();	1028	scr_refresh ();
1021	scrollbar_show (1);	1029	scrollBar.show (1);
1022	#ifdef USE_XIM	1030	#ifdef USE_XIM
1023	IMSendSpot ();	1031	IMSendSpot ();
1024	#endif	1032	#endif
1025	}	1033	}
1026		1034
1027	display->flush ();	1035	display->flush ();
1028	}	1036	}
1029		1037
1030	/* checks wether a refresh is requested and starts the refresh timer */	1038	/* checks whether a refresh is requested and starts the refresh timer */
1031	void	1039	void
1032	rxvt_term::refresh_check ()	1040	rxvt_term::refresh_check ()
1033	{	1041	{
1034	if (want_refresh && !flush_ev.is_active ())	1042	if (want_refresh && !flush_ev.is_active ())
1035	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1043	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1128	{	1136	{
1129	// this should really be sched_yield(), but the linux guys thought	1137	// this should really be sched_yield(), but the linux guys thought
1130	// that giving a process calling sched_yield () less cpu time than	1138	// that giving a process calling sched_yield () less cpu time than
1131	// 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
1132	// 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.
1133		1144
1134	struct timespec ts = { 0, 0 };	1145	struct timespec ts = { 0, 1000 };
1135	nanosleep (&ts, 0);	1146	nanosleep (&ts, 0);
1136		1147
1137	w.stop ();	1148	w.stop ();
1138	}	1149	}
1139		1150
…		…
1189	{	1200	{
1190	make_current ();	1201	make_current ();
1191		1202
1192	if (revents & ev::READ)	1203	if (revents & ev::READ)
1193	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1194	while (pty_fill ())	1205	for (int i = CBUFCNT; i-- && pty_fill (); )
1195	if (cmd_parse ())	1206	cmd_parse ();
1196	break;
1197		1207
1198	if (revents & ev::WRITE)	1208	if (revents & ev::WRITE)
1199	pty_write ();	1209	pty_write ();
1200		1210
1201	refresh_check ();	1211	refresh_check ();
…		…
1421	&& ev.xfocus.mode != NotifyGrab)	1431	&& ev.xfocus.mode != NotifyGrab)
1422	focus_out ();	1432	focus_out ();
1423	break;	1433	break;
1424		1434
1425	case ConfigureNotify:	1435	case ConfigureNotify:
1426	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428	szHint.width, szHint.height);*/
1429	if (ev.xconfigure.window == parent[0])	1436	if (ev.xconfigure.window == parent[0])
1430	{	1437	{
1431	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1438	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1432	;	1439	;
1433		1440
…		…
1460	selection_property (ev.xproperty.window, ev.xproperty.atom);	1467	selection_property (ev.xproperty.window, ev.xproperty.atom);
1461		1468
1462	break;	1469	break;
1463		1470
1464	case SelectionClear:	1471	case SelectionClear:
1465	selection_clear ();	1472	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466	break;	1473	break;
1467		1474
1468	case SelectionNotify:	1475	case SelectionNotify:
1469	if (selection_wait == Sel_normal)	1476	if (selection_wait == Sel_normal)
1470	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1477	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
…		…
1474	selection_send (ev.xselectionrequest);	1481	selection_send (ev.xselectionrequest);
1475	break;	1482	break;
1476		1483
1477	case MapNotify:	1484	case MapNotify:
1478	#ifdef HAVE_BG_PIXMAP	1485	#ifdef HAVE_BG_PIXMAP
1479	/* 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
1480	* non-reparenting window manager. In those cases we never get first	1487	* non-reparenting window manager. In those cases we never get first
1481	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1488	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1482	* care of multiplicity of ConfigureNotify events arriwing while WM does	1489	* care of multiplicity of ConfigureNotify events arriving while WM does
1483	* reparenting.	1490	* reparenting.
1484	* We should not render background immidiately, as there could be several	1491	* We should not render background immediately, as there could be several
1485	* 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
1486	* 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
1487	* bit of time for ConfigureNotifies to arrive.	1494	* bit of time for ConfigureNotifies to arrive.
1488	* 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
1489	* of ConfigureNotifys for the best results.	1496	* of ConfigureNotifys for the best results.
…		…
1537	;	1544	;
1538		1545
1539	if (scrollBar.state && ev.xany.window == scrollBar.win)	1546	if (scrollBar.state && ev.xany.window == scrollBar.win)
1540	{	1547	{
1541	scrollBar.state = STATE_IDLE;	1548	scrollBar.state = STATE_IDLE;
1542	scrollbar_show (0);	1549	scrollBar.show (0);
1543	}	1550	}
1544	}	1551	}
1545	break;	1552	break;
1546		1553
1547	case MotionNotify:	1554	case MotionNotify:
…		…
1646	&unused_root, &unused_child,	1653	&unused_root, &unused_child,
1647	&unused_root_x, &unused_root_y,	1654	&unused_root_x, &unused_root_y,
1648	&ev.xbutton.x, &ev.xbutton.y,	1655	&ev.xbutton.x, &ev.xbutton.y,
1649	&unused_mask);	1656	&unused_mask);
1650	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1657	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1651	scrollbar_size ());	1658	scrollBar.size ());
1652	want_refresh = 1;	1659	want_refresh = 1;
1653	scrollbar_show (1);	1660	scrollBar.show (1);
1654	}	1661	}
1655	break;	1662	break;
1656	}	1663	}
1657		1664
1658	#if defined(CURSOR_BLINK)	1665	#if defined(CURSOR_BLINK)
…		…
1683	#endif	1690	#endif
1684		1691
1685	refresh_check ();	1692	refresh_check ();
1686	}	1693	}
1687		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
1688	void	1711	void
1689	rxvt_term::focus_in ()	1712	rxvt_term::focus_in ()
1690	{	1713	{
1691	if (!focus)	1714	if (!focus)
1692	{	1715	{
1693	focus = 1;	1716	focus = 1;
1694	want_refresh = 1;	1717	want_refresh = 1;
1695
1696	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697		1718
1698	#if USE_XIM	1719	#if USE_XIM
1699	if (Input_Context != NULL)	1720	if (Input_Context != NULL)
1700	{	1721	{
1701	IMSetPosition ();	1722	IMSetPosition ();
…		…
1713	scr_recolour ();	1734	scr_recolour ();
1714	}	1735	}
1715	#endif	1736	#endif
1716	#if ENABLE_FRILLS	1737	#if ENABLE_FRILLS
1717	if (option (Opt_urgentOnBell))	1738	if (option (Opt_urgentOnBell))
1718	{	1739	set_urgency (0);
1719	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720	{
1721	h->flags &= ~XUrgencyHint;
1722	XSetWMHints (dpy, parent[0], h);
1723	}
1724	}
1725	#endif	1740	#endif
		1741
		1742	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726	}	1743	}
1727	}	1744	}
1728		1745
1729	void	1746	void
1730	rxvt_term::focus_out ()	1747	rxvt_term::focus_out ()
…		…
1732	if (focus)	1749	if (focus)
1733	{	1750	{
1734	focus = 0;	1751	focus = 0;
1735	want_refresh = 1;	1752	want_refresh = 1;
1736		1753
1737	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1754	#if ENABLE_FRILLS
1738		1755	if (option (Opt_urgentOnBell))
		1756	set_urgency (0);
		1757	#endif
1739	#if ENABLE_FRILLS \|\| ISO_14755	1758	#if ENABLE_FRILLS \|\| ISO_14755
1740	if (iso14755buf)	1759	if (iso14755buf)
1741	{	1760	{
1742	iso14755buf = 0;	1761	iso14755buf = 0;
1743	# if ISO_14755	1762	# if ISO_14755
…		…
1760	{	1779	{
1761	pix_colors = pix_colors_unfocused;	1780	pix_colors = pix_colors_unfocused;
1762	scr_recolour ();	1781	scr_recolour ();
1763	}	1782	}
1764	#endif	1783	#endif
		1784
		1785	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765	}	1786	}
1766	}	1787	}
1767		1788
1768	void	1789	void
1769	rxvt_term::update_fade_color (unsigned int idx)	1790	rxvt_term::update_fade_color (unsigned int idx)
…		…
1846	/* save the xbutton state (for ButtonRelease) */	1867	/* save the xbutton state (for ButtonRelease) */
1847	MEvent.state = ev.state;	1868	MEvent.state = ev.state;
1848	#ifdef MOUSE_REPORT_DOUBLECLICK	1869	#ifdef MOUSE_REPORT_DOUBLECLICK
1849	if (ev.button == MEvent.button && clickintime)	1870	if (ev.button == MEvent.button && clickintime)
1850	{	1871	{
1851	/* same button, within alloted time */	1872	/* same button, within allowed time */
1852	MEvent.clicks++;	1873	MEvent.clicks++;
1853		1874
1854	if (MEvent.clicks > 1)	1875	if (MEvent.clicks > 1)
1855	{	1876	{
1856	/* only report double clicks */	1877	/* only report double clicks */
…		…
2011	}	2032	}
2012		2033
2013	if (scrollBar.style == R_SB_XTERM	2034	if (scrollBar.style == R_SB_XTERM
2014	\|\| scrollbar_above_slider (ev.y)	2035	\|\| scrollbar_above_slider (ev.y)
2015	\|\| scrollbar_below_slider (ev.y))	2036	\|\| scrollbar_below_slider (ev.y))
2016	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2017		2038
2018	scrollBar.state = STATE_MOTION;	2039	scrollBar.state = STATE_MOTION;
2019	break;	2040	break;
2020		2041
2021	case Button1:	2042	case Button1:
…		…
2044	else	2065	else
2045	{	2066	{
2046	scr_page ((ev.button == Button1 ? DN : UP),	2067	scr_page ((ev.button == Button1 ? DN : UP),
2047	(nrow	2068	(nrow
2048	* scrollbar_position (ev.y)	2069	* scrollbar_position (ev.y)
2049	/ scrollbar_size ()));	2070	/ scrollBar.size ()));
2050	}	2071	}
2051		2072
2052	break;	2073	break;
2053	}	2074	}
2054	}	2075	}
…		…
2067	reportmode = !! (priv_modes & PrivMode_mouse_report);	2088	reportmode = !! (priv_modes & PrivMode_mouse_report);
2068		2089
2069	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2090	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2070	{	2091	{
2071	scrollBar.state = STATE_IDLE;	2092	scrollBar.state = STATE_IDLE;
2072	scrollbar_show (0);	2093	scrollBar.show (0);
2073	}	2094	}
2074		2095
2075	#ifdef SELECTION_SCROLLING	2096	#ifdef SELECTION_SCROLLING
2076	sel_scroll_ev.stop();	2097	sel_scroll_ev.stop();
2077	#endif	2098	#endif
…		…
2127	selection_make (ev.time);	2148	selection_make (ev.time);
2128	break;	2149	break;
2129		2150
2130	case Button2:	2151	case Button2:
2131	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?
2132	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2153	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2133	break;	2154	break;
2134		2155
2135	#ifdef MOUSE_WHEEL	2156	#ifdef MOUSE_WHEEL
2136	case Button4:	2157	case Button4:
2137	case Button5:	2158	case Button5:
…		…
2160	}	2181	}
2161	else	2182	else
2162	# endif	2183	# endif
2163	{	2184	{
2164	scr_page (v, i);	2185	scr_page (v, i);
2165	scrollbar_show (1);	2186	scrollBar.show (1);
2166	}	2187	}
2167	}	2188	}
2168	break;	2189	break;
2169	#endif	2190	#endif
2170	}	2191	}
2171	}	2192	}
2172	}	2193	}
2173		2194
2174	/}}} /	2195	/}}} /
2175		2196
2176	bool	2197	void
2177	rxvt_term::cmd_parse ()	2198	rxvt_term::cmd_parse ()
2178	{	2199	{
2179	bool flag = false;
2180	wchar_t ch = NOCHAR;	2200	wchar_t ch = NOCHAR;
2181	char *seq_begin; // remember start of esc-sequence here	2201	char *seq_begin; // remember start of esc-sequence here
2182		2202
2183	for (;;)	2203	for (;;)
2184	{	2204	{
2185	if (ch == NOCHAR)	2205	if (expect_false (ch == NOCHAR))
2186	{	2206	{
2187	seq_begin = cmdbuf_ptr;	2207	seq_begin = cmdbuf_ptr;
2188	ch = next_char ();	2208	ch = next_char ();
2189		2209
2190	if (ch == NOCHAR)	2210	if (ch == NOCHAR)
2191	break;	2211	break;
2192	}	2212	}
2193		2213
2194	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))
2195	{	2215	{
2196	if (!seen_input)	2216	if (expect_false (!seen_input))
2197	{	2217	{
2198	seen_input = 1;	2218	seen_input = 1;
2199	// many badly-written programs (e.g. jed) contain a race condition:	2219	// many badly-written programs (e.g. jed) contain a race condition:
2200	// they first read the screensize and then install a SIGWINCH handler.	2220	// they first read the screensize and then install a SIGWINCH handler.
2201	// some window managers resize the window early, and these programs	2221	// some window managers resize the window early, and these programs
…		…
2214	wchar_t *str = buf;	2234	wchar_t *str = buf;
2215	wchar_t *eol = str + min (ncol, UBUFSIZ);	2235	wchar_t *eol = str + min (ncol, UBUFSIZ);
2216		2236
2217	for (;;)	2237	for (;;)
2218	{	2238	{
2219	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)))
2220	break;	2240	break;
2221		2241
2222	*str++ = ch;	2242	*str++ = ch;
2223		2243
2224	if (ch == C0_LF \|\| str >= eol)	2244	if (expect_false (ch == C0_LF \|\| str >= eol))
2225	{	2245	{
2226	if (ch == C0_LF)	2246	if (ch == C0_LF)
2227	nlines++;	2247	nlines++;
2228		2248
2229	refresh_count++;	2249	refresh_count++;
…		…
2278	* 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.
2279	* if skipScroll is enabled.	2299	* if skipScroll is enabled.
2280	*/	2300	*/
2281	if (refreshnow)	2301	if (refreshnow)
2282	{	2302	{
2283	flag = true;
2284	scr_refresh ();	2303	scr_refresh ();
2285	want_refresh = 1;	2304	want_refresh = 1;
2286	}	2305	}
2287
2288	}	2306	}
2289	else	2307	else
2290	{	2308	{
2291	try	2309	try
2292	{	2310	{
…		…
2300	}	2318	}
2301		2319
2302	ch = NOCHAR;	2320	ch = NOCHAR;
2303	}	2321	}
2304	}	2322	}
2305
2306	return flag;
2307	}	2323	}
2308		2324
2309	// read the next character	2325	// read the next character
2310	wchar_t	2326	wchar_t
2311	rxvt_term::next_char () NOTHROW	2327	rxvt_term::next_char () NOTHROW
2312	{	2328	{
2313	while (cmdbuf_ptr < cmdbuf_endp)	2329	while (cmdbuf_ptr < cmdbuf_endp)
2314	{	2330	{
2315	// assume 7-bit to be ascii ALWAYS	2331	// assume 7-bit to be ascii ALWAYS
2316	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2332	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2317	return *cmdbuf_ptr++;	2333	return *cmdbuf_ptr++;
2318		2334
2319	wchar_t wc;	2335	wchar_t wc;
2320	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);
2321		2337
…		…
2325	cmdbuf_ptr = cmdbuf_endp;	2341	cmdbuf_ptr = cmdbuf_endp;
2326	break;	2342	break;
2327	}	2343	}
2328		2344
2329	if (len == (size_t)-1)	2345	if (len == (size_t)-1)
		2346	{
		2347	mbstate.reset (); // reset now undefined conversion state
2330	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	}
2331		2350
2332	// assume wchar == unicode	2351	// assume wchar == unicode
2333	cmdbuf_ptr += len;	2352	cmdbuf_ptr += len;
2334	return wc & UNICODE_MASK;	2353	return wc & UNICODE_MASK;
2335	}	2354	}
…		…
2379	/----------------------------------------------------------------------/	2398	/----------------------------------------------------------------------/
2380	#ifdef PRINTPIPE	2399	#ifdef PRINTPIPE
2381	FILE *	2400	FILE *
2382	rxvt_term::popen_printer ()	2401	rxvt_term::popen_printer ()
2383	{	2402	{
2384	FILE *stream = popen (rs[Rs_print_pipe], "w");	2403	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385		2404
2386	if (stream == NULL)	2405	if (stream == NULL)
2387	rxvt_warn ("can't open printer pipe, not printing.\n");	2406	rxvt_warn ("can't open printer pipe, not printing.\n");
2388		2407
2389	return stream;	2408	return stream;
…		…
2400	* simulate attached vt100 printer	2419	* simulate attached vt100 printer
2401	*/	2420	*/
2402	void	2421	void
2403	rxvt_term::process_print_pipe ()	2422	rxvt_term::process_print_pipe ()
2404	{	2423	{
2405	int done;	2424	FILE *fd = popen_printer ();
2406	FILE *fd;
2407		2425
2408	if ((fd = popen_printer ()) == NULL)	2426	if (!fd)
2409	return;	2427	return;
2410		2428
2411	/*	2429	/*
2412	* 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
2413	* is received.	2431	* is received.
2414	*/	2432	*/
2415	for (done = 0; !done;)	2433	for (int done = 0; !done; )
2416	{	2434	{
2417	unsigned char buf[8];	2435	unsigned char buf[8];
2418	unicode_t ch;	2436	unicode_t ch;
2419	unsigned int i, len;	2437	unsigned int i, len;
2420		2438
…		…
2565	break;	2583	break;
2566	case 'Z': /* identify the terminal type */	2584	case 'Z': /* identify the terminal type */
2567	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2585	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568	break;	2586	break;
2569	case '<': /* turn off VT52 mode */	2587	case '<': /* turn off VT52 mode */
2570	PrivMode (0, PrivMode_vt52);	2588	set_privmode (PrivMode_vt52, 0);
2571	break;	2589	break;
2572	case 'F': /* use special graphics character set */	2590	case 'F': /* use special graphics character set */
2573	case 'G': /* use regular character set */	2591	case 'G': /* use regular character set */
2574	/* unimplemented */	2592	/* unimplemented */
2575	break;	2593	break;
…		…
2629	scr_forwardindex ();	2647	scr_forwardindex ();
2630	break;	2648	break;
2631	#endif	2649	#endif
2632	case '=':	2650	case '=':
2633	case '>':	2651	case '>':
2634	PrivMode ((ch == '='), PrivMode_aplKP);	2652	set_privmode (PrivMode_aplKP, ch == '=');
2635	break;	2653	break;
2636		2654
2637	case C1_40:	2655	case C1_40:
2638	cmd_getc ();	2656	cmd_getc ();
2639	break;	2657	break;
…		…
2678	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2696	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679	case C1_SCI: /* ESC Z */	2697	case C1_SCI: /* ESC Z */
2680	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);	2698	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681	break; /* steal obsolete ESC [ c */	2699	break; /* steal obsolete ESC [ c */
2682		2700
2683	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2701	/* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684	case C1_CSI: /* ESC [ */	2702	case C1_CSI: /* ESC [ */
2685	process_csi_seq ();	2703	process_csi_seq ();
2686	break;	2704	break;
2687		2705
2688	/* 8.3.90: OPERATING SYSTEM COMMAND */	2706	/* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689	case C1_OSC: /* ESC ] */	2707	case C1_OSC: /* ESC ] */
2690	process_osc_seq ();	2708	process_osc_seq ();
2691	break;	2709	break;
2692		2710
2693	/* 8.3.106: RESET TO INITIAL STATE */	2711	/* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694	case 'c':	2712	case 'c':
2695	mbstate.reset ();	2713	mbstate.reset ();
2696	scr_poweron ();	2714	scr_poweron ();
2697	scrollbar_show (1);	2715	scrollBar.show (1);
2698	break;	2716	break;
2699		2717
2700	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */	2718	/* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701	case 'n':	2719	case 'n':
2702	scr_charset_choose (2);	2720	scr_charset_choose (2);
…		…
2753		2771
2754	nargs = 0;	2772	nargs = 0;
2755		2773
2756	priv = 0;	2774	priv = 0;
2757	ch = cmd_getc ();	2775	ch = cmd_getc ();
2758	if (ch >= '<' && ch <= '?')	2776	if ((ch >= '<' && ch <= '?') \|\| ch == '!')
2759	{	2777	{
2760	/* '<' '=' '>' '?' */	2778	/* '<' '=' '>' '?' '!' */
2761	priv = ch;	2779	priv = ch;
2762	ch = cmd_getc ();	2780	ch = cmd_getc ();
2763	}	2781	}
2764		2782
2765	/* read any numerical arguments */	2783	/* read any numerical arguments */
…		…
2819		2837
2820	case '?':	2838	case '?':
2821	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2839	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2822	process_terminal_mode (ch, priv, nargs, arg);	2840	process_terminal_mode (ch, priv, nargs, arg);
2823	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);
2824	}	2854	}
		2855	break;
		2856	}
		2857
2825	return;	2858	return;
2826	}	2859	}
2827		2860
2828	switch (ch)	2861	switch (ch)
2829	{	2862	{
…		…
3196	* 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)'
3197	*/	3230	*/
3198	void	3231	void
3199	rxvt_term::process_dcs_seq ()	3232	rxvt_term::process_dcs_seq ()
3200	{	3233	{
3201	char *s;
3202	unicode_t eh;
3203
3204	/*	3234	/*
3205	* Not handled yet	3235	* Not handled yet
3206	*/	3236	*/
		3237
		3238	unicode_t eh;
3207	s = get_to_st (eh);	3239	char *s = get_to_st (eh);
3208	if (s)	3240	if (s)
3209	free (s);	3241	free (s);
3210		3242
3211	return;	3243	return;
3212	}	3244	}
…		…
3216	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'	3248	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST\|BEL)'
3217	*/	3249	*/
3218	void	3250	void
3219	rxvt_term::process_osc_seq ()	3251	rxvt_term::process_osc_seq ()
3220	{	3252	{
3221	unicode_t ch, eh;
3222	int arg;	3253	int arg;
3223		3254
3224	ch = cmd_getc ();	3255	unicode_t ch = cmd_getc ();
3225	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3256	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3226	arg = arg * 10 + (ch - '0');	3257	arg = arg * 10 + (ch - '0');
3227		3258
3228	if (ch == ';')	3259	if (ch == ';')
3229	{	3260	{
		3261	unicode_t eh;
3230	char *s = get_to_st (eh);	3262	char *s = get_to_st (eh);
3231		3263
3232	if (s)	3264	if (s)
3233	{	3265	{
3234	process_xterm_seq (arg, s, eh);	3266	process_xterm_seq (arg, s, eh);
…		…
3258		3290
3259	/*	3291	/*
3260	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3292	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3261	*/	3293	*/
3262	void	3294	void
3263	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3295	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264	{	3296	{
3265	int color;	3297	int color;
3266	char buf, name;	3298	char buf, name;
3267	bool query = str[0] == '?' && !str[1];	3299	bool query = str[0] == '?' && !str[1];
3268	int saveop = op;	3300	int saveop = op;
…		…
3309		3341
3310	XFree (value);	3342	XFree (value);
3311	}	3343	}
3312	else	3344	else
3313	{	3345	{
3314	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3346	char *eq = strchr (str, '=');
3315		3347
3316	if (eq)	3348	if (eq)
3317	{	3349	{
3318	*eq = 0;	3350	*eq = 0;
3319	set_utf8_property (display->atom (str), eq + 1);	3351	set_utf8_property (display->atom (str), eq + 1);
…		…
3359	process_color_seq (op, Color_pointer_fg, str, resp);	3391	process_color_seq (op, Color_pointer_fg, str, resp);
3360	break;	3392	break;
3361	case XTerm_Color_pointer_bg:	3393	case XTerm_Color_pointer_bg:
3362	process_color_seq (op, Color_pointer_bg, str, resp);	3394	process_color_seq (op, Color_pointer_bg, str, resp);
3363	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
3364	#ifndef NO_BOLD_UNDERLINE_REVERSE	3404	#ifndef NO_BOLD_UNDERLINE_REVERSE
3365	case XTerm_Color_RV:
3366	process_color_seq (op, Color_RV, str, resp);
3367	break;
3368	case Rxvt_Color_BD:
3369	case URxvt_Color_BD:	3405	case URxvt_Color_BD:
3370	process_color_seq (op, Color_BD, str, resp);	3406	process_color_seq (op, Color_BD, str, resp);
3371	break;	3407	break;
3372	case Rxvt_Color_UL:
3373	case URxvt_Color_UL:	3408	case URxvt_Color_UL:
3374	process_color_seq (op, Color_UL, str, resp);	3409	process_color_seq (op, Color_UL, str, resp);
3375	break;	3410	break;
3376	case URxvt_Color_IT:	3411	case URxvt_Color_IT:
3377	process_color_seq (op, Color_IT, str, resp);	3412	process_color_seq (op, Color_IT, str, resp);
3378	break;	3413	break;
3379	#endif	3414	#endif
		3415	case URxvt_Color_border:
		3416	process_color_seq (op, Color_border, str, resp);
		3417	break;
3380	#if ENABLE_TRANSPARENCY	3418	#if ENABLE_TRANSPARENCY
3381	case URxvt_Color_tint:	3419	case URxvt_Color_tint:
3382	process_color_seq (op, Color_tint, str, resp);	3420	process_color_seq (op, Color_tint, str, resp);
3383	{	3421	{
3384	bool changed = false;	3422	bool changed = false;
…		…
3399	case Rxvt_Pixmap:	3437	case Rxvt_Pixmap:
3400	if (!strcmp (str, "?"))	3438	if (!strcmp (str, "?"))
3401	{	3439	{
3402	char str[256];	3440	char str[256];
3403		3441
3404	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3442	sprintf (str, "[%dx%d+%d+%d]",
3405	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3443	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3406	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3444	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407	process_xterm_seq (XTerm_title, str, CHAR_ST);	3445	process_xterm_seq (XTerm_title, str, CHAR_ST);
3408	}	3446	}
3409	else	3447	else
3410	{	3448	{
3411	int changed = 0;	3449	int changed = 0;
3412		3450
3413	if (*str != ';')	3451	if (*str != ';')
3414	{	3452	{
3415	/* reset to default scaling :*/
3416	bgPixmap.unset_geometry ();
3417	if (bgPixmap.set_file (str)) /* change pixmap */	3453	if (bgPixmap.set_file (str)) /* change pixmap */
3418	changed++;	3454	changed++;
3419	str = strchr (str, ';');	3455	str = strchr (str, ';');
3420	if (str == NULL)	3456	if (str == NULL)
3421	bgPixmap.set_defaultGeometry ();	3457	bgPixmap.set_defaultGeometry ();
		3458	else
		3459	bgPixmap.set_geometry (str+1);
3422	}	3460	}
3423		3461	else
3424	while (str)
3425	{	3462	{
3426	str++;	3463	str++;
3427	if (bgPixmap.set_geometry (str))	3464	if (bgPixmap.set_geometry (str, true))
3428	changed++;	3465	changed++;
3429	str = strchr (str, ';');
3430	}	3466	}
3431		3467
3432	if (changed)	3468	if (changed)
3433	update_background ();	3469	update_background ();
3434	}	3470	}
…		…
3508	break;	3544	break;
3509	#endif	3545	#endif
3510		3546
3511	#if ENABLE_PERL	3547	#if ENABLE_PERL
3512	case URxvt_perl:	3548	case URxvt_perl:
3513	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));
3514	; // no responses yet
3515	break;	3550	break;
3516	#endif	3551	#endif
3517	}	3552	}
3518	}	3553	}
3519	/----------------------------------------------------------------------/	3554	/----------------------------------------------------------------------/
…		…
3542	{	3577	{
3543	if (mode == 'r')	3578	if (mode == 'r')
3544	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3579	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545	else	3580	else
3546	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3581	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547	PrivMode (state, bit);	3582
		3583	set_privmode (bit, state);
3548	}	3584	}
3549		3585
3550	return state;	3586	return state;
3551	}	3587	}
3552		3588
…		…
3560	static const struct	3596	static const struct
3561	{	3597	{
3562	const int argval;	3598	const int argval;
3563	const unsigned long bit;	3599	const unsigned long bit;
3564	} argtopriv[] = {	3600	} argtopriv[] = {
3565	{ 1, PrivMode_aplCUR },	3601	{ 1, PrivMode_aplCUR }, // DECCKM
3566	{ 2, PrivMode_vt52 },	3602	{ 2, PrivMode_vt52 },
3567	{ 3, PrivMode_132 },	3603	{ 3, PrivMode_132 }, // DECCOLM
3568	{ 4, PrivMode_smoothScroll },	3604	{ 4, PrivMode_smoothScroll }, // DECSCLM
3569	{ 5, PrivMode_rVideo },	3605	{ 5, PrivMode_rVideo }, // DECSCNM
3570	{ 6, PrivMode_relOrigin },	3606	{ 6, PrivMode_relOrigin }, // DECOM
3571	{ 7, PrivMode_Autowrap },	3607	{ 7, PrivMode_Autowrap }, // DECAWM
3572	// 8, bi-directional support mode	3608	// 8, auto-repeat keys // DECARM
3573	{ 9, PrivMode_MouseX10 },	3609	{ 9, PrivMode_MouseX10 },
3574	// 18, 19 printing-related	3610	// 18 end FF to printer after print screen
		3611	// 19 Print screen prints full screen/scroll region
3575	{ 25, PrivMode_VisibleCursor },	3612	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3576	#ifdef scrollBar_esc	3613	#ifdef scrollBar_esc
3577	{ scrollBar_esc, PrivMode_scrollBar },	3614	{ scrollBar_esc, PrivMode_scrollBar },
3578	#endif	3615	#endif
3579	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3616	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3617	// 38, tektronix mode // DECTEK
3580	{ 40, PrivMode_132OK },	3618	{ 40, PrivMode_132OK },
3581	// 41 xterm more fixes NYI	3619	// 41 xterm more fixes NYI
3582	// 45 margin bell NYI	3620	// 45 margin bell NYI
3583	// 46 start logging	3621	// 46 start logging
3584	{ 47, PrivMode_Screen },	3622	{ 47, PrivMode_Screen },
3585	{ 66, PrivMode_aplKP },	3623	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM
3586	#ifndef NO_BACKSPACE_KEY	3624	#ifndef NO_BACKSPACE_KEY
3587	{ 67, PrivMode_BackSpace },	3625	{ 67, PrivMode_BackSpace }, // DECBKM
3588	#endif	3626	#endif
3589	{ 1000, PrivMode_MouseX11 },	3627	{ 1000, PrivMode_MouseX11 },
3590	{ 1002, PrivMode_MouseBtnEvent },	3628	{ 1002, PrivMode_MouseBtnEvent },
3591	{ 1003, PrivMode_MouseAnyEvent },	3629	{ 1003, PrivMode_MouseAnyEvent },
3592	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3630	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
…		…
3631		3669
3632	scr_touch (true);	3670	scr_touch (true);
3633	break;	3671	break;
3634	#endif	3672	#endif
3635	case 1048: /* alternative cursor save */	3673	case 1048: /* alternative cursor save */
3636	case 1049:
3637	if (option (Opt_secondaryScreen))	3674	if (option (Opt_secondaryScreen))
3638	if (mode == 0)	3675	if (mode == 0)
3639	scr_cursor (RESTORE);	3676	scr_cursor (RESTORE);
3640	else if (mode == 1)	3677	else if (mode == 1)
3641	scr_cursor (SAVE);	3678	scr_cursor (SAVE);
…		…
3650	case 2: /* VT52 mode */	3687	case 2: /* VT52 mode */
3651	/* oddball mode. should be set regardless of set/reset	3688	/* oddball mode. should be set regardless of set/reset
3652	* parameter. Return from VT52 mode with an ESC < from	3689	* parameter. Return from VT52 mode with an ESC < from
3653	* within VT52 mode	3690	* within VT52 mode
3654	*/	3691	*/
3655	PrivMode (1, PrivMode_vt52);	3692	set_privmode (PrivMode_vt52, 1);
3656	break;	3693	break;
3657	case 3: /* 80/132 */	3694	case 3: /* 80/132 */
3658	if (priv_modes & PrivMode_132OK)	3695	if (priv_modes & PrivMode_132OK)
3659	{
3660	scr_poweron ();
3661	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3696	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662	}
3663	break;	3697	break;
3664	case 4: /* smooth scrolling */	3698	case 4: /* smooth scrolling */
3665	set_option (Opt_jumpScroll, !state);	3699	set_option (Opt_jumpScroll, !state);
3666	break;	3700	break;
3667	case 5: /* reverse video */	3701	case 5: /* reverse video */
…		…
3678	if (state) /* orthogonal */	3712	if (state) /* orthogonal */
3679	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3713	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3680	break;	3714	break;
3681	#ifdef scrollBar_esc	3715	#ifdef scrollBar_esc
3682	case scrollBar_esc:	3716	case scrollBar_esc:
3683	if (scrollbar_mapping (state))	3717	if (scrollBar.map (state))
3684	{	3718	{
3685	resize_all_windows (0, 0, 0);	3719	resize_all_windows (0, 0, 0);
3686	scr_touch (true);	3720	scr_touch (true);
3687	}	3721	}
3688	break;	3722	break;
…		…
3709	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3743	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710	vt_emask_mouse = PointerMotionMask;	3744	vt_emask_mouse = PointerMotionMask;
3711	}	3745	}
3712	else	3746	else
3713	vt_emask_mouse = NoEventMask;	3747	vt_emask_mouse = NoEventMask;
		3748
3714	vt_select_input ();	3749	vt_select_input ();
3715	break;	3750	break;
3716	case 1010: /* scroll to bottom on TTY output inhibit */	3751	case 1010: /* scroll to bottom on TTY output inhibit */
3717	set_option (Opt_scrollTtyOutput, !state);	3752	set_option (Opt_scrollTtyOutput, !state);
3718	break;	3753	break;
3719	case 1011: /* scroll to bottom on key press */	3754	case 1011: /* scroll to bottom on key press */
3720	set_option (Opt_scrollTtyKeypress, state);	3755	set_option (Opt_scrollTtyKeypress, state);
3721	break;	3756	break;
3722	case 1047: /* secondary screen w/ clearing last */	3757	case 1047: /* secondary screen w/ clearing last */
3723	if (option (Opt_secondaryScreen))	3758	if (option (Opt_secondaryScreen))
3724	if (current_screen != PRIMARY)	3759	if (!state)
3725	scr_erase_screen (2);	3760	scr_erase_screen (2);
		3761
3726	scr_change_screen (state);	3762	scr_change_screen (state);
3727	break;	3763	break;
3728	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
3729	scr_change_screen (state);	3769	scr_change_screen (state);
		3770
3730	if (option (Opt_secondaryScreen))	3771	if (option (Opt_secondaryScreen))
3731	if (current_screen != PRIMARY)	3772	if (state)
3732	scr_erase_screen (2);	3773	scr_erase_screen (2);
		3774	else
		3775	scr_cursor (RESTORE);
3733	break;	3776	break;
3734	default:	3777	default:
3735	break;	3778	break;
3736	}	3779	}
3737	}	3780	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.409 by ayin, Sat Feb 16 15:39:20 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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC