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.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs.
Revision 1.547 by sf-exg, Tue Apr 29 12:51:41 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 2 of the License, or
…		…
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	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
		502	{
		503	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		504	unsigned int newlen = 1;
		505
		506	if (ev.state & ModNumLockMask)
		507	kp = false;
		508
		509	keysym = translate_keypad (keysym, kp);
		510
		511	switch (keysym)
		512	{
		513	#ifndef NO_BACKSPACE_KEY
		514	case XK_BackSpace:
		515	if (priv_modes & PrivMode_HaveBackSpace)
		516	{
		517	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		518	^ !!ctrl) ? '\b' : '\177';
		519	kbuf[1] = '\0';
		520	}
		521	else
		522	strcpy (kbuf, rs[Rs_backspace_key]);
		523	break;
		524	#endif
		525	#ifndef NO_DELETE_KEY
		526	case XK_Delete:
		527	strcpy (kbuf, rs[Rs_delete_key]);
		528	break;
		529	#endif
		530	case XK_Tab:
		531	if (shft)
		532	strcpy (kbuf, "\033[Z");
		533	else
		534	{
		535	#ifdef CTRL_TAB_MAKES_META
		536	if (ctrl)
		537	meta = 1;
		538	#endif
		539	#ifdef MOD4_TAB_MAKES_META
		540	if (ev.state & Mod4Mask)
		541	meta = 1;
		542	#endif
		543	newlen = 0;
		544	}
		545	break;
		546
		547	case XK_Up: /* "\033[A" */
		548	case XK_Down: /* "\033[B" */
		549	case XK_Right: /* "\033[C" */
		550	case XK_Left: /* "\033[D" */
		551	strcpy (kbuf, "\033[Z");
		552	kbuf[2] = "DACB"[keysym - XK_Left];
		553	/* do Shift first */
		554	if (shft)
		555	kbuf[2] = "dacb"[keysym - XK_Left];
		556	else if (ctrl)
		557	{
		558	kbuf[1] = 'O';
		559	kbuf[2] = "dacb"[keysym - XK_Left];
		560	}
		561	else if (priv_modes & PrivMode_aplCUR)
		562	kbuf[1] = 'O';
		563	break;
		564
		565	case XK_KP_Enter:
		566	/* allow shift to override */
		567	if (kp)
		568	{
		569	strcpy (kbuf, "\033OM");
		570	break;
		571	}
		572
		573	/* FALLTHROUGH */
		574
		575	case XK_Return:
		576	if (priv_modes & PrivMode_LFNL)
		577	{
		578	kbuf[0] = '\015';
		579	kbuf[1] = '\012';
		580	kbuf[2] = '\0';
		581	}
		582	else
		583	{
		584	kbuf[0] = '\015';
		585	kbuf[1] = '\0';
		586	}
		587	break;
		588
		589	case XK_KP_F1: /* "\033OP" */
		590	case XK_KP_F2: /* "\033OQ" */
		591	case XK_KP_F3: /* "\033OR" */
		592	case XK_KP_F4: /* "\033OS" */
		593	strcpy (kbuf, "\033OP");
		594	kbuf[2] += (keysym - XK_KP_F1);
		595	break;
		596
		597	case XK_KP_Multiply: /* "\033Oj" : "*" */
		598	case XK_KP_Add: /* "\033Ok" : "+" */
		599	case XK_KP_Separator: /* "\033Ol" : "," */
		600	case XK_KP_Subtract: /* "\033Om" : "-" */
		601	case XK_KP_Decimal: /* "\033On" : "." */
		602	case XK_KP_Divide: /* "\033Oo" : "/" */
		603	case XK_KP_0: /* "\033Op" : "0" */
		604	case XK_KP_1: /* "\033Oq" : "1" */
		605	case XK_KP_2: /* "\033Or" : "2" */
		606	case XK_KP_3: /* "\033Os" : "3" */
		607	case XK_KP_4: /* "\033Ot" : "4" */
		608	case XK_KP_5: /* "\033Ou" : "5" */
		609	case XK_KP_6: /* "\033Ov" : "6" */
		610	case XK_KP_7: /* "\033Ow" : "7" */
		611	case XK_KP_8: /* "\033Ox" : "8" */
		612	case XK_KP_9: /* "\033Oy" : "9" */
		613	/* allow shift to override */
		614	if (kp)
		615	{
		616	strcpy (kbuf, "\033Oj");
		617	kbuf[2] += (keysym - XK_KP_Multiply);
		618	}
		619	else
		620	{
		621	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		622	kbuf[1] = '\0';
		623	}
		624	break;
		625
		626	default:
		627	{
		628	int param = map_function_key (keysym);
		629	if (param > 0)
		630	sprintf (kbuf,"\033[%d~", param);
		631	else
		632	newlen = 0;
		633	}
		634	break;
		635	}
		636
		637	if (newlen)
		638	len = strlen (kbuf);
		639
		640	if (len > 0)
		641	{
		642	/*
		643	* pass Shift/Control indicators for function keys ending with `~'
		644	*
		645	* eg,
		646	* Prior = "ESC[5~"
		647	* Shift+Prior = "ESC[5$"
		648	* Ctrl+Prior = "ESC[5^"
		649	* Ctrl+Shift+Prior = "ESC[5@"
		650	*/
		651	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		652	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		653
		654	/*
		655	* Pass meta for all function keys, if 'meta' option set
		656	*/
		657	#ifdef META8_OPTION
		658	if (meta && (meta_char == 0x80))
		659	kbuf[len - 1] |= 0x80;
		660	#endif
		661	}
		662
		663	}
		664	else if (ctrl && keysym == XK_minus)
		665	{
		666	len = 1;
		667	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		668	}
		669	else if (keysym == XK_ISO_Left_Tab)
		670	{
		671	strcpy (kbuf, "\033[Z");
		672	len = 3;
		673	}
		674	else
		675	{
		676	#ifdef META8_OPTION
		677	/* set 8-bit on */
		678	if (meta && (meta_char == 0x80))
		679	{
		680	char *ch;
		681
		682	for (ch = kbuf; ch < kbuf + len; ch++)
		683	*ch |= 0x80;
		684
		685	meta = 0;
		686	}
		687	#endif
		688	/* nil */ ;
		689	}
		690	}
		691
		692	/* escape prefix */
		693	if (len && meta
		694	#ifdef META8_OPTION
		695	&& meta_char == C0_ESC
		696	#endif
		697	)
		698	{
		699	*--kbuf = C0_ESC;
		700	len++;
		701	}
		702
		703	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		704	return;
		705
		706	if (valid_keysym)
		707	{
487	#ifdef KEYSYM_RESOURCE	708	#ifdef KEYSYM_RESOURCE
488	if (keyboard->dispatch (this, keysym, ev.state))	709	if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489	return;	710	return;
490	#endif	711	#endif
491		712
492	if (saveLines)	713	if (saveLines)
493	{	714	{
…		…
506	#endif	727	#endif
507	max_it (lnsppg, 1);	728	max_it (lnsppg, 1);
508		729
509	if (keysym == XK_Prior)	730	if (keysym == XK_Prior)
510	{	731	{
511	scr_page (UP, lnsppg);	732	scr_page (lnsppg);
512	return;	733	return;
513	}	734	}
514	else if (keysym == XK_Next)	735	else if (keysym == XK_Next)
515	{	736	{
516	scr_page (DN, lnsppg);	737	scr_page (-lnsppg);
517	return;	738	return;
518	}	739	}
519	}	740	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	741	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	742	if (IS_SCROLL_MOD)
522	{	743	{
523	if (keysym == XK_Up)	744	if (keysym == XK_Up)
524	{	745	{
525	scr_page (UP, 1);	746	scr_page (1);
526	return;	747	return;
527	}	748	}
528	else if (keysym == XK_Down)	749	else if (keysym == XK_Down)
529	{	750	{
530	scr_page (DN, 1);	751	scr_page (-1);
531	return;	752	return;
532	}	753	}
533	}	754	}
534	#endif	755	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	756	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	757	if (IS_SCROLL_MOD)
537	{	758	{
538	if (keysym == XK_Home)	759	if (keysym == XK_Home)
539	{	760	{
540	scr_move_to (0, 1);	761	scr_changeview (top_row);
541	return;	762	return;
542	}	763	}
543	else if (keysym == XK_End)	764	else if (keysym == XK_End)
544	{	765	{
545	scr_move_to (1, 1);	766	scr_changeview (0);
546	return;	767	return;
547	}	768	}
548	}	769	}
549	#endif	770	#endif
550	}	771	}
…		…
572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	793	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573	return;	794	return;
574	#endif	795	#endif
575	}	796	}
576	}	797	}
		798	}
		799
		800	if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
		801	{
		802	if (keysym == XK_v)
		803	selection_request (ev.time, Sel_Clipboard);
		804	else if (selection.len > 0)
		805	{
		806	free (selection.clip_text);
		807	selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
		808	selection.clip_len = selection.len;
		809	selection_grab (CurrentTime, true);
		810	}
		811
		812	return;
577	}	813	}
578		814
579	#if ENABLE_FRILLS || ISO_14755	815	#if ENABLE_FRILLS || ISO_14755
580	// ISO 14755 support	816	// ISO 14755 support
581	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))	817	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
…		…
636	{	872	{
637	scr_printscreen (ctrl | shft);	873	scr_printscreen (ctrl | shft);
638	return;	874	return;
639	}	875	}
640	#endif	876	#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	}	877	}
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		878
821	if (len <= 0)	879	if (len <= 0)
822	return; /* not mapped */	880	return; /* not mapped */
823		881
824	if (option (Opt_scrollTtyKeypress))	882	if (option (Opt_scrollTtyKeypress))
…		…
826	{	884	{
827	view_start = 0;	885	view_start = 0;
828	want_refresh = 1;	886	want_refresh = 1;
829	}	887	}
830		888
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);	889	tt_write (kbuf, (unsigned int)len);
857	}	890	}
858		891
859	void	892	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	893	rxvt_term::key_release (XKeyEvent &ev)
861	{	894	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL	895	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863	KeySym keysym;	896	KeySym keysym;
864		897
…		…
936	void	969	void
937	rxvt_term::flush ()	970	rxvt_term::flush ()
938	{	971	{
939	flush_ev.stop ();	972	flush_ev.stop ();
940		973
941	#ifdef HAVE_BG_PIXMAP	974	#ifdef HAVE_IMG
942	if (bg_flags & BG_NEEDS_REFRESH)	975	if (bg_flags & BG_NEEDS_REFRESH)
943	{	976	{
944	bg_flags &= ~BG_NEEDS_REFRESH;	977	bg_flags &= ~BG_NEEDS_REFRESH;
945	scr_touch (false);	978	scr_touch (false);
946	}	979	}
…		…
986	while (row < end_row);	1019	while (row < end_row);
987	}	1020	}
988		1021
989	scr_refresh ();	1022	scr_refresh ();
990	scrollBar.show (1);	1023	scrollBar.show (1);
991	#ifdef USE_XIM	1024	#if USE_XIM
992	IMSendSpot ();	1025	im_send_spot ();
993	#endif	1026	#endif
994	}	1027	}
995		1028
996	display->flush ();	1029	display->flush ();
997	}	1030	}
…		…
1015	flush ();	1048	flush ();
1016	}	1049	}
1017		1050
1018	#ifdef CURSOR_BLINK	1051	#ifdef CURSOR_BLINK
1019	void	1052	void
		1053	rxvt_term::cursor_blink_reset ()
		1054	{
		1055	if (hidden_cursor)
		1056	{
		1057	hidden_cursor = 0;
		1058	want_refresh = 1;
		1059	}
		1060
		1061	if (option (Opt_cursorBlink))
		1062	cursor_blink_ev.again ();
		1063	else
		1064	cursor_blink_ev.stop ();
		1065	}
		1066
		1067	void
