ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.488 by sf-exg, Mon May 30 18:39:03 2011 UTC vs.
Revision 1.551 by sf-exg, Wed Jul 16 14:29:23 2014 UTC

…		…
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>	10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11	* - vt100 printing	11	* - vt100 printing
12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>	12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13	* - X11 mouse report mode and support for	13	* - X11 mouse report mode and support for
14	* DEC "private mode" save/restore functions.	14	* DEC "private mode" save/restore functions.
…		…
20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>	20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21	* - modification and cleanups for Solaris 2.x	21	* - modification and cleanups for Solaris 2.x
22	* and Linux 1.2.x	22	* and Linux 1.2.x
23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>	30	* Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 3 of the License, or
36	* (at your option) any later version.	36	* (at your option) any later version.
37	*	37	*
38	* This program is distributed in the hope that it will be useful,	38	* This program is distributed in the hope that it will be useful,
39	* but WITHOUT ANY WARRANTY; without even the implied warranty of	39	* but WITHOUT ANY WARRANTY; without even the implied warranty of
40	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	40	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/*----------------------------------------------------------------------*/	65	/*----------------------------------------------------------------------*/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
131	XK_KP_Space, 0x2422,	131	XK_KP_Space, 0x2422,
132	#endif	132	#endif
133	0,	133	0,
134	};	134	};
135		135
136	void	136	void ecb_cold
137	rxvt_term::iso14755_54 (int x, int y)	137	rxvt_term::iso14755_54 (int x, int y)
138	{	138	{
139	x = Pixel2Col (x);	139	x = Pixel2Col (x);
140	y = Pixel2Row (y);	140	y = Pixel2Row (y);
141		141
…		…
149		149
150	text_t t = l.t[x];	150	text_t t = l.t[x];
151		151
152	if (t != NOCHAR || !x)	152	if (t != NOCHAR || !x)
153	{	153	{
154	iso14755_51 (l.t[x], l.r[x], x, y);	154	iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155	iso14755buf = ISO_14755_54;	155	iso14755buf = ISO_14755_54;
156	break;	156	break;
157	}	157	}
158		158
159	x--;	159	x--;
160	}	160	}
161	}	161	}
162		162
163	void	163	void ecb_cold
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, int y2)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	wchar_t *chr, *alloc, ch2, **fname;	167	wchar_t *chr, *alloc, ch2, **fname;
168	int len;	168	int len;
169		169
…		…
181		181
182	alloc = 0;	182	alloc = 0;
183	chr = &ch2;	183	chr = &ch2;
184	len = 1;	184	len = 1;
185	}	185	}
		186
		187	char rowcol[40];
		188	snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186		189
187	char attr[80]; // plenty	190	char attr[80]; // plenty
188		191
189	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190	(int)r,	193	(int)r,
…		…
203	rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];	206	rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204	fname[i] = rxvt_utf8towcs (f->name);	207	fname[i] = rxvt_utf8towcs (f->name);
205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));	208	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206	}	209	}
207		210
208	max_it (width, 8+5); // for char + hex
209	max_it (width, strlen (attr));	211	max_it (width, strlen (attr));
210		212
211	if (y >= 0)	213	if (y >= 0)
212	{	214	{
213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	215	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214	x = 0;	216	x = 0;
215	}	217	}
216		218
217	scr_overlay_new (x, y, width, len * 2 + 1);	219	scr_overlay_new (x, y, width, len * 2 + 2);
		220
		221	scr_overlay_set (0, 0, rowcol);
218		222
219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	223	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220		224
221	for (int y = 0; y < len; y++)	225	for (int y = 0; y < len; y++)
222	{	226	{
223	char buf[9];	227	char buf[9];
224		228
225	ch = *chr++;	229	ch = *chr++;
226		230
227	sprintf (buf, "%8x", ch);	231	sprintf (buf, "%8x", ch);
228	scr_overlay_set (0, y, buf);	232	scr_overlay_set (0, y + 1, buf);
229	scr_overlay_set (9, y, '=');	233	scr_overlay_set (9, y + 1, '=');
230	# if !UNICODE_3	234	# if !UNICODE_3
231	if (ch >= 0x10000)	235	if (ch >= 0x10000)
232	ch = 0xfffd;	236	ch = 0xfffd;
233	# endif	237	# endif
234	scr_overlay_set (11, y, ch, r);	238	scr_overlay_set (11, y + 1, ch, r);
235		239
236	if (WCWIDTH (ch) >= 2)	240	if (WCWIDTH (ch) >= 2)
237	scr_overlay_set (12, y, NOCHAR, r);	241	scr_overlay_set (12, y + 1, NOCHAR, r);
238	}	242	}
239		243
240	// {	244	// {
241	// char buf[4+4+3+1];	245	// char buf[4+4+3+1];
242	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);	246	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243	// scr_overlay_set (0, 0, buf);	247	// scr_overlay_set (0, 0, buf);
244	// }	248	// }
245	scr_overlay_set (0, len , attr);	249	scr_overlay_set (0, len + 1, attr);
246	for (int i = 0; i < len; i++)	250	for (int i = 0; i < len; i++)
247	{	251	{
248	scr_overlay_set (0, len + 1 + i, fname[i]);	252	scr_overlay_set (0, len + 2 + i, fname[i]);
249	free (fname[i]);	253	free (fname[i]);
250	}	254	}
251		255
252	# if ENABLE_COMBINING	256	# if ENABLE_COMBINING
253	if (alloc)	257	if (alloc)
254	delete [] alloc;	258	delete [] alloc;
255	# endif	259	# endif
256	}	260	}
257	#endif	261	#endif
258		262
259	void	263	void ecb_cold
260	rxvt_term::commit_iso14755 ()	264	rxvt_term::commit_iso14755 ()
261	{	265	{
262	wchar_t ch = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
263		267
264	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
…		…
282	}	286	}
283		287
284	iso14755buf = 0;	288	iso14755buf = 0;
285	}	289	}
286		290
287	static int	291	static int ecb_cold
288	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
289	{	293	{
290	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
291	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
292	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
301		305
302	return -1;	306	return -1;
303	}	307	}
304	#endif	308	#endif
305		309
306	static inline KeySym	310	static inline KeySym ecb_cold
307	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
308	{	312	{
309	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
310	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
311	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
337	# endif	341	# endif
338	#endif	342	#endif
339	return keysym;	343	return keysym;
340	}	344	}
341		345
342	static inline int	346	static inline int ecb_cold
343	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
344	{	348	{
345	int param = 0;	349	int param = 0;
346		350
347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
396	break;	400	break;
397	}	401	}
398	return param;	402	return param;
399	}	403	}
400		404
401	void	405	static inline wchar_t *
		406	rxvt_wcsdup (const wchar_t *str, int len)
		407	{
		408	wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
		409	memcpy (r, str, len * sizeof (wchar_t));
		410	r[len] = 0;
		411	return r;
		412	}
		413
		414	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	415	rxvt_term::key_press (XKeyEvent &ev)