1020	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1068	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021	{	1069	{
1022	hidden_cursor = !hidden_cursor;	1070	hidden_cursor = !hidden_cursor;
1023	want_refresh = 1;	1071	want_refresh = 1;
1024	refresh_check ();	1072	refresh_check ();
…		…
1042		1090
1043	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1091	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044	void	1092	void
1045	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1093	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046	{	1094	{
1047	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	1095	if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1096	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049	{	1097	{
1050	want_refresh = 1;	1098	want_refresh = 1;
1051	refresh_check ();	1099	refresh_check ();
1052	}	1100	}
1053	else	1101	else
…		…
1057		1105
1058	#ifdef SELECTION_SCROLLING	1106	#ifdef SELECTION_SCROLLING
1059	void	1107	void
1060	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1108	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061	{	1109	{
1062	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1110	if (scr_page (scroll_selection_lines))
1063	{	1111	{
1064	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1112	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065	want_refresh = 1;	1113	want_refresh = 1;
1066	refresh_check ();	1114	refresh_check ();
1067	}	1115	}
…		…
1072		1120
1073	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1121	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074	void	1122	void
1075	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1123	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076	{	1124	{
1077	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1125	if (scr_page (mouse_slip_wheel_speed))
1078	{	1126	{
1079	want_refresh = 1;	1127	want_refresh = 1;
1080	refresh_check ();	1128	refresh_check ();
1081	}	1129	}
1082		1130
…		…
1203	pty_write ();	1251	pty_write ();
1204		1252
1205	refresh_check ();	1253	refresh_check ();
1206	}	1254	}
1207		1255
1208	void	1256	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1257	rxvt_term::pointer_unblank ()
1210	{	1258	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1259	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1260	recolour_cursor ();
1213		1261
…		…
1218	pointer_ev.start (pointerBlankDelay);	1266	pointer_ev.start (pointerBlankDelay);
1219	#endif	1267	#endif
1220	}	1268	}
1221		1269
1222	#ifdef POINTER_BLANK	1270	#ifdef POINTER_BLANK
1223	void	1271	void ecb_cold
1224	rxvt_term::pointer_blank ()	1272	rxvt_term::pointer_blank ()
1225	{	1273	{
1226	if (!option (Opt_pointerBlank))	1274	if (!option (Opt_pointerBlank))
1227	return;	1275	return;
1228		1276
…		…
1230	XFlush (dpy);	1278	XFlush (dpy);
1231		1279
1232	hidden_pointer = 1;	1280	hidden_pointer = 1;
1233	}	1281	}
1234		1282
1235	void	1283	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1284	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1285	{
1238	make_current ();	1286	make_current ();
1239		1287
1240	pointer_blank ();	1288	pointer_blank ();
…		…
1332	32 + x,	1380	32 + x,
1333	32 + y);	1381	32 + y);
1334	}	1382	}
1335		1383
1336	/*{{{ process an X event */	1384	/*{{{ process an X event */
1337	void	1385	void ecb_hot
1338	rxvt_term::x_cb (XEvent &ev)	1386	rxvt_term::x_cb (XEvent &ev)
1339	{	1387	{
1340	make_current ();	1388	make_current ();
1341		1389
1342	dLocal (Display *, dpy);	1390	dLocal (Display *, dpy);
…		…
1445	if (ev.xconfigure.window == parent)	1493	if (ev.xconfigure.window == parent)
1446	{	1494	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1495	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1496	;
1449		1497
		1498	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1499
		1500	bool moved = false;
1450	#ifdef HAVE_BG_PIXMAP	1501	#ifdef HAVE_BG_PIXMAP
1451	bool moved = false;
1452	if (bg_window_position_sensitive ())	1502	if (bg_window_position_sensitive ())
1453	{	1503	{
		1504	want_position_change = true;
		1505	if (bg_img == 0)
		1506	moved = true;
		1507	}
		1508	#endif
		1509
		1510	if (want_position_change)
		1511	{
1454	int x, y;	1512	int x, y;
		1513
1455	if (ev.xconfigure.send_event)	1514	if (ev.xconfigure.send_event)
1456	{	1515	{
1457	x = ev.xconfigure.x;	1516	x = ev.xconfigure.x;
1458	y = ev.xconfigure.y;	1517	y = ev.xconfigure.y;
1459	}	1518	}
1460	else	1519	else
1461	get_window_origin (x, y);	1520	get_window_origin (x, y);
1462		1521
1463	if (bg_set_position (x, y)	1522	if (x != parent_x || y != parent_y)
1464	|| !(bg_flags & BG_IS_VALID))	1523	{
		1524	parent_x = x;
		1525	parent_y = y;
		1526	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465	moved = true;	1527	moved = true;
		1528	}
1466	}	1529	}
1467	#endif
1468		1530
1469	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1531	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470	{	1532	{
1471	seen_resize = 1;	1533	seen_resize = 1;
1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1534	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1473	}	1535	}
1474	else	1536	else
1475	{	1537	{
1476	#ifdef HAVE_BG_PIXMAP	1538	#ifdef HAVE_BG_PIXMAP
1477	if (moved)	1539	if (moved)
1478	{
1479	if (mapped)
1480	update_background ();	1540	update_background ();
1481	else
1482	bg_invalidate ();
1483	}
1484	#endif	1541	#endif
1485	}	1542	}
1486		1543
1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1544	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488	}	1545	}
…		…
1500	selection_send (ev.xselectionrequest);	1557	selection_send (ev.xselectionrequest);
1501	break;	1558	break;
1502		1559
1503	case MapNotify:	1560	case MapNotify:
1504	#ifdef HAVE_BG_PIXMAP	1561	#ifdef HAVE_BG_PIXMAP
1505	/* This is needed specifically to fix the case of no window manager or a	1562	// This is needed at startup for the case of no window manager
1506	* non-reparenting window manager. In those cases we never get first	1563	// or a non-reparenting window manager and also because we
1507	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1564	// defer bg image updates if the window is not mapped. The
1508	* care of multiplicity of ConfigureNotify events arriving while WM does	1565	// short delay is to optimize for multiple ConfigureNotify
1509	* reparenting.	1566	// events at startup when the window manager reparents the
1510	* We should not render background immediately, as there could be several	1567	// 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	1568	// received all of them.
1512	* by scheduling background redraw as soon as we can, but giving a short	1569	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);	1570	update_background_ev.start (0.025);
1519	#endif	1571	#endif
1520	mapped = 1;	1572	mapped = 1;
1521	#ifdef TEXT_BLINK	1573	#ifdef TEXT_BLINK
1522	text_blink_ev.start ();	1574	text_blink_ev.start ();
…		…
1562	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1614	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1615	;
1564		1616
1565	if (scrollBar.state && ev.xany.window == scrollBar.win)	1617	if (scrollBar.state && ev.xany.window == scrollBar.win)
1566	{	1618	{
1567	scrollBar.state = STATE_IDLE;	1619	scrollBar.state = SB_STATE_IDLE;
1568	scrollBar.show (0);	1620	scrollBar.show (0);
1569	}	1621	}
1570	}	1622	}
1571	break;	1623	break;
1572		1624
…		…
1614		1666
1615	#ifdef SELECTION_SCROLLING	1667	#ifdef SELECTION_SCROLLING
1616	if (ev.xbutton.y < int_bwidth	1668	if (ev.xbutton.y < int_bwidth
1617	|| Pixel2Row (ev.xbutton.y) > (nrow-1))	1669	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1618	{	1670	{
		1671	page_dirn scroll_selection_dir;
1619	int dist;	1672	int dist;
1620		1673
1621	/* don't clobber the current delay if we are	1674	/* don't clobber the current delay if we are
1622	* already in the middle of scrolling.	1675	* already in the middle of scrolling.
1623	*/	1676	*/
…		…
1638	dist = int_bwidth - ev.xbutton.y;	1691	dist = int_bwidth - ev.xbutton.y;
1639	}	1692	}
1640	else	1693	else
1641	{	1694	{
1642	scroll_selection_dir = DN;	1695	scroll_selection_dir = DN;
1643	dist = ev.xbutton.y - (int_bwidth + height);	1696	dist = ev.xbutton.y - (int_bwidth + vt_height);
1644	}	1697	}
1645		1698
1646	scroll_selection_lines = Pixel2Height (dist)	1699	scroll_selection_lines = Pixel2Height (dist)
1647	/ SELECTION_SCROLL_LINE_SPEEDUP	1700	/ SELECTION_SCROLL_LINE_SPEEDUP
1648	+ 1;	1701	+ 1;
1649	min_it (scroll_selection_lines,	1702	min_it (scroll_selection_lines,
1650	SELECTION_SCROLL_MAX_LINES);	1703	SELECTION_SCROLL_MAX_LINES);
		1704	scroll_selection_lines *= scroll_selection_dir;
1651	}	1705	}
1652	else	1706	else
1653	{	1707	{
1654	/* we are within the text window, so we	1708	/* we are within the text window, so we
1655	* shouldn't be scrolling	1709	* shouldn't be scrolling
…		…
1660	#ifdef MOUSE_THRESHOLD	1714	#ifdef MOUSE_THRESHOLD
1661	}	1715	}
1662	#endif	1716	#endif
1663	}	1717	}
1664	}	1718	}
1665	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1719	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666	{	1720	{
1667	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1721	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668	MotionNotify, &ev))	1722	MotionNotify, &ev))
1669	;	1723	;
1670		1724
1671	XQueryPointer (dpy, scrollBar.win,	1725	XQueryPointer (dpy, scrollBar.win,
1672	&unused_root, &unused_child,	1726	&unused_root, &unused_child,
1673	&unused_root_x, &unused_root_y,	1727	&unused_root_x, &unused_root_y,
1674	&ev.xbutton.x, &ev.xbutton.y,	1728	&ev.xbutton.x, &ev.xbutton.y,
1675	&unused_mask);	1729	&unused_mask);
1676	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1730	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677	scrollBar.size ());	1731	scrollBar.size ());
1678	want_refresh = 1;	1732	want_refresh = 1;
1679	scrollBar.show (1);	1733	scrollBar.show (1);
1680	}	1734	}
1681	break;	1735	break;
1682	}	1736	}
1683		1737
1684	#if defined(CURSOR_BLINK)	1738	#if defined(CURSOR_BLINK)
1685	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1739	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 ();	1740	cursor_blink_reset ();
1694	}
1695	#endif	1741	#endif
1696		1742
1697	#if defined(POINTER_BLANK)	1743	#if defined(POINTER_BLANK)
1698	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1744	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699	{	1745	{
…		…
1710		1756
1711	refresh_check ();	1757	refresh_check ();
1712	}	1758	}
1713		1759
1714	#if ENABLE_FRILLS	1760	#if ENABLE_FRILLS
1715	void	1761	void ecb_cold
1716	rxvt_term::set_urgency (bool enable)	1762	rxvt_term::set_urgency (bool enable)
1717	{	1763	{
1718	if (enable == urgency_hint)	1764	if (enable == urgency_hint)
1719	return;	1765	return;
1720		1766
1721	if (XWMHints *h = XGetWMHints (dpy, parent))	1767	if (XWMHints *h = XGetWMHints (dpy, parent))
1722	{	1768	{
1723	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);	1769	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724	XSetWMHints (dpy, parent, h);	1770	XSetWMHints (dpy, parent, h);
1725	urgency_hint = enable;	1771	urgency_hint = enable;
		1772	XFree (h);
1726	}	1773	}
1727	}	1774	}
1728	#endif	1775	#endif
1729		1776
1730	void	1777	void ecb_cold
1731	rxvt_term::focus_in ()	1778	rxvt_term::focus_in ()
1732	{	1779	{
1733	if (!focus)	1780	if (!focus)
1734	{	1781	{
1735	focus = 1;	1782	focus = 1;
1736	want_refresh = 1;	1783	want_refresh = 1;
1737		1784
1738	#if USE_XIM	1785	#if USE_XIM
1739	if (Input_Context != NULL)	1786	if (Input_Context != NULL)
1740	{	1787	{
1741	IMSetPosition ();	1788	im_set_position ();
1742	XSetICFocus (Input_Context);	1789	XSetICFocus (Input_Context);
1743	}	1790	}
1744	#endif	1791	#endif
1745	#if CURSOR_BLINK	1792	#if CURSOR_BLINK
1746	if (option (Opt_cursorBlink))	1793	if (option (Opt_cursorBlink))
…		…
1760		1807
1761	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1808	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762	}	1809	}
1763	}	1810	}
1764		1811
1765	void	1812	void ecb_cold
1766	rxvt_term::focus_out ()	1813	rxvt_term::focus_out ()
1767	{	1814	{
1768	if (focus)	1815	if (focus)
1769	{	1816	{
1770	focus = 0;	1817	focus = 0;
…		…
1803		1850
1804	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1851	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805	}	1852	}
1806	}	1853	}
1807		1854
1808	void	1855	void ecb_cold
1809	rxvt_term::update_fade_color (unsigned int idx)	1856	rxvt_term::update_fade_color (unsigned int idx)
1810	{	1857	{
1811	#if OFF_FOCUS_FADING	1858	#if OFF_FOCUS_FADING
1812	if (rs[Rs_fade])	1859	if (rs[Rs_fade])
1813	{	1860	{
…		…
1816	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1863	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817	}	1864	}
1818	#endif	1865	#endif
1819	}	1866	}
1820		1867
1821	#if ENABLE_TRANSPARENCY || ENABLE_PERL	1868	#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822	void	1869	void ecb_hot
1823	rxvt_term::rootwin_cb (XEvent &ev)	1870	rxvt_term::rootwin_cb (XEvent &ev)
1824	{	1871	{
1825	make_current ();	1872	make_current ();
1826		1873
1827	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1874	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1875	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829	return;	1876	return;
1830		1877
1831	# if ENABLE_TRANSPARENCY
1832	switch (ev.type)	1878	switch (ev.type)
1833	{	1879	{
1834	case PropertyNotify:	1880	case PropertyNotify:
1835	/*	1881	/*
1836	* if user used some Esetroot compatible prog to set the root bg,	1882	* 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.	1883	* use the property to determine the pixmap. We use it later on.
1838	*/	1884	*/
1839	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1885	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1886	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841	{	1887	{
1842	bg_set_root_pixmap ();	1888	#if BG_IMAGE_FROM_ROOT
		1889	if (option (Opt_transparent))
		1890	{
		1891	rxvt_img::new_from_root (this)->replace (root_img);
1843	update_background ();	1892	update_background ();
		1893	}
		1894	#endif
		1895	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1844	}	1896	}
1845		1897
1846	break;	1898	break;
1847	}	1899	}
1848	# endif
1849		1900
1850	refresh_check ();	1901	refresh_check ();
1851	}	1902	}
1852	#endif	1903	#endif
1853		1904
…		…
1977	if (scrollBar.upButton (ev.y))	2028	if (scrollBar.upButton (ev.y))
1978	direction = UP; /* up */	2029	direction = UP; /* up */
1979	else if (scrollBar.dnButton (ev.y))	2030	else if (scrollBar.dnButton (ev.y))
1980	direction = DN; /* down */	2031	direction = DN; /* down */
1981		2032
1982	scrollBar.state = STATE_IDLE;	2033	scrollBar.state = SB_STATE_IDLE;
1983	/*	2034	/*
1984	* Rxvt-style scrollbar:	2035	* Rxvt-style scrollbar:
1985	* move up if mouse is above slider	2036	* move up if mouse is above slider
1986	* move dn if mouse is below slider	2037	* move dn if mouse is below slider
1987	*	2038	*
…		…
2026	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2077	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027	#endif	2078	#endif
2028	if (scr_page (direction, 1))	2079	if (scr_page (direction, 1))
2029	{	2080	{
2030	if (direction == UP)	2081	if (direction == UP)
2031	scrollBar.state = STATE_UP;	2082	scrollBar.state = SB_STATE_UP;
2032	else	2083	else
2033	scrollBar.state = STATE_DOWN;	2084	scrollBar.state = SB_STATE_DOWN;
2034	}	2085	}
2035	}	2086	}
2036	else	2087	else
2037	switch (ev.button)	2088	switch (ev.button)
2038	{	2089	{
2039	case Button2:	2090	case Button2:
2040	switch (scrollBar.align)	2091	switch (scrollBar.align)
2041	{	2092	{
2042	case R_SB_ALIGN_TOP:	2093	case SB_ALIGN_TOP:
2043	csrO = 0;	2094	csrO = 0;
2044	break;	2095	break;
2045	case R_SB_ALIGN_CENTRE:	2096	case SB_ALIGN_CENTRE:
2046	csrO = (scrollBar.bot - scrollBar.top) / 2;	2097	csrO = (scrollBar.bot - scrollBar.top) / 2;
2047	break;	2098	break;
2048	case R_SB_ALIGN_BOTTOM:	2099	case SB_ALIGN_BOTTOM:
2049	csrO = scrollBar.bot - scrollBar.top;	2100	csrO = scrollBar.bot - scrollBar.top;
2050	break;	2101	break;
2051	}	2102	}
2052		2103
2053	if (scrollBar.style == R_SB_XTERM	2104	if (scrollBar.style == SB_STYLE_XTERM
2054	|| scrollbar_above_slider (ev.y)	2105	|| scrollBar.above_slider (ev.y)
2055	|| scrollbar_below_slider (ev.y))	2106	|| scrollBar.below_slider (ev.y))
2056	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2107	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057		2108
2058	scrollBar.state = STATE_MOTION;	2109	scrollBar.state = SB_STATE_MOTION;
2059	break;	2110	break;
2060		2111
2061	case Button1:	2112	case Button1:
2062	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2113	if (scrollBar.align == SB_ALIGN_CENTRE)
2063	csrO = ev.y - scrollBar.top;	2114	csrO = ev.y - scrollBar.top;
2064	/* FALLTHROUGH */	2115	/* FALLTHROUGH */
2065		2116
2066	case Button3:	2117	case Button3:
2067	if (scrollBar.style != R_SB_XTERM)	2118	if (scrollBar.style != SB_STYLE_XTERM)
2068	{	2119	{
2069	if (scrollbar_above_slider (ev.y))	2120	if (scrollBar.above_slider (ev.y))
2070	# ifdef RXVT_SCROLL_FULL	2121	# ifdef RXVT_SCROLL_FULL
2071	scr_page (UP, nrow - 1);	2122	scr_page (UP, nrow - 1);
2072	# else	2123	# else
2073	scr_page (UP, nrow / 4);	2124	scr_page (UP, nrow / 4);
2074	# endif	2125	# endif
2075	else if (scrollbar_below_slider (ev.y))	2126	else if (scrollBar.below_slider (ev.y))
2076	# ifdef RXVT_SCROLL_FULL	2127	# ifdef RXVT_SCROLL_FULL
2077	scr_page (DN, nrow - 1);	2128	scr_page (DN, nrow - 1);
2078	# else	2129	# else
2079	scr_page (DN, nrow / 4);	2130	scr_page (DN, nrow / 4);
2080	# endif	2131	# endif
2081	else	2132	else
2082	scrollBar.state = STATE_MOTION;	2133	scrollBar.state = SB_STATE_MOTION;
2083	}	2134	}
2084	else	2135	else
2085	{	2136	{
2086	scr_page ((ev.button == Button1 ? DN : UP),	2137	scr_page ((ev.button == Button1 ? DN : UP),
2087	(nrow	2138	(nrow
2088	* scrollbar_position (ev.y)	2139	* scrollBar.position (ev.y)
2089	/ scrollBar.size ()));	2140	/ scrollBar.size ()));
2090	}	2141	}
2091		2142
2092	break;	2143	break;
2093	}	2144	}
…		…
2104		2155
2105	csrO = 0; /* reset csr Offset */	2156	csrO = 0; /* reset csr Offset */
2106	if (!bypass_keystate)	2157	if (!bypass_keystate)
2107	reportmode = !! (priv_modes & PrivMode_mouse_report);	2158	reportmode = !! (priv_modes & PrivMode_mouse_report);
2108		2159
2109	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2160	if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110	{	2161	{
2111	scrollBar.state = STATE_IDLE;	2162	scrollBar.state = SB_STATE_IDLE;
2112	scrollBar.show (0);	2163	scrollBar.show (0);
2113	}	2164	}
2114		2165
2115	#ifdef SELECTION_SCROLLING	2166	#ifdef SELECTION_SCROLLING
2116	sel_scroll_ev.stop();	2167	sel_scroll_ev.stop();
…		…
2166	case Button3:	2217	case Button3:
2167	selection_make (ev.time);	2218	selection_make (ev.time);
2168	break;	2219	break;
2169		2220
2170	case Button2:	2221	case Button2:
2171	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2222	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);	2223	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173	break;	2224	break;
2174		2225
2175	#ifdef MOUSE_WHEEL	2226	#ifdef MOUSE_WHEEL
2176	case Button4:	2227	case Button4:
2177	case Button5:	2228	case Button5:
2178	{	2229	{
2179	int i;	2230	int lines;
2180	page_dirn v;	2231	page_dirn dirn;
2181		2232
2182	v = ev.button == Button4 ? UP : DN;	2233	dirn = ev.button == Button4 ? UP : DN;
2183		2234
2184	if (ev.state & ShiftMask)	2235	if (ev.state & ShiftMask)
2185	i = 1;	2236	lines = 1;
2186	else if (option (Opt_mouseWheelScrollPage))	2237	else if (option (Opt_mouseWheelScrollPage))
2187	i = nrow - 1;	2238	lines = nrow - 1;
2188	else	2239	else
2189	i = 5;	2240	lines = 5;
2190		2241
2191	# ifdef MOUSE_SLIP_WHEELING	2242	# ifdef MOUSE_SLIP_WHEELING
2192	if (ev.state & ControlMask)	2243	if (ev.state & ControlMask)
2193	{	2244	{
2194	mouse_slip_wheel_speed += v ? -1 : 1;	2245	mouse_slip_wheel_speed += dirn;
2195	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2246	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2196	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2197		2247
2198	if (!slip_wheel_ev.is_active ())	2248	if (!slip_wheel_ev.is_active ())
2199	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2249	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2200	}	2250	}
2201	else	2251	else
2202	# endif	2252	# endif
2203	{	2253	{
2204	scr_page (v, i);	2254	scr_page (dirn, lines);
2205	scrollBar.show (1);	2255	scrollBar.show (1);
2206	}	2256	}
2207	}	2257	}
2208	break;	2258	break;
2209	#endif	2259	#endif
…		…
2211	}	2261	}
2212	}	2262	}
2213		2263
2214	/*}}} */	2264	/*}}} */
2215		2265
2216	void	2266	void ecb_hot
2217	rxvt_term::cmd_parse ()	2267	rxvt_term::cmd_parse ()
2218	{	2268	{
2219	wchar_t ch = NOCHAR;	2269	wchar_t ch = NOCHAR;
2220	char *seq_begin; // remember start of esc-sequence here	2270	char *seq_begin; // remember start of esc-sequence here
2221		2271
2222	for (;;)	2272	for (;;)
2223	{	2273	{
2224	if (expect_false (ch == NOCHAR))	2274	if (ecb_unlikely (ch == NOCHAR))
2225	{	2275	{
2226	seq_begin = cmdbuf_ptr;	2276	seq_begin = cmdbuf_ptr;
2227	ch = next_char ();	2277	ch = next_char ();
2228		2278
2229	if (ch == NOCHAR)	2279	if (ch == NOCHAR)
2230	break;	2280	break;
2231	}	2281	}
2232		2282
2233	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))	2283	if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234	{	2284	{
2235	if (expect_false (!seen_input))	2285	if (ecb_unlikely (!seen_input))
2236	{	2286	{
2237	seen_input = 1;	2287	seen_input = 1;
2238	// many badly-written programs (e.g. jed) contain a race condition:	2288	// many badly-written programs (e.g. jed) contain a race condition:
2239	// they first read the screensize and then install a SIGWINCH handler.	2289	// they first read the screensize and then install a SIGWINCH handler.
2240	// some window managers resize the window early, and these programs	2290	// some window managers resize the window early, and these programs
…		…
2253	wchar_t *str = buf;	2303	wchar_t *str = buf;
2254	wchar_t *eol = str + min (ncol, UBUFSIZ);	2304	wchar_t *eol = str + min (ncol, UBUFSIZ);
2255		2305
2256	for (;;)	2306	for (;;)
2257	{	2307	{
2258	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2308	if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259	break;	2309	break;
2260		2310
2261	*str++ = ch;	2311	*str++ = ch;
2262		2312
2263	if (expect_false (ch == C0_LF || str >= eol))	2313	if (ecb_unlikely (ch == C0_LF || str >= eol))
2264	{	2314	{
2265	if (ch == C0_LF)	2315	if (ch == C0_LF)
2266	nlines++;	2316	nlines++;
2267		2317
2268	refresh_count++;	2318	refresh_count++;
…		…
2340	}	2390	}
2341	}	2391	}
2342	}	2392	}
2343		2393
2344	// read the next character	2394	// read the next character
2345	wchar_t	2395	wchar_t ecb_hot
2346	rxvt_term::next_char () NOTHROW	2396	rxvt_term::next_char () NOTHROW
2347	{	2397	{
2348	while (cmdbuf_ptr < cmdbuf_endp)	2398	while (cmdbuf_ptr < cmdbuf_endp)
2349	{	2399	{
2350	// assume 7-bit to be ascii ALWAYS	2400	// assume 7-bit to be ascii ALWAYS
2351	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))	2401	if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352	return *cmdbuf_ptr++;	2402	return *cmdbuf_ptr++;
2353		2403
2354	wchar_t wc;	2404	wchar_t wc;
2355	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2405	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356		2406
…		…
2362	}	2412	}
2363		2413
2364	if (len == (size_t)-1)	2414	if (len == (size_t)-1)
2365	{	2415	{
2366	mbstate.reset (); // reset now undefined conversion state	2416	mbstate.reset (); // reset now undefined conversion state
		2417	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2418	// 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	2419	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368	}	2420	}
2369		2421
2370	// assume wchar == unicode	2422	// assume wchar == unicode
2371	cmdbuf_ptr += len;	2423	cmdbuf_ptr += len;
…		…
2374		2426
2375	return NOCHAR;	2427	return NOCHAR;
2376	}	2428	}
2377		2429
2378	// read the next octet	2430	// read the next octet
2379	uint32_t	2431	uint32_t ecb_hot
2380	rxvt_term::next_octet () NOTHROW	2432	rxvt_term::next_octet () NOTHROW
2381	{	2433	{
2382	return cmdbuf_ptr < cmdbuf_endp	2434	return cmdbuf_ptr < cmdbuf_endp
2383	? (unsigned char)*cmdbuf_ptr++	2435	? (unsigned char)*cmdbuf_ptr++
2384	: NOCHAR;	2436	: NOCHAR;
2385	}	2437	}
2386		2438
2387	static class out_of_input out_of_input;	2439	static class out_of_input out_of_input;
2388		2440
2389	wchar_t	2441	wchar_t ecb_hot
2390	rxvt_term::cmd_getc () THROW ((class out_of_input))	2442	rxvt_term::cmd_getc () THROW ((class out_of_input))
2391	{	2443	{
2392	wchar_t c = next_char ();	2444	wchar_t c = next_char ();
2393		2445
2394	if (c == NOCHAR)	2446	if (c == NOCHAR)
2395	throw out_of_input;	2447	throw out_of_input;
2396		2448
2397	return c;	2449	return c;
2398	}	2450	}
2399		2451
2400	uint32_t	2452	uint32_t ecb_hot
2401	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2453	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2402	{	2454	{
2403	uint32_t c = next_octet ();	2455	uint32_t c = next_octet ();
2404		2456
2405	if (c == NOCHAR)	2457	if (c == NOCHAR)
…		…
2409	}	2461	}
2410		2462
2411	/*{{{ print pipe */	2463	/*{{{ print pipe */
2412	/*----------------------------------------------------------------------*/	2464	/*----------------------------------------------------------------------*/
2413	#ifdef PRINTPIPE	2465	#ifdef PRINTPIPE
2414	FILE *	2466	FILE * ecb_cold
2415	rxvt_term::popen_printer ()	2467	rxvt_term::popen_printer ()
2416	{	2468	{
2417	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2469	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2418		2470
2419	if (stream == NULL)	2471	if (stream == NULL)
2420	rxvt_warn ("can't open printer pipe, not printing.\n");	2472	rxvt_warn ("can't open printer pipe, not printing.\n");
2421		2473
2422	return stream;	2474	return stream;
2423	}	2475	}
2424		2476
2425	int	2477	int ecb_cold
2426	rxvt_term::pclose_printer (FILE *stream)	2478	rxvt_term::pclose_printer (FILE *stream)
2427	{	2479	{
2428	fflush (stream);	2480	fflush (stream);
2429	return pclose (stream);	2481	return pclose (stream);
2430	}	2482	}
2431		2483
2432	/*	2484	/*
2433	* simulate attached vt100 printer	2485	* simulate attached vt100 printer
2434	*/	2486	*/
2435	void	2487	void ecb_cold
2436	rxvt_term::process_print_pipe ()	2488	rxvt_term::process_print_pipe ()
2437	{	2489	{
2438	FILE *fd = popen_printer ();	2490	FILE *fd = popen_printer ();
2439		2491
2440	if (!fd)	2492	if (!fd)
…		…
2495	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2547	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,	2548	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497	};	2549	};
2498		2550
2499	/*{{{ process non-printing single characters */	2551	/*{{{ process non-printing single characters */
2500	void	2552	void ecb_hot
2501	rxvt_term::process_nonprinting (unicode_t ch)	2553	rxvt_term::process_nonprinting (unicode_t ch)
2502	{	2554	{
2503	switch (ch)	2555	switch (ch)
2504	{	2556	{
2505	case C0_ESC:	2557	case C0_ESC:
…		…
2551	}	2603	}
2552	/*}}} */	2604	/*}}} */
2553		2605
2554		2606
2555	/*{{{ process VT52 escape sequences */	2607	/*{{{ process VT52 escape sequences */
2556	void	2608	void ecb_cold
2557	rxvt_term::process_escape_vt52 (unicode_t ch)	2609	rxvt_term::process_escape_vt52 (unicode_t ch)
2558	{	2610	{
2559	int row, col;	2611	int row, col;
2560		2612
2561	switch (ch)	2613	switch (ch)
…		…
2595	break;	2647	break;
2596	case 'Z': /* identify the terminal type */	2648	case 'Z': /* identify the terminal type */
2597	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2649	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598	break;	2650	break;
2599	case '<': /* turn off VT52 mode */	2651	case '<': /* turn off VT52 mode */
2600	set_privmode (PrivMode_vt52, 0);	2652	priv_modes &= ~PrivMode_vt52;
2601	break;	2653	break;
2602	case 'F': /* use special graphics character set */	2654	case 'F': /* use special graphics character set */
2603	case 'G': /* use regular character set */	2655	case 'G': /* use regular character set */
2604	/* unimplemented */	2656	/* unimplemented */
2605	break;	2657	break;
…		…
2611	}	2663	}
2612	/*}}} */	2664	/*}}} */
2613		2665
2614		2666
2615	/*{{{ process escape sequences */	2667	/*{{{ process escape sequences */
2616	void	2668	void ecb_hot
2617	rxvt_term::process_escape_seq ()	2669	rxvt_term::process_escape_seq ()
2618	{	2670	{
2619	unicode_t ch = cmd_getc ();	2671	unicode_t ch = cmd_getc ();
2620		2672
2621	if (priv_modes & PrivMode_vt52)	2673	if (priv_modes & PrivMode_vt52)
…		…
2656	#if !ENABLE_MINIMAL	2708	#if !ENABLE_MINIMAL
2657	case '9':	2709	case '9':
2658	scr_forwardindex ();	2710	scr_forwardindex ();
2659	break;	2711	break;
2660	#endif	2712	#endif
		2713	// DECPAM/DECPNM
2661	case '=':	2714	case '=':
		2715	priv_modes |= PrivMode_aplKP;
		2716	break;
2662	case '>':	2717	case '>':
2663	set_privmode (PrivMode_aplKP, ch == '=');	2718	priv_modes &= ~PrivMode_aplKP;
2664	break;	2719	break;
2665		2720
2666	case C1_40:	2721	case C1_40:
2667	cmd_getc ();	2722	cmd_getc ();
2668	break;	2723	break;
…		…
2672		2727
2673	/* 8.3.87: NEXT LINE */	2728	/* 8.3.87: NEXT LINE */
2674	case C1_NEL: /* ESC E */	2729	case C1_NEL: /* ESC E */
2675	{	2730	{
2676	wchar_t nlcr[] = { C0_LF, C0_CR };	2731	wchar_t nlcr[] = { C0_LF, C0_CR };
2677	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2732	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2678	}	2733	}
2679	break;	2734	break;
2680		2735
2681	/* kidnapped escape sequence: Should be 8.3.48 */	2736	/* kidnapped escape sequence: Should be 8.3.48 */
2682	case C1_ESA: /* ESC G */	2737	case C1_ESA: /* ESC G */
…		…
2770	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2825	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, */	2826	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, {, |, }, ~, */	2827	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2773	};	2828	};
2774		2829
2775	void	2830	void ecb_hot
2776	rxvt_term::process_csi_seq ()	2831	rxvt_term::process_csi_seq ()
2777	{	2832	{
2778	unicode_t ch, priv, i;	2833	unicode_t ch, priv, prev_ch, i;
2779	unsigned int nargs, p;	2834	unsigned int nargs, p;
2780	int n, ndef;	2835	int n, ndef;
2781	int arg[ESC_ARGS] = { };	2836	int arg[ESC_ARGS] = { };
2782		2837
2783	nargs = 0;	2838	nargs = 0;
…		…
2789	/* '<' '=' '>' '?' '!' */	2844	/* '<' '=' '>' '?' '!' */
2790	priv = ch;	2845	priv = ch;
2791	ch = cmd_getc ();	2846	ch = cmd_getc ();
2792	}	2847	}
2793		2848
		2849	prev_ch = 0;
2794	/* read any numerical arguments */	2850	/* read any numerical arguments */
2795	for (n = -1; ch < CSI_ICH; )	2851	for (n = -1; ch < CSI_ICH; )
2796	{	2852	{
2797	if (isdigit (ch))	2853	if (isdigit (ch))
2798	{	2854	{
…		…
2808	n = -1;	2864	n = -1;
2809	}	2865	}
2810	else if (IS_CONTROL (ch))	2866	else if (IS_CONTROL (ch))
2811	process_nonprinting (ch);	2867	process_nonprinting (ch);
2812		2868
		2869	prev_ch = ch;
2813	ch = cmd_getc ();	2870	ch = cmd_getc ();
2814	}	2871	}
2815		2872
2816	if (ch > CSI_7F)	2873	if (ch > CSI_7F)
2817	return;	2874	return;
…		…
2858	scr_soft_reset ();	2915	scr_soft_reset ();
2859		2916
2860	static const int pm_h[] = { 7, 25 };	2917	static const int pm_h[] = { 7, 25 };
2861	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2918	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2862		2919
2863	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2920	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2921	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2865	}	2922	}
2866	break;	2923	break;
2867	}	2924	}
2868		2925
2869	return;	2926	return;
…		…
2887	}	2944	}
2888	break;	2945	break;
2889	#endif	2946	#endif
2890		2947
2891	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2948	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2892	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2949	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2893	arg[0] = -arg[0];	2950	arg[0] = -arg[0];
2894	/* FALLTHROUGH */	2951	/* FALLTHROUGH */
2895	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2952	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2896	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2953	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2897	scr_gotorc (arg[0], 0, RELATIVE);	2954	scr_gotorc (arg[0], 0, RELATIVE);
2898	break;	2955	break;
2899		2956
2900	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2957	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2901	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2958	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3051	scr_insert_mode (1);	3108	scr_insert_mode (1);
3052	else if (arg[0] == 20)	3109	else if (arg[0] == 20)
3053	priv_modes |= PrivMode_LFNL;	3110	priv_modes |= PrivMode_LFNL;
3054	break;	3111	break;
3055		3112
		3113	case CSI_71: // DESCUSR: set cursor style
		3114	if (prev_ch == ' ')
		3115	set_cursor_style (arg[0]);
		3116	break;
		3117