403	{	416	{
404	int ctrl, meta, shft, len;	417	int ctrl, meta, shft, len;
405	KeySym keysym;	418	KeySym keysym;
406	int valid_keysym;	419	int valid_keysym;
407	char kbuf[KBUFSZ];	420	char rkbuf[KBUFSZ + 1];
		421	char *kbuf = rkbuf + 1;
408		422
409	#if ISO_14755	423	#if ISO_14755
410	if (iso14755buf & ISO_14755_52)	424	if (iso14755buf & ISO_14755_52)
411	return;	425	return;
412	#endif	426	#endif
…		…
421	ctrl = ev.state & ControlMask;	435	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	436	meta = ev.state & ModMetaMask;
423		437
424	kbuf[0] = 0;	438	kbuf[0] = 0;
425		439
426	#ifdef USE_XIM	440	#if USE_XIM
427	if (Input_Context)	441	if (Input_Context)
428	{	442	{
429	Status status_return;	443	Status status_return;
430		444
431	#if 0	445	#if 0
…		…
482	valid_keysym = keysym != NoSymbol;	496	valid_keysym = keysym != NoSymbol;
483	}	497	}
484		498
485	if (valid_keysym)	499	if (valid_keysym)
486	{	500	{
		501	KeySym orig_keysym = keysym;
		502
		503	/* Shift + F1 - F10 generates F11 - F20 */
		504	if (shft && keysym >= XK_F1 && keysym <= XK_F10)
		505	{
		506	keysym += (XK_F11 - XK_F1);
		507	shft = 0; /* turn off Shift */
		508	}
		509
		510	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
		511	{
		512	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		513	unsigned int newlen = 1;
		514
		515	if (ev.state & ModNumLockMask)
		516	kp = false;
		517
		518	keysym = translate_keypad (keysym, kp);
		519
		520	switch (keysym)
		521	{
		522	#ifndef NO_BACKSPACE_KEY
		523	case XK_BackSpace:
		524	if (priv_modes & PrivMode_HaveBackSpace)
		525	{
		526	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		527	^ !!ctrl) ? '\b' : '\177';
		528	kbuf[1] = '\0';
		529	}
		530	else
		531	strcpy (kbuf, rs[Rs_backspace_key]);
		532	break;
		533	#endif
		534	#ifndef NO_DELETE_KEY
		535	case XK_Delete:
		536	strcpy (kbuf, rs[Rs_delete_key]);
		537	break;
		538	#endif
		539	case XK_Tab:
		540	if (shft)
		541	strcpy (kbuf, "\033[Z");
		542	else
		543	{
		544	#ifdef CTRL_TAB_MAKES_META
		545	if (ctrl)
		546	meta = 1;
		547	#endif
		548	#ifdef MOD4_TAB_MAKES_META
		549	if (ev.state & Mod4Mask)
		550	meta = 1;
		551	#endif
		552	newlen = 0;
		553	}
		554	break;
		555
		556	case XK_Up: /* "\033[A" */
		557	case XK_Down: /* "\033[B" */
		558	case XK_Right: /* "\033[C" */
		559	case XK_Left: /* "\033[D" */
		560	strcpy (kbuf, "\033[Z");
		561	kbuf[2] = "DACB"[keysym - XK_Left];
		562	/* do Shift first */
		563	if (shft)
		564	kbuf[2] = "dacb"[keysym - XK_Left];
		565	else if (ctrl)
		566	{
		567	kbuf[1] = 'O';
		568	kbuf[2] = "dacb"[keysym - XK_Left];
		569	}
		570	else if (priv_modes & PrivMode_aplCUR)
		571	kbuf[1] = 'O';
		572	break;
		573
		574	case XK_KP_Enter:
		575	/* allow shift to override */
		576	if (kp)
		577	{
		578	strcpy (kbuf, "\033OM");
		579	break;
		580	}
		581
		582	/* FALLTHROUGH */
		583
		584	case XK_Return:
		585	if (priv_modes & PrivMode_LFNL)
		586	{
		587	kbuf[0] = '\015';
		588	kbuf[1] = '\012';
		589	kbuf[2] = '\0';
		590	}
		591	else
		592	{
		593	kbuf[0] = '\015';
		594	kbuf[1] = '\0';
		595	}
		596	break;
		597
		598	case XK_KP_F1: /* "\033OP" */
		599	case XK_KP_F2: /* "\033OQ" */
		600	case XK_KP_F3: /* "\033OR" */
		601	case XK_KP_F4: /* "\033OS" */
		602	strcpy (kbuf, "\033OP");
		603	kbuf[2] += (keysym - XK_KP_F1);
		604	break;
		605
		606	case XK_KP_Multiply: /* "\033Oj" : "*" */
		607	case XK_KP_Add: /* "\033Ok" : "+" */
		608	case XK_KP_Separator: /* "\033Ol" : "," */
		609	case XK_KP_Subtract: /* "\033Om" : "-" */
		610	case XK_KP_Decimal: /* "\033On" : "." */
		611	case XK_KP_Divide: /* "\033Oo" : "/" */
		612	case XK_KP_0: /* "\033Op" : "0" */
		613	case XK_KP_1: /* "\033Oq" : "1" */
		614	case XK_KP_2: /* "\033Or" : "2" */
		615	case XK_KP_3: /* "\033Os" : "3" */
		616	case XK_KP_4: /* "\033Ot" : "4" */
		617	case XK_KP_5: /* "\033Ou" : "5" */
		618	case XK_KP_6: /* "\033Ov" : "6" */
		619	case XK_KP_7: /* "\033Ow" : "7" */
		620	case XK_KP_8: /* "\033Ox" : "8" */
		621	case XK_KP_9: /* "\033Oy" : "9" */
		622	/* allow shift to override */
		623	if (kp)
		624	{
		625	strcpy (kbuf, "\033Oj");
		626	kbuf[2] += (keysym - XK_KP_Multiply);
		627	}
		628	else
		629	{
		630	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		631	kbuf[1] = '\0';
		632	}
		633	break;
		634
		635	default:
		636	{
		637	int param = map_function_key (keysym);
		638	if (param > 0)
		639	sprintf (kbuf,"\033[%d~", param);
		640	else
		641	newlen = 0;
		642	}
		643	break;
		644	}
		645
		646	if (newlen)
		647	len = strlen (kbuf);
		648
		649	if (len > 0)
		650	{
		651	/*
		652	* pass Shift/Control indicators for function keys ending with `~'
		653	*
		654	* eg,
		655	* Prior = "ESC[5~"
		656	* Shift+Prior = "ESC[5$"
		657	* Ctrl+Prior = "ESC[5^"
		658	* Ctrl+Shift+Prior = "ESC[5@"
		659	*/
		660	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		661	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		662
		663	/*
		664	* Pass meta for all function keys, if 'meta' option set
		665	*/
		666	#ifdef META8_OPTION
		667	if (meta && (meta_char == 0x80))
		668	kbuf[len - 1] |= 0x80;
		669	#endif
		670	}
		671
		672	}
		673	else if (ctrl && keysym == XK_minus)
		674	{
		675	len = 1;
		676	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		677	}
		678	else if (keysym == XK_ISO_Left_Tab)
		679	{
		680	strcpy (kbuf, "\033[Z");
		681	len = 3;
		682	}
		683	else
		684	{
		685	#ifdef META8_OPTION
		686	/* set 8-bit on */
		687	if (meta && (meta_char == 0x80))
		688	{
		689	char *ch;
		690
		691	for (ch = kbuf; ch < kbuf + len; ch++)
		692	*ch |= 0x80;
		693
		694	meta = 0;
		695	}
		696	#endif
		697	/* nil */ ;
		698	}
		699
		700	keysym = orig_keysym;
		701	}
		702
		703	/* escape prefix */
		704	if (len && meta
		705	#ifdef META8_OPTION
		706	&& meta_char == C0_ESC
		707	#endif
		708	)
		709	{
		710	*--kbuf = C0_ESC;
		711	len++;
		712	}
		713
		714	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		715	return;
		716
		717	if (valid_keysym)
		718	{
487	#ifdef KEYSYM_RESOURCE	719	#ifdef KEYSYM_RESOURCE
488	if (keyboard->dispatch (this, keysym, ev.state))	720	if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489	return;	721	return;
490	#endif	722	#endif
491		723
492	if (saveLines)	724	if (saveLines)
493	{	725	{
…		…
506	#endif	738	#endif
507	max_it (lnsppg, 1);	739	max_it (lnsppg, 1);
508		740
509	if (keysym == XK_Prior)	741	if (keysym == XK_Prior)
510	{	742	{
511	scr_page (UP, lnsppg);	743	scr_page (lnsppg);
512	return;	744	return;
513	}	745	}
514	else if (keysym == XK_Next)	746	else if (keysym == XK_Next)
515	{	747	{
516	scr_page (DN, lnsppg);	748	scr_page (-lnsppg);
517	return;	749	return;
518	}	750	}
519	}	751	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	752	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	753	if (IS_SCROLL_MOD)
522	{	754	{
523	if (keysym == XK_Up)	755	if (keysym == XK_Up)
524	{	756	{
525	scr_page (UP, 1);	757	scr_page (1);
526	return;	758	return;
527	}	759	}
528	else if (keysym == XK_Down)	760	else if (keysym == XK_Down)
529	{	761	{
530	scr_page (DN, 1);	762	scr_page (-1);
531	return;	763	return;
532	}	764	}
533	}	765	}
534	#endif	766	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	767	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	768	if (IS_SCROLL_MOD)
537	{	769	{
538	if (keysym == XK_Home)	770	if (keysym == XK_Home)
539	{	771	{
540	scr_move_to (0, 1);	772	scr_changeview (top_row);
541	return;	773	return;
542	}	774	}
543	else if (keysym == XK_End)	775	else if (keysym == XK_End)
544	{	776	{
545	scr_move_to (1, 1);	777	scr_changeview (0);
546	return;	778	return;
547	}	779	}
548	}	780	}
549	#endif	781	#endif
550	}	782	}
551		783
552	if (shft)	784	if (shft)
553	{	785	{
554	/* Shift + F1 - F10 generates F11 - F20 */
555	if (keysym >= XK_F1 && keysym <= XK_F10)
556	{
557	keysym += (XK_F11 - XK_F1);
558	shft = 0; /* turn off Shift */
559	}
560	else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))	786	if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561	{	787	{
562	switch (keysym)	788	switch (keysym)
563	{	789	{
564	/* normal XTerm key bindings */	790	/* normal XTerm key bindings */
565	case XK_Insert: /* Shift+Insert = paste mouse selection */	791	case XK_Insert: /* Shift+Insert = paste mouse selection */
…		…
572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	798	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573	return;	799	return;
574	#endif	800	#endif
575	}	801	}
576	}	802	}
		803	}
		804
		805	if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
		806	{
		807	if (keysym == XK_v)
		808	selection_request (ev.time, Sel_Clipboard);
		809	else if (selection.len > 0)
		810	{
		811	free (selection.clip_text);
		812	selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
		813	selection.clip_len = selection.len;
		814	selection_grab (CurrentTime, true);
		815	}
		816
		817	return;
577	}	818	}
578		819
579	#if ENABLE_FRILLS || ISO_14755	820	#if ENABLE_FRILLS || ISO_14755
580	// ISO 14755 support	821	// ISO 14755 support
581	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))	822	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
…		…
636	{	877	{
637	scr_printscreen (ctrl | shft);	878	scr_printscreen (ctrl | shft);
638	return;	879	return;
639	}	880	}
640	#endif	881	#endif
641
642	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643	{
644	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645	unsigned int newlen = 1;
646
647	if (ev.state & ModNumLockMask)
648	kp = false;
649
650	keysym = translate_keypad (keysym, kp);
651
652	switch (keysym)
653	{
654	#ifndef NO_BACKSPACE_KEY
655	case XK_BackSpace:
656	if (priv_modes & PrivMode_HaveBackSpace)
657	{
658	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659	^ !!ctrl) ? '\b' : '\177';
660	kbuf[1] = '\0';
661	}
662	else
663	strcpy (kbuf, rs[Rs_backspace_key]);
664	break;
665	#endif
666	#ifndef NO_DELETE_KEY
667	case XK_Delete:
668	strcpy (kbuf, rs[Rs_delete_key]);
669	break;
670	#endif
671	case XK_Tab:
672	if (shft)
673	strcpy (kbuf, "\033[Z");
674	else
675	{
676	#ifdef CTRL_TAB_MAKES_META
677	if (ctrl)
678	meta = 1;
679	#endif
680	#ifdef MOD4_TAB_MAKES_META
681	if (ev.state & Mod4Mask)
682	meta = 1;
683	#endif
684	newlen = 0;
685	}
686	break;
687
688	case XK_Up: /* "\033[A" */
689	case XK_Down: /* "\033[B" */
690	case XK_Right: /* "\033[C" */
691	case XK_Left: /* "\033[D" */
692	strcpy (kbuf, "\033[Z");
693	kbuf[2] = "DACB"[keysym - XK_Left];
694	/* do Shift first */
695	if (shft)
696	kbuf[2] = "dacb"[keysym - XK_Left];
697	else if (ctrl)
698	{
699	kbuf[1] = 'O';
700	kbuf[2] = "dacb"[keysym - XK_Left];
701	}
702	else if (priv_modes & PrivMode_aplCUR)
703	kbuf[1] = 'O';
704	break;
705
706	case XK_KP_Enter:
707	/* allow shift to override */
708	if (kp)
709	{
710	strcpy (kbuf, "\033OM");
711	break;
712	}
713
714	/* FALLTHROUGH */
715
716	case XK_Return:
717	if (priv_modes & PrivMode_LFNL)
718	{
719	kbuf[0] = '\015';
720	kbuf[1] = '\012';
721	kbuf[2] = '\0';
722	}
723	else
724	{
725	kbuf[0] = '\015';
726	kbuf[1] = '\0';
727	}
728	break;
729
730	case XK_KP_F1: /* "\033OP" */
731	case XK_KP_F2: /* "\033OQ" */
732	case XK_KP_F3: /* "\033OR" */
733	case XK_KP_F4: /* "\033OS" */
734	strcpy (kbuf, "\033OP");
735	kbuf[2] += (keysym - XK_KP_F1);
736	break;
737
738	case XK_KP_Multiply: /* "\033Oj" : "*" */
739	case XK_KP_Add: /* "\033Ok" : "+" */
740	case XK_KP_Separator: /* "\033Ol" : "," */
741	case XK_KP_Subtract: /* "\033Om" : "-" */
742	case XK_KP_Decimal: /* "\033On" : "." */
743	case XK_KP_Divide: /* "\033Oo" : "/" */
744	case XK_KP_0: /* "\033Op" : "0" */
745	case XK_KP_1: /* "\033Oq" : "1" */
746	case XK_KP_2: /* "\033Or" : "2" */
747	case XK_KP_3: /* "\033Os" : "3" */
748	case XK_KP_4: /* "\033Ot" : "4" */
749	case XK_KP_5: /* "\033Ou" : "5" */
750	case XK_KP_6: /* "\033Ov" : "6" */
751	case XK_KP_7: /* "\033Ow" : "7" */
752	case XK_KP_8: /* "\033Ox" : "8" */
753	case XK_KP_9: /* "\033Oy" : "9" */
754	/* allow shift to override */
755	if (kp)
756	{
757	strcpy (kbuf, "\033Oj");
758	kbuf[2] += (keysym - XK_KP_Multiply);
759	}
760	else
761	{
762	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763	kbuf[1] = '\0';
764	}
765	break;
766
767	default:
768	{
769	int param = map_function_key (keysym);
770	if (param > 0)
771	sprintf (kbuf,"\033[%d~", param);
772	else
773	newlen = 0;
774	}
775	break;
776	}
777
778	if (newlen)
779	len = strlen (kbuf);
780
781	/*
782	* Pass meta for all function keys, if 'meta' option set
783	*/
784	#ifdef META8_OPTION
785	if (meta && (meta_char == 0x80) && len > 0)
786	kbuf[len - 1] |= 0x80;
787	#endif
788
789	}
790	else if (ctrl && keysym == XK_minus)
791	{
792	len = 1;
793	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
794	}
795	else if (keysym == XK_ISO_Left_Tab)
796	{
797	strcpy (kbuf, "\033[Z");
798	len = 3;
799	}
800	else
801	{
802	#ifdef META8_OPTION
803	/* set 8-bit on */
804	if (meta && (meta_char == 0x80))
805	{
806	char *ch;
807
808	for (ch = kbuf; ch < kbuf + len; ch++)
809	*ch |= 0x80;
810
811	meta = 0;
812	}
813	#endif
814	/* nil */ ;
815	}
816	}	882	}
817
818	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
819	return;
820		883
821	if (len <= 0)	884	if (len <= 0)
822	return; /* not mapped */	885	return; /* not mapped */
823		886
824	if (option (Opt_scrollTtyKeypress))
825	if (view_start)
826	{
827	view_start = 0;
828	want_refresh = 1;
829	}
830
831	/*
832	* these modifications only affect the static keybuffer
833	* pass Shift/Control indicators for function keys ending with `~'
834	*
835	* eg,
836	* Prior = "ESC[5~"
837	* Shift+Prior = "ESC[5$"
838	* Ctrl+Prior = "ESC[5^"
839	* Ctrl+Shift+Prior = "ESC[5@"
840	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841	*/
842	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845	/* escape prefix */
846	if (meta
847	#ifdef META8_OPTION
848	&& meta_char == C0_ESC
849	#endif
850	)
851	{
852	const char ch = C0_ESC;
853	tt_write (&ch, 1);
854	}
855
856	tt_write (kbuf, (unsigned int)len);	887	tt_write_user_input (kbuf, (unsigned int)len);
857	}	888	}
858		889
859	void	890	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	891	rxvt_term::key_release (XKeyEvent &ev)
861	{	892	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL	893	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863	KeySym keysym;	894	KeySym keysym;
864		895
…		…
936	void	967	void
937	rxvt_term::flush ()	968	rxvt_term::flush ()
938	{	969	{
939	flush_ev.stop ();	970	flush_ev.stop ();
940		971
941	#ifdef HAVE_BG_PIXMAP	972	#ifdef HAVE_IMG
942	if (bg_flags & BG_NEEDS_REFRESH)	973	if (bg_flags & BG_NEEDS_REFRESH)
943	{	974	{
944	bg_flags &= ~BG_NEEDS_REFRESH;	975	bg_flags &= ~BG_NEEDS_REFRESH;
945	scr_touch (false);	976	scr_touch (false);
946	}	977	}
…		…
986	while (row < end_row);	1017	while (row < end_row);
987	}	1018	}
988		1019
989	scr_refresh ();	1020	scr_refresh ();
990	scrollBar.show (1);	1021	scrollBar.show (1);
991	#ifdef USE_XIM	1022	#if USE_XIM
992	IMSendSpot ();	1023	im_send_spot ();
993	#endif	1024	#endif
994	}	1025	}
995		1026
996	display->flush ();	1027	display->flush ();
997	}	1028	}
…		…
1015	flush ();	1046	flush ();
1016	}	1047	}
1017		1048
1018	#ifdef CURSOR_BLINK	1049	#ifdef CURSOR_BLINK
1019	void	1050	void
		1051	rxvt_term::cursor_blink_reset ()
		1052	{
		1053	if (hidden_cursor)
		1054	{
		1055	hidden_cursor = 0;
		1056	want_refresh = 1;
		1057	}
		1058
		1059	if (option (Opt_cursorBlink))
		1060	cursor_blink_ev.again ();
		1061	else
		1062	cursor_blink_ev.stop ();
		1063	}
		1064
		1065	void
1020	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1066	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021	{	1067	{
1022	hidden_cursor = !hidden_cursor;	1068	hidden_cursor = !hidden_cursor;
1023	want_refresh = 1;	1069	want_refresh = 1;
1024	refresh_check ();	1070	refresh_check ();
…		…
1042		1088
1043	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1089	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044	void	1090	void
1045	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1091	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046	{	1092	{
1047	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	1093	if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1094	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049	{	1095	{
1050	want_refresh = 1;	1096	want_refresh = 1;
1051	refresh_check ();	1097	refresh_check ();
1052	}	1098	}
1053	else	1099	else
…		…
1057		1103
1058	#ifdef SELECTION_SCROLLING	1104	#ifdef SELECTION_SCROLLING
1059	void	1105	void
1060	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1106	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061	{	1107	{
1062	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1108	if (scr_page (scroll_selection_lines))
1063	{	1109	{
1064	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1110	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065	want_refresh = 1;	1111	want_refresh = 1;
1066	refresh_check ();	1112	refresh_check ();
1067	}	1113	}
…		…
1072		1118
1073	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1119	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074	void	1120	void
1075	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1121	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076	{	1122	{
1077	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1123	if (scr_page (mouse_slip_wheel_speed))
1078	{	1124	{
1079	want_refresh = 1;	1125	want_refresh = 1;
1080	refresh_check ();	1126	refresh_check ();
1081	}	1127	}
1082		1128
…		…
1203	pty_write ();	1249	pty_write ();
1204		1250
1205	refresh_check ();	1251	refresh_check ();
1206	}	1252	}
1207		1253
1208	void	1254	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1255	rxvt_term::pointer_unblank ()
1210	{	1256	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1257	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1258	recolour_cursor ();
1213		1259
…		…
1218	pointer_ev.start (pointerBlankDelay);	1264	pointer_ev.start (pointerBlankDelay);
1219	#endif	1265	#endif
1220	}	1266	}
1221		1267
1222	#ifdef POINTER_BLANK	1268	#ifdef POINTER_BLANK
1223	void	1269	void ecb_cold
1224	rxvt_term::pointer_blank ()	1270	rxvt_term::pointer_blank ()
1225	{	1271	{
1226	if (!option (Opt_pointerBlank))	1272	if (!option (Opt_pointerBlank))
1227	return;	1273	return;
1228		1274
…		…
1230	XFlush (dpy);	1276	XFlush (dpy);
1231		1277
1232	hidden_pointer = 1;	1278	hidden_pointer = 1;
1233	}	1279	}
1234		1280
1235	void	1281	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1282	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1283	{
1238	make_current ();	1284	make_current ();
1239		1285
1240	pointer_blank ();	1286	pointer_blank ();
…		…
1332	32 + x,	1378	32 + x,
1333	32 + y);	1379	32 + y);
1334	}	1380	}
1335		1381
1336	/*{{{ process an X event */	1382	/*{{{ process an X event */
1337	void	1383	void ecb_hot
1338	rxvt_term::x_cb (XEvent &ev)	1384	rxvt_term::x_cb (XEvent &ev)
1339	{	1385	{
1340	make_current ();	1386	make_current ();
1341		1387
1342	dLocal (Display *, dpy);	1388	dLocal (Display *, dpy);
…		…
1445	if (ev.xconfigure.window == parent)	1491	if (ev.xconfigure.window == parent)
1446	{	1492	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1493	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1494	;
1449		1495
		1496	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1497
		1498	bool moved = false;
1450	#ifdef HAVE_BG_PIXMAP	1499	#ifdef HAVE_BG_PIXMAP
1451	bool moved = false;
1452	if (bg_window_position_sensitive ())	1500	if (bg_window_position_sensitive ())
1453	{	1501	{
		1502	want_position_change = true;
		1503	if (bg_img == 0)
		1504	moved = true;
		1505	}
		1506	#endif
		1507
		1508	if (want_position_change)
		1509	{
1454	int x, y;	1510	int x, y;
		1511
1455	if (ev.xconfigure.send_event)	1512	if (ev.xconfigure.send_event)
1456	{	1513	{
1457	x = ev.xconfigure.x;	1514	x = ev.xconfigure.x;
1458	y = ev.xconfigure.y;	1515	y = ev.xconfigure.y;
1459	}	1516	}
1460	else	1517	else
1461	get_window_origin (x, y);	1518	get_window_origin (x, y);
1462		1519
1463	if (bg_set_position (x, y)	1520	if (x != parent_x || y != parent_y)
1464	|| !(bg_flags & BG_IS_VALID))	1521	{
		1522	parent_x = x;
		1523	parent_y = y;
		1524	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465	moved = true;	1525	moved = true;
		1526	}
1466	}	1527	}
1467	#endif
1468		1528
1469	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1529	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470	{	1530	{
1471	seen_resize = 1;	1531	seen_resize = 1;
1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1532	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1473	}	1533	}
1474	else	1534	else
1475	{	1535	{
1476	#ifdef HAVE_BG_PIXMAP	1536	#ifdef HAVE_BG_PIXMAP
1477	if (moved)	1537	if (moved)
1478	{
1479	if (mapped)
1480	update_background ();	1538	update_background ();
1481	else
1482	bg_invalidate ();
1483	}
1484	#endif	1539	#endif
1485	}	1540	}
1486		1541
1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1542	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488	}	1543	}
…		…
1500	selection_send (ev.xselectionrequest);	1555	selection_send (ev.xselectionrequest);
1501	break;	1556	break;
1502		1557
1503	case MapNotify:	1558	case MapNotify:
1504	#ifdef HAVE_BG_PIXMAP	1559	#ifdef HAVE_BG_PIXMAP
1505	/* This is needed specifically to fix the case of no window manager or a	1560	// This is needed at startup for the case of no window manager
1506	* non-reparenting window manager. In those cases we never get first	1561	// or a non-reparenting window manager and also because we
1507	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1562	// defer bg image updates if the window is not mapped. The
1508	* care of multiplicity of ConfigureNotify events arriving while WM does	1563	// short delay is to optimize for multiple ConfigureNotify
1509	* reparenting.	1564	// events at startup when the window manager reparents the
1510	* We should not render background immediately, as there could be several	1565	// window, so as to perform the computation after we have
1511	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1566	// received all of them.
1512	* by scheduling background redraw as soon as we can, but giving a short	1567	if (bg_img == 0)
1513	* bit of time for ConfigureNotifies to arrive.
1514	* We should render background PRIOR to drawing any text, but AFTER all
1515	* of ConfigureNotifys for the best results.
1516	*/
1517	if (!(bg_flags & BG_IS_VALID))
1518	update_background_ev.start (0.025);	1568	update_background_ev.start (0.025);
1519	#endif	1569	#endif
1520	mapped = 1;	1570	mapped = 1;
1521	#ifdef TEXT_BLINK	1571	#ifdef TEXT_BLINK
1522	text_blink_ev.start ();	1572	text_blink_ev.start ();
…		…
1562	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1612	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1613	;
1564		1614
1565	if (scrollBar.state && ev.xany.window == scrollBar.win)	1615	if (scrollBar.state && ev.xany.window == scrollBar.win)
1566	{	1616	{
1567	scrollBar.state = STATE_IDLE;	1617	scrollBar.state = SB_STATE_IDLE;
1568	scrollBar.show (0);	1618	scrollBar.show (0);
1569	}	1619	}
1570	}	1620	}
1571	break;	1621	break;
1572		1622
…		…
1614		1664
1615	#ifdef SELECTION_SCROLLING	1665	#ifdef SELECTION_SCROLLING
1616	if (ev.xbutton.y < int_bwidth	1666	if (ev.xbutton.y < int_bwidth
1617	|| Pixel2Row (ev.xbutton.y) > (nrow-1))	1667	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1618	{	1668	{
		1669	page_dirn scroll_selection_dir;
1619	int dist;	1670	int dist;
1620		1671
1621	/* don't clobber the current delay if we are	1672	/* don't clobber the current delay if we are
1622	* already in the middle of scrolling.	1673	* already in the middle of scrolling.
1623	*/	1674	*/
…		…
1638	dist = int_bwidth - ev.xbutton.y;	1689	dist = int_bwidth - ev.xbutton.y;
1639	}	1690	}
1640	else	1691	else
1641	{	1692	{
1642	scroll_selection_dir = DN;	1693	scroll_selection_dir = DN;
1643	dist = ev.xbutton.y - (int_bwidth + height);	1694	dist = ev.xbutton.y - (int_bwidth + vt_height);
1644	}	1695	}
1645		1696
1646	scroll_selection_lines = Pixel2Height (dist)	1697	scroll_selection_lines = Pixel2Height (dist)
1647	/ SELECTION_SCROLL_LINE_SPEEDUP	1698	/ SELECTION_SCROLL_LINE_SPEEDUP
1648	+ 1;	1699	+ 1;
1649	min_it (scroll_selection_lines,	1700	min_it (scroll_selection_lines,
1650	SELECTION_SCROLL_MAX_LINES);	1701	SELECTION_SCROLL_MAX_LINES);
		1702	scroll_selection_lines *= scroll_selection_dir;
1651	}	1703	}
1652	else	1704	else
1653	{	1705	{
1654	/* we are within the text window, so we	1706	/* we are within the text window, so we
1655	* shouldn't be scrolling	1707	* shouldn't be scrolling
…		…
1660	#ifdef MOUSE_THRESHOLD	1712	#ifdef MOUSE_THRESHOLD
1661	}	1713	}
1662	#endif	1714	#endif
1663	}	1715	}
1664	}	1716	}
1665	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1717	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666	{	1718	{
1667	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1719	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668	MotionNotify, &ev))	1720	MotionNotify, &ev))
1669	;	1721	;
1670		1722
1671	XQueryPointer (dpy, scrollBar.win,	1723	XQueryPointer (dpy, scrollBar.win,
1672	&unused_root, &unused_child,	1724	&unused_root, &unused_child,
1673	&unused_root_x, &unused_root_y,	1725	&unused_root_x, &unused_root_y,
1674	&ev.xbutton.x, &ev.xbutton.y,	1726	&ev.xbutton.x, &ev.xbutton.y,
1675	&unused_mask);	1727	&unused_mask);
1676	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1728	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677	scrollBar.size ());	1729	scrollBar.size ());
1678	want_refresh = 1;	1730	want_refresh = 1;
1679	scrollBar.show (1);	1731	scrollBar.show (1);
1680	}	1732	}
1681	break;	1733	break;
1682	}	1734	}
1683		1735
1684	#if defined(CURSOR_BLINK)	1736	#if defined(CURSOR_BLINK)
1685	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1737	if (ev.type == KeyPress)
1686	{
1687	if (hidden_cursor)
1688	{
1689	hidden_cursor = 0;
1690	want_refresh = 1;
1691	}
1692
1693	cursor_blink_ev.again ();	1738	cursor_blink_reset ();
1694	}
1695	#endif	1739	#endif
1696		1740
1697	#if defined(POINTER_BLANK)	1741	#if defined(POINTER_BLANK)
1698	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1742	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699	{	1743	{
…		…
1710		1754
1711	refresh_check ();	1755	refresh_check ();
1712	}	1756	}
1713		1757
1714	#if ENABLE_FRILLS	1758	#if ENABLE_FRILLS
1715	void	1759	void ecb_cold
1716	rxvt_term::set_urgency (bool enable)	1760	rxvt_term::set_urgency (bool enable)
1717	{	1761	{
1718	if (enable == urgency_hint)	1762	if (enable == urgency_hint)
1719	return;	1763	return;
1720		1764
1721	if (XWMHints *h = XGetWMHints (dpy, parent))	1765	if (XWMHints *h = XGetWMHints (dpy, parent))
1722	{	1766	{
1723	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);	1767	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724	XSetWMHints (dpy, parent, h);	1768	XSetWMHints (dpy, parent, h);
1725	urgency_hint = enable;	1769	urgency_hint = enable;
		1770	XFree (h);
1726	}	1771	}
1727	}	1772	}
1728	#endif	1773	#endif
1729		1774
1730	void	1775	void ecb_cold
1731	rxvt_term::focus_in ()	1776	rxvt_term::focus_in ()
1732	{	1777	{
1733	if (!focus)	1778	if (!focus)
1734	{	1779	{
1735	focus = 1;	1780	focus = 1;
1736	want_refresh = 1;	1781	want_refresh = 1;
1737		1782
1738	#if USE_XIM	1783	#if USE_XIM
1739	if (Input_Context != NULL)	1784	if (Input_Context != NULL)
1740	{	1785	{
1741	IMSetPosition ();	1786	im_set_position ();
1742	XSetICFocus (Input_Context);	1787	XSetICFocus (Input_Context);
1743	}	1788	}
1744	#endif	1789	#endif
1745	#if CURSOR_BLINK	1790	#if CURSOR_BLINK
1746	if (option (Opt_cursorBlink))	1791	if (option (Opt_cursorBlink))
…		…
1760		1805
1761	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1806	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762	}	1807	}
1763	}	1808	}
1764		1809
1765	void	1810	void ecb_cold
1766	rxvt_term::focus_out ()	1811	rxvt_term::focus_out ()
1767	{	1812	{
1768	if (focus)	1813	if (focus)
1769	{	1814	{
1770	focus = 0;	1815	focus = 0;
…		…
1803		1848
1804	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1849	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805	}	1850	}
1806	}	1851	}
1807		1852
1808	void	1853	void ecb_cold
1809	rxvt_term::update_fade_color (unsigned int idx)	1854	rxvt_term::update_fade_color (unsigned int idx)
1810	{	1855	{
1811	#if OFF_FOCUS_FADING	1856	#if OFF_FOCUS_FADING
1812	if (rs[Rs_fade])	1857	if (rs[Rs_fade])
1813	{	1858	{
…		…
1816	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1861	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817	}	1862	}
1818	#endif	1863	#endif
1819	}	1864	}
1820		1865
1821	#if ENABLE_TRANSPARENCY || ENABLE_PERL	1866	#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822	void	1867	void ecb_hot
1823	rxvt_term::rootwin_cb (XEvent &ev)	1868	rxvt_term::rootwin_cb (XEvent &ev)
1824	{	1869	{
1825	make_current ();	1870	make_current ();
1826		1871
1827	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1872	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1873	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829	return;	1874	return;
1830		1875
1831	# if ENABLE_TRANSPARENCY
1832	switch (ev.type)	1876	switch (ev.type)
1833	{	1877	{
1834	case PropertyNotify:	1878	case PropertyNotify:
1835	/*	1879	/*
1836	* if user used some Esetroot compatible prog to set the root bg,	1880	* if user used some Esetroot compatible prog to set the root bg,
1837	* use the property to determine the pixmap. We use it later on.	1881	* use the property to determine the pixmap. We use it later on.
1838	*/	1882	*/
1839	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1883	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1884	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841	{	1885	{
1842	bg_set_root_pixmap ();	1886	#if BG_IMAGE_FROM_ROOT
		1887	if (option (Opt_transparent))
		1888	{
		1889	rxvt_img::new_from_root (this)->replace (root_img);
1843	update_background ();	1890	update_background ();
		1891	}
		1892	#endif
		1893	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1844	}	1894	}
1845		1895
1846	break;	1896	break;
1847	}	1897	}
1848	# endif
1849		1898
1850	refresh_check ();	1899	refresh_check ();
1851	}	1900	}
1852	#endif	1901	#endif
1853		1902
…		…
1977	if (scrollBar.upButton (ev.y))	2026	if (scrollBar.upButton (ev.y))
1978	direction = UP; /* up */	2027	direction = UP; /* up */
1979	else if (scrollBar.dnButton (ev.y))	2028	else if (scrollBar.dnButton (ev.y))
1980	direction = DN; /* down */	2029	direction = DN; /* down */
1981		2030
1982	scrollBar.state = STATE_IDLE;	2031	scrollBar.state = SB_STATE_IDLE;
1983	/*	2032	/*
1984	* Rxvt-style scrollbar:	2033	* Rxvt-style scrollbar:
1985	* move up if mouse is above slider	2034	* move up if mouse is above slider
1986	* move dn if mouse is below slider	2035	* move dn if mouse is below slider
1987	*	2036	*
…		…
2026	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2075	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027	#endif	2076	#endif
2028	if (scr_page (direction, 1))	2077	if (scr_page (direction, 1))
2029	{	2078	{
2030	if (direction == UP)	2079	if (direction == UP)
2031	scrollBar.state = STATE_UP;	2080	scrollBar.state = SB_STATE_UP;
2032	else	2081	else
2033	scrollBar.state = STATE_DOWN;	2082	scrollBar.state = SB_STATE_DOWN;
2034	}	2083	}
2035	}	2084	}
2036	else	2085	else
2037	switch (ev.button)	2086	switch (ev.button)
2038	{	2087	{
2039	case Button2:	2088	case Button2:
2040	switch (scrollBar.align)	2089	switch (scrollBar.align)
2041	{	2090	{
2042	case R_SB_ALIGN_TOP:	2091	case SB_ALIGN_TOP:
2043	csrO = 0;	2092	csrO = 0;
2044	break;	2093	break;
2045	case R_SB_ALIGN_CENTRE:	2094	case SB_ALIGN_CENTRE:
2046	csrO = (scrollBar.bot - scrollBar.top) / 2;	2095	csrO = (scrollBar.bot - scrollBar.top) / 2;
2047	break;	2096	break;
2048	case R_SB_ALIGN_BOTTOM:	2097	case SB_ALIGN_BOTTOM:
2049	csrO = scrollBar.bot - scrollBar.top;	2098	csrO = scrollBar.bot - scrollBar.top;
2050	break;	2099	break;
2051	}	2100	}
2052		2101
2053	if (scrollBar.style == R_SB_XTERM	2102	if (scrollBar.style == SB_STYLE_XTERM
2054	|| scrollbar_above_slider (ev.y)	2103	|| scrollBar.above_slider (ev.y)
2055	|| scrollbar_below_slider (ev.y))	2104	|| scrollBar.below_slider (ev.y))
2056	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2105	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057		2106
2058	scrollBar.state = STATE_MOTION;	2107	scrollBar.state = SB_STATE_MOTION;
2059	break;	2108	break;
2060		2109
2061	case Button1:	2110	case Button1:
2062	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2111	if (scrollBar.align == SB_ALIGN_CENTRE)
2063	csrO = ev.y - scrollBar.top;	2112	csrO = ev.y - scrollBar.top;
2064	/* FALLTHROUGH */	2113	/* FALLTHROUGH */
2065		2114
2066	case Button3:	2115	case Button3:
2067	if (scrollBar.style != R_SB_XTERM)	2116	if (scrollBar.style != SB_STYLE_XTERM)
2068	{	2117	{
2069	if (scrollbar_above_slider (ev.y))	2118	if (scrollBar.above_slider (ev.y))
2070	# ifdef RXVT_SCROLL_FULL	2119	# ifdef RXVT_SCROLL_FULL
2071	scr_page (UP, nrow - 1);	2120	scr_page (UP, nrow - 1);
2072	# else	2121	# else
2073	scr_page (UP, nrow / 4);	2122	scr_page (UP, nrow / 4);
2074	# endif	2123	# endif
2075	else if (scrollbar_below_slider (ev.y))	2124	else if (scrollBar.below_slider (ev.y))
2076	# ifdef RXVT_SCROLL_FULL	2125	# ifdef RXVT_SCROLL_FULL
2077	scr_page (DN, nrow - 1);	2126	scr_page (DN, nrow - 1);
2078	# else	2127	# else
2079	scr_page (DN, nrow / 4);	2128	scr_page (DN, nrow / 4);
2080	# endif	2129	# endif
2081	else	2130	else
2082	scrollBar.state = STATE_MOTION;	2131	scrollBar.state = SB_STATE_MOTION;
2083	}	2132	}
2084	else	2133	else
2085	{	2134	{
2086	scr_page ((ev.button == Button1 ? DN : UP),	2135	scr_page ((ev.button == Button1 ? DN : UP),
2087	(nrow	2136	(nrow
2088	* scrollbar_position (ev.y)	2137	* scrollBar.position (ev.y)
2089	/ scrollBar.size ()));	2138	/ scrollBar.size ()));
2090	}	2139	}
2091		2140
2092	break;	2141	break;
2093	}	2142	}
…		…
2104		2153
2105	csrO = 0; /* reset csr Offset */	2154	csrO = 0; /* reset csr Offset */
2106	if (!bypass_keystate)	2155	if (!bypass_keystate)
2107	reportmode = !! (priv_modes & PrivMode_mouse_report);	2156	reportmode = !! (priv_modes & PrivMode_mouse_report);
2108		2157
2109	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2158	if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110	{	2159	{
2111	scrollBar.state = STATE_IDLE;	2160	scrollBar.state = SB_STATE_IDLE;
2112	scrollBar.show (0);	2161	scrollBar.show (0);
2113	}	2162	}
2114		2163
2115	#ifdef SELECTION_SCROLLING	2164	#ifdef SELECTION_SCROLLING
2116	sel_scroll_ev.stop();	2165	sel_scroll_ev.stop();
…		…
2166	case Button3:	2215	case Button3:
2167	selection_make (ev.time);	2216	selection_make (ev.time);
2168	break;	2217	break;
2169		2218
2170	case Button2:	2219	case Button2:
2171	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2220	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2221	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173	break;	2222	break;
2174		2223
2175	#ifdef MOUSE_WHEEL	2224	#ifdef MOUSE_WHEEL
2176	case Button4:	2225	case Button4:
2177	case Button5:	2226	case Button5:
2178	{	2227	{
2179	int i;	2228	int lines;
2180	page_dirn v;	2229	page_dirn dirn;
2181		2230
2182	v = ev.button == Button4 ? UP : DN;	2231	dirn = ev.button == Button4 ? UP : DN;
2183		2232
2184	if (ev.state & ShiftMask)	2233	if (ev.state & ShiftMask)
2185	i = 1;	2234	lines = 1;
2186	else if (option (Opt_mouseWheelScrollPage))	2235	else if (option (Opt_mouseWheelScrollPage))
2187	i = nrow - 1;	2236	lines = nrow - 1;
2188	else	2237	else
2189	i = 5;	2238	lines = 5;
2190		2239
2191	# ifdef MOUSE_SLIP_WHEELING	2240	# ifdef MOUSE_SLIP_WHEELING
2192	if (ev.state & ControlMask)	2241	if (ev.state & ControlMask)
2193	{	2242	{
2194	mouse_slip_wheel_speed += v ? -1 : 1;	2243	mouse_slip_wheel_speed += dirn;
2195	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2244	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2196	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2197		2245
2198	if (!slip_wheel_ev.is_active ())	2246	if (!slip_wheel_ev.is_active ())
2199	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2247	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2200	}	2248	}
2201	else	2249	else
2202	# endif	2250	# endif
2203	{	2251	{
2204	scr_page (v, i);	2252	scr_page (dirn, lines);
2205	scrollBar.show (1);	2253	scrollBar.show (1);
2206	}	2254	}
2207	}	2255	}
2208	break;	2256	break;
2209	#endif	2257	#endif
…		…
2211	}	2259	}
2212	}	2260	}
2213		2261
2214	/*}}} */	2262	/*}}} */
2215		2263
2216	void	2264	void ecb_hot
2217	rxvt_term::cmd_parse ()	2265	rxvt_term::cmd_parse ()
2218	{	2266	{
2219	wchar_t ch = NOCHAR;	2267	wchar_t ch = NOCHAR;
2220	char *seq_begin; // remember start of esc-sequence here	2268	char *seq_begin; // remember start of esc-sequence here
2221		2269
…		…
2340	}	2388	}
2341	}	2389	}
2342	}	2390	}
2343		2391
2344	// read the next character	2392	// read the next character
2345	wchar_t	2393	wchar_t ecb_hot
2346	rxvt_term::next_char () NOTHROW	2394	rxvt_term::next_char () NOTHROW
2347	{	2395	{
2348	while (cmdbuf_ptr < cmdbuf_endp)	2396	while (cmdbuf_ptr < cmdbuf_endp)
2349	{	2397	{
2350	// assume 7-bit to be ascii ALWAYS	2398	// assume 7-bit to be ascii ALWAYS
…		…
2362	}	2410	}
2363		2411
2364	if (len == (size_t)-1)	2412	if (len == (size_t)-1)
2365	{	2413	{
2366	mbstate.reset (); // reset now undefined conversion state	2414	mbstate.reset (); // reset now undefined conversion state
		2415	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2416	// in which case we "erroneously" return the next byte which might be valid.
2367	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2417	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368	}	2418	}
2369		2419
2370	// assume wchar == unicode	2420	// assume wchar == unicode
2371	cmdbuf_ptr += len;	2421	cmdbuf_ptr += len;
…		…
2374		2424
2375	return NOCHAR;	2425	return NOCHAR;
2376	}	2426	}
2377		2427
2378	// read the next octet	2428	// read the next octet
2379	uint32_t	2429	uint32_t ecb_hot
2380	rxvt_term::next_octet () NOTHROW	2430	rxvt_term::next_octet () NOTHROW
2381	{	2431	{
2382	return cmdbuf_ptr < cmdbuf_endp	2432	return cmdbuf_ptr < cmdbuf_endp
2383	? (unsigned char)*cmdbuf_ptr++	2433	? (unsigned char)*cmdbuf_ptr++
2384	: NOCHAR;	2434	: NOCHAR;
2385	}	2435	}
2386		2436
2387	static class out_of_input out_of_input;	2437	static class out_of_input out_of_input;
2388		2438
2389	wchar_t	2439	wchar_t ecb_hot
2390	rxvt_term::cmd_getc () THROW ((class out_of_input))	2440	rxvt_term::cmd_getc () THROW ((class out_of_input))
2391	{	2441	{
2392	wchar_t c = next_char ();	2442	wchar_t c = next_char ();
2393		2443
2394	if (c == NOCHAR)	2444	if (c == NOCHAR)
2395	throw out_of_input;	2445	throw out_of_input;
2396		2446
2397	return c;	2447	return c;
2398	}	2448	}
2399		2449
2400	uint32_t	2450	uint32_t ecb_hot
2401	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2451	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2402	{	2452	{
2403	uint32_t c = next_octet ();	2453	uint32_t c = next_octet ();
2404		2454
2405	if (c == NOCHAR)	2455	if (c == NOCHAR)
…		…
2409	}	2459	}
2410		2460
2411	/*{{{ print pipe */	2461	/*{{{ print pipe */
2412	/*----------------------------------------------------------------------*/	2462	/*----------------------------------------------------------------------*/
2413	#ifdef PRINTPIPE	2463	#ifdef PRINTPIPE
2414	FILE *	2464	FILE * ecb_cold
2415	rxvt_term::popen_printer ()	2465	rxvt_term::popen_printer ()
2416	{	2466	{
2417	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2467	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2418		2468
2419	if (stream == NULL)	2469	if (stream == NULL)
2420	rxvt_warn ("can't open printer pipe, not printing.\n");	2470	rxvt_warn ("can't open printer pipe, not printing.\n");
2421		2471
2422	return stream;	2472	return stream;
2423	}	2473	}
2424		2474
2425	int	2475	int ecb_cold
2426	rxvt_term::pclose_printer (FILE *stream)	2476	rxvt_term::pclose_printer (FILE *stream)
2427	{	2477	{
2428	fflush (stream);	2478	fflush (stream);
2429	return pclose (stream);	2479	return pclose (stream);
2430	}	2480	}
2431		2481
2432	/*	2482	/*
2433	* simulate attached vt100 printer	2483	* simulate attached vt100 printer
2434	*/	2484	*/
2435	void	2485	void ecb_cold
2436	rxvt_term::process_print_pipe ()	2486	rxvt_term::process_print_pipe ()
2437	{	2487	{
2438	FILE *fd = popen_printer ();	2488	FILE *fd = popen_printer ();
2439		2489
2440	if (!fd)	2490	if (!fd)
…		…
2495	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2545	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2496	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2546	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497	};	2547	};
2498		2548
2499	/*{{{ process non-printing single characters */	2549	/*{{{ process non-printing single characters */
2500	void	2550	void ecb_hot
2501	rxvt_term::process_nonprinting (unicode_t ch)	2551	rxvt_term::process_nonprinting (unicode_t ch)
2502	{	2552	{
2503	switch (ch)	2553	switch (ch)
2504	{	2554	{
2505	case C0_ESC:	2555	case C0_ESC:
…		…
2551	}	2601	}
2552	/*}}} */	2602	/*}}} */
2553		2603
2554		2604
2555	/*{{{ process VT52 escape sequences */	2605	/*{{{ process VT52 escape sequences */
2556	void	2606	void ecb_cold
2557	rxvt_term::process_escape_vt52 (unicode_t ch)	2607	rxvt_term::process_escape_vt52 (unicode_t ch)
2558	{	2608	{
2559	int row, col;	2609	int row, col;
2560		2610
2561	switch (ch)	2611	switch (ch)
…		…
2595	break;	2645	break;
2596	case 'Z': /* identify the terminal type */	2646	case 'Z': /* identify the terminal type */
2597	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2647	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598	break;	2648	break;
2599	case '<': /* turn off VT52 mode */	2649	case '<': /* turn off VT52 mode */
2600	set_privmode (PrivMode_vt52, 0);	2650	priv_modes &= ~PrivMode_vt52;
2601	break;	2651	break;
2602	case 'F': /* use special graphics character set */	2652	case 'F': /* use special graphics character set */
2603	case 'G': /* use regular character set */	2653	case 'G': /* use regular character set */
2604	/* unimplemented */	2654	/* unimplemented */
2605	break;	2655	break;
…		…
2611	}	2661	}
2612	/*}}} */	2662	/*}}} */
2613		2663
2614		2664
2615	/*{{{ process escape sequences */	2665	/*{{{ process escape sequences */
2616	void	2666	void ecb_hot
2617	rxvt_term::process_escape_seq ()	2667	rxvt_term::process_escape_seq ()
2618	{	2668	{
2619	unicode_t ch = cmd_getc ();	2669	unicode_t ch = cmd_getc ();
2620		2670
2621	if (priv_modes & PrivMode_vt52)	2671	if (priv_modes & PrivMode_vt52)
…		…
2656	#if !ENABLE_MINIMAL	2706	#if !ENABLE_MINIMAL
2657	case '9':	2707	case '9':
2658	scr_forwardindex ();	2708	scr_forwardindex ();
2659	break;	2709	break;
2660	#endif	2710	#endif
		2711	// DECPAM/DECPNM
2661	case '=':	2712	case '=':
		2713	priv_modes |= PrivMode_aplKP;
		2714	break;
2662	case '>':	2715	case '>':
2663	set_privmode (PrivMode_aplKP, ch == '=');	2716	priv_modes &= ~PrivMode_aplKP;
2664	break;	2717	break;
2665		2718
2666	case C1_40:	2719	case C1_40:
2667	cmd_getc ();	2720	cmd_getc ();
2668	break;	2721	break;
…		…
2770	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2823	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2771	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2824	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2772	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */	2825	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2773	};	2826	};
2774		2827
2775	void	2828	void ecb_hot
2776	rxvt_term::process_csi_seq ()	2829	rxvt_term::process_csi_seq ()
2777	{	2830	{
2778	unicode_t ch, priv, i;	2831	unicode_t ch, priv, prev_ch, i;
2779	unsigned int nargs, p;	2832	unsigned int nargs, p;
2780	int n, ndef;	2833	int n, ndef;
2781	int arg[ESC_ARGS] = { };	2834	int arg[ESC_ARGS] = { };
2782		2835
2783	nargs = 0;	2836	nargs = 0;
…		…
2789	/* '<' '=' '>' '?' '!' */	2842	/* '<' '=' '>' '?' '!' */
2790	priv = ch;	2843	priv = ch;
2791	ch = cmd_getc ();	2844	ch = cmd_getc ();
2792	}	2845	}
2793		2846
		2847	prev_ch = 0;
2794	/* read any numerical arguments */	2848	/* read any numerical arguments */
2795	for (n = -1; ch < CSI_ICH; )	2849	for (n = -1; ch < CSI_ICH; )
2796	{	2850	{
2797	if (isdigit (ch))	2851	if (isdigit (ch))
2798	{	2852	{
…		…
2808	n = -1;	2862	n = -1;
2809	}	2863	}
2810	else if (IS_CONTROL (ch))	2864	else if (IS_CONTROL (ch))
2811	process_nonprinting (ch);	2865	process_nonprinting (ch);
2812		2866
		2867	prev_ch = ch;
2813	ch = cmd_getc ();	2868	ch = cmd_getc ();
2814	}	2869	}
2815		2870
2816	if (ch > CSI_7F)	2871	if (ch > CSI_7F)
2817	return;	2872	return;
…		…
2887	}	2942	}
2888	break;	2943	break;
2889	#endif	2944	#endif
2890		2945
2891	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2946	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2892	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2947	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2893	arg[0] = -arg[0];	2948	arg[0] = -arg[0];
2894	/* FALLTHROUGH */	2949	/* FALLTHROUGH */
2895	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2950	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2896	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2951	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2897	scr_gotorc (arg[0], 0, RELATIVE);	2952	scr_gotorc (arg[0], 0, RELATIVE);
2898	break;	2953	break;
2899		2954
2900	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2955	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2901	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2956	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3051	scr_insert_mode (1);	3106	scr_insert_mode (1);
3052	else if (arg[0] == 20)	3107	else if (arg[0] == 20)
3053	priv_modes |= PrivMode_LFNL;	3108	priv_modes |= PrivMode_LFNL;
3054	break;	3109	break;
3055		3110
		3111	case CSI_71: // DESCUSR: set cursor style
		3112	if (prev_ch == ' ')
		3113	set_cursor_style (arg[0]);
		3114	break;
		3115