3056	/*	3118	/*
3057	* PRIVATE USE beyond this point. All CSI_7? sequences here	3119	* PRIVATE USE beyond this point. All CSI_7? sequences here
3058	*/	3120	*/
3059	case CSI_72: /* DECSTBM: set top and bottom margins */	3121	case CSI_72: /* DECSTBM: set top and bottom margins */
3060	if (nargs == 1)	3122	if (nargs == 1)
…		…
3134	break;	3196	break;
3135		3197
3136	//case 9: NYI, TODO, restore maximized window or maximize window	3198	//case 9: NYI, TODO, restore maximized window or maximize window
3137	default:	3199	default:
3138	if (args[0] >= 24) /* set height (chars) */	3200	if (args[0] >= 24) /* set height (chars) */
3139	set_widthheight ((unsigned int)width,	3201	set_widthheight ((unsigned int)vt_width,
3140	(unsigned int) (args[1] * fheight));	3202	(unsigned int) (args[1] * fheight));
3141	break;	3203	break;
3142		3204
3143	/*	3205	/*
3144	* reports - some output format copied from XTerm	3206	* reports - some output format copied from XTerm
…		…
3193	rxvt_term::get_to_st (unicode_t &ends_how)	3255	rxvt_term::get_to_st (unicode_t &ends_how)
3194	{	3256	{
3195	unicode_t ch;	3257	unicode_t ch;
3196	bool seen_esc = false;	3258	bool seen_esc = false;
3197	unsigned int n = 0;	3259	unsigned int n = 0;
3198	wchar_t string[STRING_MAX];	3260	wchar_t string[CBUFSIZ];
3199		3261
3200	while ((ch = cmd_getc ()) != NOCHAR)	3262	while ((ch = cmd_getc ()) != NOCHAR)
3201	{	3263	{
3202	if (seen_esc)	3264	if (seen_esc)
3203	{	3265	{
…		…
3218	else if (ch < 0x20)	3280	else if (ch < 0x20)
3219	return NULL; /* other control character - exit */	3281	return NULL; /* other control character - exit */
3220		3282
3221	seen_esc = false;	3283	seen_esc = false;
3222		3284
3223	if (n >= STRING_MAX - 1)	3285	if (n >= sizeof (string) - 1)
3224	// stop at some sane length	3286	// stop at some sane length
3225	return NULL;	3287	return NULL;
3226		3288
3227	string[n++] = ch;	3289	string[n++] = ch;
3228	}	3290	}
…		…
3345	&nitems, &bytes_after, &value) == Success	3407	&nitems, &bytes_after, &value) == Success
3346	&& actual_type != None	3408	&& actual_type != None
3347	&& actual_format == 8)	3409	&& actual_format == 8)
3348	str = (const char *)(value);	3410	str = (const char *)(value);
3349		3411
3350	tt_printf ("\033]%d;%s%c", op, str, resp);	3412	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3351		3413
3352	XFree (value);	3414	XFree (value);
3353	}	3415	}
3354	else	3416	else
3355	{	3417	{
…		…
3423	break;	3485	break;
3424	#endif	3486	#endif
3425	case URxvt_Color_border:	3487	case URxvt_Color_border:
3426	process_color_seq (op, Color_border, str, resp);	3488	process_color_seq (op, Color_border, str, resp);
3427	break;	3489	break;
3428	#if ENABLE_TRANSPARENCY	3490
		3491	#if BG_IMAGE_FROM_ROOT
3429	case URxvt_Color_tint:	3492	case URxvt_Color_tint:
3430	process_color_seq (op, Color_tint, str, resp);	3493	process_color_seq (op, Color_tint, str, resp);
3431	{	3494	{
3432	bool changed = false;	3495	bool changed = false;
3433		3496
3434	if (ISSET_PIXCOLOR (Color_tint))	3497	if (ISSET_PIXCOLOR (Color_tint))
3435	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3498	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3436		3499
3437	if (changed)	3500	if (changed)
3438	update_background ();	3501	update_background ();
3439	}	3502	}
3440		3503
…		…
3444	#if BG_IMAGE_FROM_FILE	3507	#if BG_IMAGE_FROM_FILE
3445	case Rxvt_Pixmap:	3508	case Rxvt_Pixmap:
3446	if (!strcmp (str, "?"))	3509	if (!strcmp (str, "?"))
3447	{	3510	{
3448	char str[256];	3511	char str[256];
		3512	int h_scale = fimage.h_scale;
		3513	int v_scale = fimage.v_scale;
		3514	int h_align = fimage.h_align;
		3515	int v_align = fimage.v_align;
3449		3516
3450	sprintf (str, "[%dx%d+%d+%d]",	3517	sprintf (str, "[%dx%d+%d+%d]",
3451	min (h_scale, 32767), min (v_scale, 32767),	3518	h_scale, v_scale,
3452	min (h_align, 32767), min (v_align, 32767));	3519	h_align, v_align);
3453	process_xterm_seq (XTerm_title, str, CHAR_ST);	3520	process_xterm_seq (XTerm_title, str, CHAR_ST);
3454	}	3521	}
3455	else	3522	else
3456	{	3523	{
3457	int changed = 0;	3524	bool changed = false;
3458		3525
3459	if (*str != ';')	3526	if (*str != ';')
3460	{	3527	{
3461	if (bg_set_file (str)) /* change pixmap */	3528	try
3462	{	3529	{
		3530	fimage.set_file_geometry (this, str);
3463	changed++;	3531	changed = true;
3464	str = strchr (str, ';');
3465	if (str == NULL)
3466	bg_set_default_geometry ();
3467	else	3532	}
3468	bg_set_geometry (str+1);	3533	catch (const class rxvt_failure_exception &e)
		3534	{
3469	}	3535	}
3470	}	3536	}
3471	else	3537	else
3472	{	3538	{
3473	str++;	3539	str++;
3474	if (bg_set_geometry (str, true))	3540	if (fimage.set_geometry (str, true))
3475	changed++;	3541	changed = true;
3476	}	3542	}
3477		3543
3478	if (changed)	3544	if (changed)
3479	{	3545	{
3480	if (bg_window_position_sensitive ())	3546	if (bg_window_position_sensitive ())
3481	{	3547	{
3482	int x, y;	3548	int x, y;
3483	get_window_origin (x, y);	3549	get_window_origin (x, y);
3484	bg_set_position (x, y);	3550	parent_x = x;
		3551	parent_y = y;
3485	}	3552	}
3486	update_background ();	3553	update_background ();
3487	}	3554	}
3488	}	3555	}
3489	break;	3556	break;
…		…
3579	* 's' = save	3646	* 's' = save
3580	* 'r' = restore	3647	* 'r' = restore
3581	* 't' = toggle	3648	* 't' = toggle
3582	* so no need for fancy checking	3649	* so no need for fancy checking
3583	*/	3650	*/
3584	int	3651	int ecb_cold
3585	rxvt_term::privcases (int mode, unsigned long bit)	3652	rxvt_term::privcases (int mode, unsigned long bit)
3586	{	3653	{
3587	int state;	3654	int state;
3588		3655
3589	if (mode == 's')	3656	if (mode == 's')
3590	{	3657	{
3591	SavedModes |= (priv_modes & bit);	3658	if (priv_modes & bit)
		3659	SavedModes |= bit;
		3660	else
		3661	SavedModes &= ~bit;
3592	return -1;	3662	return -1;
3593	}	3663	}
3594	else	3664	else
3595	{	3665	{
3596	if (mode == 'r')	3666	if (mode == 'r')
3597	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3667	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3598	else	3668	else
3599	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3669	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3600		3670
3601	set_privmode (bit, state);	3671	if (state)
		3672	priv_modes |= bit;
		3673	else
		3674	priv_modes &= ~bit;
3602	}	3675	}
3603		3676
3604	return state;	3677	return state;
3605	}	3678	}
3606		3679
3607	/* we're not using priv _yet_ */	3680	/* we're not using priv _yet_ */
3608	void	3681	void
3609	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3682	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3610	{	3683	{
3611	unsigned int i, j;	3684	unsigned int i, j;
3612	int state;	3685	int state;
3613		3686
3614	static const struct	3687	static const struct
3615	{	3688	{
3616	const int argval;	3689	const int argval;
3617	const unsigned long bit;	3690	const unsigned long bit;
3618	} argtopriv[] = {	3691	} argtopriv[] = {
3619	{ 1, PrivMode_aplCUR }, // DECCKM	3692	{ 1, PrivMode_aplCUR }, // DECCKM
3620	{ 2, PrivMode_vt52 },	3693	{ 2, PrivMode_vt52 }, // DECANM
3621	{ 3, PrivMode_132 }, // DECCOLM	3694	{ 3, PrivMode_132 }, // DECCOLM
3622	{ 4, PrivMode_smoothScroll }, // DECSCLM	3695	{ 4, PrivMode_smoothScroll }, // DECSCLM
3623	{ 5, PrivMode_rVideo }, // DECSCNM	3696	{ 5, PrivMode_rVideo }, // DECSCNM
3624	{ 6, PrivMode_relOrigin }, // DECOM	3697	{ 6, PrivMode_relOrigin }, // DECOM
3625	{ 7, PrivMode_Autowrap }, // DECAWM	3698	{ 7, PrivMode_Autowrap }, // DECAWM
3626	// 8, auto-repeat keys // DECARM	3699	// 8, auto-repeat keys // DECARM
3627	{ 9, PrivMode_MouseX10 },	3700	{ 9, PrivMode_MouseX10 },
3628	// 18 end FF to printer after print screen	3701	// 18 end FF to printer after print screen
3629	// 19 Print screen prints full screen/scroll region	3702	// 19 Print screen prints full screen/scroll region
3630	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3703	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631	#ifdef scrollBar_esc	3704	#ifdef scrollBar_esc
3632	{ scrollBar_esc, PrivMode_scrollBar },	3705	{ scrollBar_esc, PrivMode_scrollBar },
3633	#endif	3706	#endif
3634	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3707	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3635	// 38, tektronix mode // DECTEK	3708	// 38, tektronix mode // DECTEK
3636	{ 40, PrivMode_132OK },	3709	{ 40, PrivMode_132OK },
3637	// 41 xterm more fixes NYI	3710	// 41 xterm more fixes NYI
3638	// 45 margin bell NYI	3711	// 45 margin bell NYI
3639	// 46 start logging	3712	// 46 start logging
3640	{ 47, PrivMode_Screen },	3713	{ 47, PrivMode_Screen },
3641	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3714	{ 66, PrivMode_aplKP }, // DECNKM
3642	#ifndef NO_BACKSPACE_KEY	3715	#ifndef NO_BACKSPACE_KEY
3643	{ 67, PrivMode_BackSpace }, // DECBKM	3716	{ 67, PrivMode_BackSpace }, // DECBKM
3644	#endif	3717	#endif
3645	{ 1000, PrivMode_MouseX11 },	3718	{ 1000, PrivMode_MouseX11 },
3646	{ 1002, PrivMode_MouseBtnEvent },	3719	{ 1002, PrivMode_MouseBtnEvent },
…		…
3675	for (i = 0; i < nargs; i++)	3748	for (i = 0; i < nargs; i++)
3676	{	3749	{
3677	state = -1;	3750	state = -1;
3678		3751
3679	/* basic handling */	3752	/* basic handling */
3680	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3753	for (j = 0; j < ecb_array_length (argtopriv); j++)
3681	if (argtopriv[j].argval == arg[i])	3754	if (argtopriv[j].argval == arg[i])
3682	{	3755	{
3683	state = privcases (mode, argtopriv[j].bit);	3756	state = privcases (mode, argtopriv[j].bit);
3684	break;	3757	break;
3685	}	3758	}
…		…
3711	case 2: /* VT52 mode */	3784	case 2: /* VT52 mode */
3712	/* oddball mode. should be set regardless of set/reset	3785	/* oddball mode. should be set regardless of set/reset
3713	* parameter. Return from VT52 mode with an ESC < from	3786	* parameter. Return from VT52 mode with an ESC < from
3714	* within VT52 mode	3787	* within VT52 mode
3715	*/	3788	*/
3716	set_privmode (PrivMode_vt52, 1);	3789	priv_modes |= PrivMode_vt52;
3717	break;	3790	break;
3718	case 3: /* 80/132 */	3791	case 3: /* 80/132 */
3719	if (priv_modes & PrivMode_132OK)	3792	if (priv_modes & PrivMode_132OK)
3720	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3793	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3721	break;	3794	break;
…		…
3736	if (state) /* orthogonal */	3809	if (state) /* orthogonal */
3737	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3810	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3738	break;	3811	break;
3739	#ifdef scrollBar_esc	3812	#ifdef scrollBar_esc
3740	case scrollBar_esc:	3813	case scrollBar_esc:
3741	if (scrollBar.map (state))	3814	scrollBar.map (state);
3742	{
3743	resize_all_windows (0, 0, 0);	3815	resize_all_windows (0, 0, 0);
3744	scr_touch (true);	3816	scr_touch (true);
3745	}
3746	break;	3817	break;
3747	#endif	3818	#endif
3748	case 25: /* visible/invisible cursor */	3819	case 25: /* visible/invisible cursor */
3749	scr_cursor_visible (state);	3820	scr_cursor_visible (state);
3750	break;	3821	break;
…		…
3805	}	3876	}
3806	}	3877	}
3807	/*}}} */	3878	/*}}} */
3808		3879
3809	/*{{{ process sgr sequences */	3880	/*{{{ process sgr sequences */
3810	void	3881	void ecb_hot
3811	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3882	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3812	{	3883	{
3813	unsigned int i;	3884	unsigned int i;
3814	short rendset;	3885	short rendset;
3815	int rendstyle;	3886	int rendstyle;
…		…
3956	break;	4027	break;
3957	#endif	4028	#endif
3958	}	4029	}
3959	}	4030	}
3960	}	4031	}
		4032
		4033	void
		4034	rxvt_term::set_cursor_style (int style)
		4035	{
		4036	if (!IN_RANGE_INC (style, 0, 4))
		4037	return;
		4038
		4039	set_option (Opt_cursorUnderline, style >= 3);
		4040
		4041	#ifdef CURSOR_BLINK
		4042	set_option (Opt_cursorBlink, !style || (style & 1));
		4043	cursor_blink_reset ();
		4044	#endif
		4045
		4046	want_refresh = 1;
		4047	}
3961	/*}}} */	4048	/*}}} */
3962		4049
3963	/* ------------------------------------------------------------------------- */	4050	/* ------------------------------------------------------------------------- */
3964		4051
3965	/*	4052	/*

Diff Legend

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