3056	/*	3116	/*
3057	* PRIVATE USE beyond this point. All CSI_7? sequences here	3117	* PRIVATE USE beyond this point. All CSI_7? sequences here
3058	*/	3118	*/
3059	case CSI_72: /* DECSTBM: set top and bottom margins */	3119	case CSI_72: /* DECSTBM: set top and bottom margins */
3060	if (nargs == 1)	3120	if (nargs == 1)
…		…
3134	break;	3194	break;
3135		3195
3136	//case 9: NYI, TODO, restore maximized window or maximize window	3196	//case 9: NYI, TODO, restore maximized window or maximize window
3137	default:	3197	default:
3138	if (args[0] >= 24) /* set height (chars) */	3198	if (args[0] >= 24) /* set height (chars) */
3139	set_widthheight ((unsigned int)width,	3199	set_widthheight ((unsigned int)vt_width,
3140	(unsigned int) (args[1] * fheight));	3200	(unsigned int) (args[1] * fheight));
3141	break;	3201	break;
3142		3202
3143	/*	3203	/*
3144	* reports - some output format copied from XTerm	3204	* reports - some output format copied from XTerm
…		…
3193	rxvt_term::get_to_st (unicode_t &ends_how)	3253	rxvt_term::get_to_st (unicode_t &ends_how)
3194	{	3254	{
3195	unicode_t ch;	3255	unicode_t ch;
3196	bool seen_esc = false;	3256	bool seen_esc = false;
3197	unsigned int n = 0;	3257	unsigned int n = 0;
3198	wchar_t string[STRING_MAX];	3258	wchar_t string[CBUFSIZ];
3199		3259
3200	while ((ch = cmd_getc ()) != NOCHAR)	3260	while ((ch = cmd_getc ()) != NOCHAR)
3201	{	3261	{
3202	if (seen_esc)	3262	if (seen_esc)
3203	{	3263	{
…		…
3218	else if (ch < 0x20)	3278	else if (ch < 0x20)
3219	return NULL; /* other control character - exit */	3279	return NULL; /* other control character - exit */
3220		3280
3221	seen_esc = false;	3281	seen_esc = false;
3222		3282
3223	if (n >= STRING_MAX - 1)	3283	if (n >= sizeof (string) - 1)
3224	// stop at some sane length	3284	// stop at some sane length
3225	return NULL;	3285	return NULL;
3226		3286
3227	string[n++] = ch;	3287	string[n++] = ch;
3228	}	3288	}
…		…
3345	&nitems, &bytes_after, &value) == Success	3405	&nitems, &bytes_after, &value) == Success
3346	&& actual_type != None	3406	&& actual_type != None
3347	&& actual_format == 8)	3407	&& actual_format == 8)
3348	str = (const char *)(value);	3408	str = (const char *)(value);
3349		3409
3350	tt_printf ("\033]%d;%s%c", op, str, resp);	3410	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3351		3411
3352	XFree (value);	3412	XFree (value);
3353	}	3413	}
3354	else	3414	else
3355	{	3415	{
…		…
3423	break;	3483	break;
3424	#endif	3484	#endif
3425	case URxvt_Color_border:	3485	case URxvt_Color_border:
3426	process_color_seq (op, Color_border, str, resp);	3486	process_color_seq (op, Color_border, str, resp);
3427	break;	3487	break;
3428	#if ENABLE_TRANSPARENCY	3488
		3489	#if BG_IMAGE_FROM_ROOT
3429	case URxvt_Color_tint:	3490	case URxvt_Color_tint:
3430	process_color_seq (op, Color_tint, str, resp);	3491	process_color_seq (op, Color_tint, str, resp);
3431	{	3492	{
3432	bool changed = false;	3493	bool changed = false;
3433		3494
3434	if (ISSET_PIXCOLOR (Color_tint))	3495	if (ISSET_PIXCOLOR (Color_tint))
3435	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3496	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3436		3497
3437	if (changed)	3498	if (changed)
3438	update_background ();	3499	update_background ();
3439	}	3500	}
3440		3501
…		…
3444	#if BG_IMAGE_FROM_FILE	3505	#if BG_IMAGE_FROM_FILE
3445	case Rxvt_Pixmap:	3506	case Rxvt_Pixmap:
3446	if (!strcmp (str, "?"))	3507	if (!strcmp (str, "?"))
3447	{	3508	{
3448	char str[256];	3509	char str[256];
		3510	int h_scale = fimage.h_scale;
		3511	int v_scale = fimage.v_scale;
		3512	int h_align = fimage.h_align;
		3513	int v_align = fimage.v_align;
3449		3514
3450	sprintf (str, "[%dx%d+%d+%d]",	3515	sprintf (str, "[%dx%d+%d+%d]",
3451	min (h_scale, 32767), min (v_scale, 32767),	3516	h_scale, v_scale,
3452	min (h_align, 32767), min (v_align, 32767));	3517	h_align, v_align);
3453	process_xterm_seq (XTerm_title, str, CHAR_ST);	3518	process_xterm_seq (XTerm_title, str, CHAR_ST);
3454	}	3519	}
3455	else	3520	else
3456	{	3521	{
3457	int changed = 0;	3522	bool changed = false;
3458		3523
3459	if (*str != ';')	3524	if (*str != ';')
3460	{	3525	{
3461	if (bg_set_file (str)) /* change pixmap */	3526	try
3462	{	3527	{
		3528	fimage.set_file_geometry (this, str);
3463	changed++;	3529	changed = true;
3464	str = strchr (str, ';');
3465	if (str == NULL)
3466	bg_set_default_geometry ();
3467	else	3530	}
3468	bg_set_geometry (str+1);	3531	catch (const class rxvt_failure_exception &e)
		3532	{
3469	}	3533	}
3470	}	3534	}
3471	else	3535	else
3472	{	3536	{
3473	str++;	3537	str++;
3474	if (bg_set_geometry (str, true))	3538	if (fimage.set_geometry (str, true))
3475	changed++;	3539	changed = true;
3476	}	3540	}
3477		3541
3478	if (changed)	3542	if (changed)
3479	{	3543	{
3480	if (bg_window_position_sensitive ())	3544	if (bg_window_position_sensitive ())
3481	{	3545	{
3482	int x, y;	3546	int x, y;
3483	get_window_origin (x, y);	3547	get_window_origin (x, y);
3484	bg_set_position (x, y);	3548	parent_x = x;
		3549	parent_y = y;
3485	}	3550	}
3486	update_background ();	3551	update_background ();
3487	}	3552	}
3488	}	3553	}
3489	break;	3554	break;
…		…
3579	* 's' = save	3644	* 's' = save
3580	* 'r' = restore	3645	* 'r' = restore
3581	* 't' = toggle	3646	* 't' = toggle
3582	* so no need for fancy checking	3647	* so no need for fancy checking
3583	*/	3648	*/
3584	int	3649	int ecb_cold
3585	rxvt_term::privcases (int mode, unsigned long bit)	3650	rxvt_term::privcases (int mode, unsigned long bit)
3586	{	3651	{
3587	int state;	3652	int state;
3588		3653
3589	if (mode == 's')	3654	if (mode == 's')
3590	{	3655	{
3591	SavedModes |= (priv_modes & bit);	3656	if (priv_modes & bit)
		3657	SavedModes |= bit;
		3658	else
		3659	SavedModes &= ~bit;
3592	return -1;	3660	return -1;
3593	}	3661	}
3594	else	3662	else
3595	{	3663	{
3596	if (mode == 'r')	3664	if (mode == 'r')
3597	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3665	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3598	else	3666	else
3599	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3667	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3600		3668
3601	set_privmode (bit, state);	3669	if (state)
		3670	priv_modes |= bit;
		3671	else
		3672	priv_modes &= ~bit;
3602	}	3673	}
3603		3674
3604	return state;	3675	return state;
3605	}	3676	}
3606		3677
…		…
3615	{	3686	{
3616	const int argval;	3687	const int argval;
3617	const unsigned long bit;	3688	const unsigned long bit;
3618	} argtopriv[] = {	3689	} argtopriv[] = {
3619	{ 1, PrivMode_aplCUR }, // DECCKM	3690	{ 1, PrivMode_aplCUR }, // DECCKM
3620	{ 2, PrivMode_vt52 },	3691	{ 2, PrivMode_vt52 }, // DECANM
3621	{ 3, PrivMode_132 }, // DECCOLM	3692	{ 3, PrivMode_132 }, // DECCOLM
3622	{ 4, PrivMode_smoothScroll }, // DECSCLM	3693	{ 4, PrivMode_smoothScroll }, // DECSCLM
3623	{ 5, PrivMode_rVideo }, // DECSCNM	3694	{ 5, PrivMode_rVideo }, // DECSCNM
3624	{ 6, PrivMode_relOrigin }, // DECOM	3695	{ 6, PrivMode_relOrigin }, // DECOM
3625	{ 7, PrivMode_Autowrap }, // DECAWM	3696	{ 7, PrivMode_Autowrap }, // DECAWM
3626	// 8, auto-repeat keys // DECARM	3697	// 8, auto-repeat keys // DECARM
3627	{ 9, PrivMode_MouseX10 },	3698	{ 9, PrivMode_MouseX10 },
3628	// 18 end FF to printer after print screen	3699	// 18 end FF to printer after print screen
3629	// 19 Print screen prints full screen/scroll region	3700	// 19 Print screen prints full screen/scroll region
3630	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3701	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631	#ifdef scrollBar_esc	3702	#ifdef scrollBar_esc
3632	{ scrollBar_esc, PrivMode_scrollBar },	3703	{ scrollBar_esc, PrivMode_scrollBar },
3633	#endif	3704	#endif
3634	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3705	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3635	// 38, tektronix mode // DECTEK	3706	// 38, tektronix mode // DECTEK
3636	{ 40, PrivMode_132OK },	3707	{ 40, PrivMode_132OK },
3637	// 41 xterm more fixes NYI	3708	// 41 xterm more fixes NYI
3638	// 45 margin bell NYI	3709	// 45 margin bell NYI
3639	// 46 start logging	3710	// 46 start logging
3640	{ 47, PrivMode_Screen },	3711	{ 47, PrivMode_Screen },
3641	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3712	{ 66, PrivMode_aplKP }, // DECNKM
3642	#ifndef NO_BACKSPACE_KEY	3713	#ifndef NO_BACKSPACE_KEY
3643	{ 67, PrivMode_BackSpace }, // DECBKM	3714	{ 67, PrivMode_BackSpace }, // DECBKM
3644	#endif	3715	#endif
3645	{ 1000, PrivMode_MouseX11 },	3716	{ 1000, PrivMode_MouseX11 },
3646	{ 1002, PrivMode_MouseBtnEvent },	3717	{ 1002, PrivMode_MouseBtnEvent },
…		…
3711	case 2: /* VT52 mode */	3782	case 2: /* VT52 mode */
3712	/* oddball mode. should be set regardless of set/reset	3783	/* oddball mode. should be set regardless of set/reset
3713	* parameter. Return from VT52 mode with an ESC < from	3784	* parameter. Return from VT52 mode with an ESC < from
3714	* within VT52 mode	3785	* within VT52 mode
3715	*/	3786	*/
3716	set_privmode (PrivMode_vt52, 1);	3787	priv_modes |= PrivMode_vt52;
3717	break;	3788	break;
3718	case 3: /* 80/132 */	3789	case 3: /* 80/132 */
3719	if (priv_modes & PrivMode_132OK)	3790	if (priv_modes & PrivMode_132OK)
3720	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3791	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3721	break;	3792	break;
…		…
3736	if (state) /* orthogonal */	3807	if (state) /* orthogonal */
3737	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3808	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3738	break;	3809	break;
3739	#ifdef scrollBar_esc	3810	#ifdef scrollBar_esc
3740	case scrollBar_esc:	3811	case scrollBar_esc:
3741	if (scrollBar.map (state))	3812	scrollBar.map (state);
3742	{
3743	resize_all_windows (0, 0, 0);	3813	resize_all_windows (0, 0, 0);
3744	scr_touch (true);	3814	scr_touch (true);
3745	}
3746	break;	3815	break;
3747	#endif	3816	#endif
3748	case 25: /* visible/invisible cursor */	3817	case 25: /* visible/invisible cursor */
3749	scr_cursor_visible (state);	3818	scr_cursor_visible (state);
3750	break;	3819	break;
…		…
3805	}	3874	}
3806	}	3875	}
3807	/*}}} */	3876	/*}}} */
3808		3877
3809	/*{{{ process sgr sequences */	3878	/*{{{ process sgr sequences */
3810	void	3879	void ecb_hot
3811	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3880	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3812	{	3881	{
3813	unsigned int i;	3882	unsigned int i;
3814	short rendset;	3883	short rendset;
3815	int rendstyle;	3884	int rendstyle;
…		…
3956	break;	4025	break;
3957	#endif	4026	#endif
3958	}	4027	}
3959	}	4028	}
3960	}	4029	}
		4030
		4031	void
		4032	rxvt_term::set_cursor_style (int style)
		4033	{
		4034	if (!IN_RANGE_INC (style, 0, 4))
		4035	return;
		4036
		4037	set_option (Opt_cursorUnderline, style >= 3);
		4038
		4039	#ifdef CURSOR_BLINK
		4040	set_option (Opt_cursorBlink, !style || (style & 1));
		4041	cursor_blink_reset ();
		4042	#endif
		4043
		4044	want_refresh = 1;
		4045	}
3961	/*}}} */	4046	/*}}} */
3962		4047
3963	/* ------------------------------------------------------------------------- */	4048	/* ---------------------------------------------------------------------- */
		4049	/* Write data to the pty as typed by the user, pasted with the mouse,
		4050	* or generated by us in response to a query ESC sequence.
		4051	*/
3964		4052
3965	/*	4053	/*
3966	* Send printf () formatted output to the command.	4054	* Send printf () formatted output to the command.
3967	* Only use for small amounts of data.	4055	* Only use for small amounts of data.
3968	*/	4056	*/
…		…
3976	vsnprintf ((char *)buf, 256, fmt, arg_ptr);	4064	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3977	va_end (arg_ptr);	4065	va_end (arg_ptr);
3978	tt_write (buf, strlen (buf));	4066	tt_write (buf, strlen (buf));
3979	}	4067	}
3980		4068
3981	/* ---------------------------------------------------------------------- */
3982	/* Write data to the pty as typed by the user, pasted with the mouse,	4069	/* Write data to the pty as typed by the user. */
3983	* or generated by us in response to a query ESC sequence.	4070	void
3984	*/	4071	rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3985	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4072	{
		4073	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4074	return;
		4075
		4076	if (option (Opt_scrollTtyKeypress))
		4077	if (view_start)
		4078	{
		4079	view_start = 0;
		4080	want_refresh = 1;
		4081	}
		4082
		4083	tt_write_ (data, len);
		4084	}
3986		4085
3987	void	4086	void
3988	rxvt_term::tt_write (const char *data, unsigned int len)	4087	rxvt_term::tt_write (const char *data, unsigned int len)
3989	{	4088	{
3990	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4089	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3991	return;	4090	return;
3992		4091
		4092	tt_write_ (data, len);
		4093	}
		4094
		4095	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4096
		4097	void
		4098	rxvt_term::tt_write_ (const char *data, unsigned int len)
		4099	{
3993	if (pty->pty < 0)	4100	if (pty->pty < 0)
3994	return;	4101	return;
3995		4102
3996	if (v_buflen == 0)	4103	if (v_buflen == 0)
3997	{	4104	{

Diff Legend

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