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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 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
…		…
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 ecb_cold	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)
…		…
311	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
312	XK_KP_4, // XK_KP_Left	316	XK_KP_4, // XK_KP_Left
313	XK_KP_8, // XK_KP_Up	317	XK_KP_8, // XK_KP_Up
314	XK_KP_6, // XK_KP_Right	318	XK_KP_6, // XK_KP_Right
315	XK_KP_2, // XK_KP_Down	319	XK_KP_2, // XK_KP_Down
316	# ifndef UNSHIFTED_SCROLLKEYS
317	XK_KP_9, // XK_KP_Prior	320	XK_KP_9, // XK_KP_Prior
318	XK_KP_3, // XK_KP_Next	321	XK_KP_3, // XK_KP_Next
319	# else
320	XK_Prior,
321	XK_Next,
322	# endif
323	XK_KP_1, // XK_KP_End	322	XK_KP_1, // XK_KP_End
324	XK_KP_5, // XK_KP_Begin	323	XK_KP_5, // XK_KP_Begin
325	};	324	};
326		325
327	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))	326	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
…		…
372	param = 3;	371	param = 3;
373	break;	372	break;
374	case XK_Select:	373	case XK_Select:
375	param = 4;	374	param = 4;
376	break;	375	break;
377	#ifndef UNSHIFTED_SCROLLKEYS
378	case XK_Prior:	376	case XK_Prior:
379	param = 5;	377	param = 5;
380	break;	378	break;
381	case XK_Next:	379	case XK_Next:
382	param = 6;	380	param = 6;
…		…
385	param = 7;	383	param = 7;
386	break;	384	break;
387	case XK_End:	385	case XK_End:
388	param = 8;	386	param = 8;
389	break;	387	break;
390	#endif
391	case XK_Help:	388	case XK_Help:
392	param = 28;	389	param = 28;
393	break;	390	break;
394	case XK_Menu:	391	case XK_Menu:
395	param = 29;	392	param = 29;
396	break;	393	break;
397	}	394	}
398	return param;	395	return param;
399	}	396	}
400		397
		398	static inline wchar_t *
		399	rxvt_wcsdup (const wchar_t *str, int len)
		400	{
		401	wchar_t r = (wchar_t )rxvt_malloc ((len + 1) * sizeof (wchar_t));
		402	memcpy (r, str, len * sizeof (wchar_t));
		403	r[len] = 0;
		404	return r;
		405	}
		406
401	void ecb_cold	407	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	408	rxvt_term::key_press (XKeyEvent &ev)
403	{	409	{
404	int ctrl, meta, shft, len;	410	int ctrl, meta, shft, len;
405	KeySym keysym;	411	KeySym keysym = NoSymbol;
406	int valid_keysym;
407	char kbuf[KBUFSZ];	412	char rkbuf[KBUFSZ + 1];
		413	char *kbuf = rkbuf + 1;
408		414
409	#if ISO_14755	415	#if ISO_14755
410	if (iso14755buf & ISO_14755_52)	416	if (iso14755buf & ISO_14755_52)
411	return;	417	return;
412	#endif	418	#endif
…		…
469	}	475	}
470	}	476	}
471	else	477	else
472	len = 0;	478	len = 0;
473	}	479	}
474
475	valid_keysym = status_return == XLookupKeySym
476	\|\| status_return == XLookupBoth;
477	}	480	}
478	else	481	else
479	#endif	482	#endif
480	{	483	{
481	len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);	484	len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482	valid_keysym = keysym != NoSymbol;	485	}
		486
		487	if (keysym != NoSymbol)
483	}	488	{
		489	KeySym orig_keysym = keysym;
484		490
485	if (valid_keysym)	491	/* Shift + F1 - F10 generates F11 - F20 */
		492	if (shft && keysym >= XK_F1 && keysym <= XK_F10)
		493	{
		494	keysym += (XK_F11 - XK_F1);
		495	shft = 0; /* turn off Shift */
		496	}
		497
		498	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
		499	{
		500	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		501	unsigned int newlen = 1;
		502
		503	if (ev.state & ModNumLockMask)
		504	kp = false;
		505
		506	keysym = translate_keypad (keysym, kp);
		507
		508	switch (keysym)
		509	{
		510	#ifndef NO_BACKSPACE_KEY
		511	case XK_BackSpace:
		512	if (priv_modes & PrivMode_HaveBackSpace)
		513	{
		514	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
		515	^ !!ctrl) ? '\b' : '\177';
		516	kbuf[1] = '\0';
		517	}
		518	else
		519	strcpy (kbuf, rs[Rs_backspace_key]);
		520	break;
		521	#endif
		522	#ifndef NO_DELETE_KEY
		523	case XK_Delete:
		524	strcpy (kbuf, rs[Rs_delete_key]);
		525	break;
		526	#endif
		527	case XK_Tab:
		528	if (shft)
		529	strcpy (kbuf, "\033[Z");
		530	else
		531	{
		532	#ifdef CTRL_TAB_MAKES_META
		533	if (ctrl)
		534	meta = 1;
		535	#endif
		536	#ifdef MOD4_TAB_MAKES_META
		537	if (ev.state & Mod4Mask)
		538	meta = 1;
		539	#endif
		540	newlen = 0;
		541	}
		542	break;
		543
		544	case XK_Up: /* "\033[A" */
		545	case XK_Down: /* "\033[B" */
		546	case XK_Right: /* "\033[C" */
		547	case XK_Left: /* "\033[D" */
		548	strcpy (kbuf, "\033[Z");
		549	kbuf[2] = "DACB"[keysym - XK_Left];
		550	/* do Shift first */
		551	if (shft)
		552	kbuf[2] = "dacb"[keysym - XK_Left];
		553	else if (ctrl)
		554	{
		555	kbuf[1] = 'O';
		556	kbuf[2] = "dacb"[keysym - XK_Left];
		557	}
		558	else if (priv_modes & PrivMode_aplCUR)
		559	kbuf[1] = 'O';
		560	break;
		561
		562	case XK_KP_Enter:
		563	/* allow shift to override */
		564	if (kp)
		565	{
		566	strcpy (kbuf, "\033OM");
		567	break;
		568	}
		569
		570	/* FALLTHROUGH */
		571
		572	case XK_Return:
		573	if (priv_modes & PrivMode_LFNL)
		574	{
		575	kbuf[0] = '\015';
		576	kbuf[1] = '\012';
		577	kbuf[2] = '\0';
		578	}
		579	else
		580	{
		581	kbuf[0] = '\015';
		582	kbuf[1] = '\0';
		583	}
		584	break;
		585
		586	case XK_KP_F1: /* "\033OP" */
		587	case XK_KP_F2: /* "\033OQ" */
		588	case XK_KP_F3: /* "\033OR" */
		589	case XK_KP_F4: /* "\033OS" */
		590	strcpy (kbuf, "\033OP");
		591	kbuf[2] += (keysym - XK_KP_F1);
		592	break;
		593
		594	case XK_KP_Multiply: /* "\033Oj" : "" /
		595	case XK_KP_Add: /* "\033Ok" : "+" */
		596	case XK_KP_Separator: /* "\033Ol" : "," */
		597	case XK_KP_Subtract: /* "\033Om" : "-" */
		598	case XK_KP_Decimal: /* "\033On" : "." */
		599	case XK_KP_Divide: /* "\033Oo" : "/" */
		600	case XK_KP_0: /* "\033Op" : "0" */
		601	case XK_KP_1: /* "\033Oq" : "1" */
		602	case XK_KP_2: /* "\033Or" : "2" */
		603	case XK_KP_3: /* "\033Os" : "3" */
		604	case XK_KP_4: /* "\033Ot" : "4" */
		605	case XK_KP_5: /* "\033Ou" : "5" */
		606	case XK_KP_6: /* "\033Ov" : "6" */
		607	case XK_KP_7: /* "\033Ow" : "7" */
		608	case XK_KP_8: /* "\033Ox" : "8" */
		609	case XK_KP_9: /* "\033Oy" : "9" */
		610	/* allow shift to override */
		611	if (kp)
		612	{
		613	strcpy (kbuf, "\033Oj");
		614	kbuf[2] += (keysym - XK_KP_Multiply);
		615	}
		616	else
		617	{
		618	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
		619	kbuf[1] = '\0';
		620	}
		621	break;
		622
		623	default:
		624	{
		625	int param = map_function_key (keysym);
		626	if (param > 0)
		627	sprintf (kbuf,"\033[%d~", param);
		628	else
		629	newlen = 0;
		630	}
		631	break;
		632	}
		633
		634	if (newlen)
		635	len = strlen (kbuf);
		636
		637	if (len > 0)
		638	{
		639	/*
		640	* pass Shift/Control indicators for function keys ending with `~'
		641	*
		642	* eg,
		643	* Prior = "ESC[5~"
		644	* Shift+Prior = "ESC[5$"
		645	* Ctrl+Prior = "ESC[5^"
		646	* Ctrl+Shift+Prior = "ESC[5@"
		647	*/
		648	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		649	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		650
		651	/*
		652	* Pass meta for all function keys, if 'meta' option set
		653	*/
		654	#ifdef META8_OPTION
		655	if (meta && (meta_char == 0x80))
		656	kbuf[len - 1] \|= 0x80;
		657	#endif
		658	}
		659
		660	}
		661	else if (ctrl && keysym == XK_minus)
		662	{
		663	len = 1;
		664	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		665	}
		666	else if (keysym == XK_ISO_Left_Tab)
		667	{
		668	strcpy (kbuf, "\033[Z");
		669	len = 3;
		670	}
		671	else
		672	{
		673	#ifdef META8_OPTION
		674	/* set 8-bit on */
		675	if (meta && (meta_char == 0x80))
		676	{
		677	char *ch;
		678
		679	for (ch = kbuf; ch < kbuf + len; ch++)
		680	*ch \|= 0x80;
		681
		682	meta = 0;
		683	}
		684	#endif
		685	/* nil */ ;
		686	}
		687
		688	keysym = orig_keysym;
		689	}
		690
		691	/* escape prefix */
		692	if (len && meta
		693	#ifdef META8_OPTION
		694	&& meta_char == C0_ESC
		695	#endif
		696	)
		697	{
		698	*--kbuf = C0_ESC;
		699	len++;
		700	}
		701
		702	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		703	return;
		704
		705	if (keysym != NoSymbol)
486	{	706	{
487	#ifdef KEYSYM_RESOURCE	707	#ifdef KEYSYM_RESOURCE
488	if (keyboard->dispatch (this, keysym, ev.state))	708	if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489	return;	709	return;
490	#endif	710	#endif
491		711
492	if (saveLines)	712	if (saveLines)
493	{	713	{
…		…
506	#endif	726	#endif
507	max_it (lnsppg, 1);	727	max_it (lnsppg, 1);
508		728
509	if (keysym == XK_Prior)	729	if (keysym == XK_Prior)
510	{	730	{
511	scr_page (UP, lnsppg);	731	scr_page (lnsppg);
512	return;	732	return;
513	}	733	}
514	else if (keysym == XK_Next)	734	else if (keysym == XK_Next)
515	{	735	{
516	scr_page (DN, lnsppg);	736	scr_page (-lnsppg);
517	return;	737	return;
518	}	738	}
519	}	739	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	740	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	741	if (IS_SCROLL_MOD)
522	{	742	{
523	if (keysym == XK_Up)	743	if (keysym == XK_Up)
524	{	744	{
525	scr_page (UP, 1);	745	scr_page (1);
526	return;	746	return;
527	}	747	}
528	else if (keysym == XK_Down)	748	else if (keysym == XK_Down)
529	{	749	{
530	scr_page (DN, 1);	750	scr_page (-1);
531	return;	751	return;
532	}	752	}
533	}	753	}
534	#endif	754	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	755	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	756	if (IS_SCROLL_MOD)
537	{	757	{
538	if (keysym == XK_Home)	758	if (keysym == XK_Home)
539	{	759	{
540	scr_move_to (0, 1);	760	scr_changeview (top_row);
541	return;	761	return;
542	}	762	}
543	else if (keysym == XK_End)	763	else if (keysym == XK_End)
544	{	764	{
545	scr_move_to (1, 1);	765	scr_changeview (0);
546	return;	766	return;
547	}	767	}
548	}	768	}
549	#endif	769	#endif
550	}	770	}
551		771
552	if (shft)	772	if (shft)
553	{	773	{
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))	774	if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561	{	775	{
562	switch (keysym)	776	switch (keysym)
563	{	777	{
564	/* normal XTerm key bindings */	778	/* normal XTerm key bindings */
565	case XK_Insert: /* Shift+Insert = paste mouse selection */	779	case XK_Insert: /* Shift+Insert = paste mouse selection */
…		…
572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	786	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573	return;	787	return;
574	#endif	788	#endif
575	}	789	}
576	}	790	}
		791	}
		792
		793	if (ctrl && meta && (keysym == XK_c \|\| keysym == XK_v))
		794	{
		795	if (keysym == XK_v)
		796	selection_request (ev.time, Sel_Clipboard);
		797	else if (selection.len > 0)
		798	{
		799	free (selection.clip_text);
		800	selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
		801	selection.clip_len = selection.len;
		802	selection_grab (CurrentTime, true);
		803	}
		804
		805	return;
577	}	806	}
578		807
579	#if ENABLE_FRILLS \|\| ISO_14755	808	#if ENABLE_FRILLS \|\| ISO_14755
580	// ISO 14755 support	809	// ISO 14755 support
581	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))	810	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
…		…
636	{	865	{
637	scr_printscreen (ctrl \| shft);	866	scr_printscreen (ctrl \| shft);
638	return;	867	return;
639	}	868	}
640	#endif	869	#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	if (len > 0)
782	{
783	/*
784	* pass Shift/Control indicators for function keys ending with `~'
785	*
786	* eg,
787	* Prior = "ESC[5~"
788	* Shift+Prior = "ESC[5$"
789	* Ctrl+Prior = "ESC[5^"
790	* Ctrl+Shift+Prior = "ESC[5@"
791	*/
792	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795	/*
796	* Pass meta for all function keys, if 'meta' option set
797	*/
798	#ifdef META8_OPTION
799	if (meta && (meta_char == 0x80))
800	kbuf[len - 1] \|= 0x80;
801	#endif
802	}
803
804	}
805	else if (ctrl && keysym == XK_minus)
806	{
807	len = 1;
808	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809	}
810	else if (keysym == XK_ISO_Left_Tab)
811	{
812	strcpy (kbuf, "\033[Z");
813	len = 3;
814	}
815	else
816	{
817	#ifdef META8_OPTION
818	/* set 8-bit on */
819	if (meta && (meta_char == 0x80))
820	{
821	char *ch;
822
823	for (ch = kbuf; ch < kbuf + len; ch++)
824	*ch \|= 0x80;
825
826	meta = 0;
827	}
828	#endif
829	/* nil */ ;
830	}
831	}	870	}
832
833	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834	return;
835		871
836	if (len <= 0)	872	if (len <= 0)
837	return; /* not mapped */	873	return; /* not mapped */
838		874
839	if (option (Opt_scrollTtyKeypress))
840	if (view_start)
841	{
842	view_start = 0;
843	want_refresh = 1;
844	}
845
846	/* escape prefix */
847	if (meta
848	#ifdef META8_OPTION
849	&& meta_char == C0_ESC
850	#endif
851	)
852	{
853	const char ch = C0_ESC;
854	tt_write (&ch, 1);
855	}
856
857	tt_write (kbuf, (unsigned int)len);	875	tt_write_user_input (kbuf, (unsigned int)len);
858	}	876	}
859		877
860	void ecb_cold	878	void ecb_cold
861	rxvt_term::key_release (XKeyEvent &ev)	879	rxvt_term::key_release (XKeyEvent &ev)
862	{	880	{
…		…
937	void	955	void
938	rxvt_term::flush ()	956	rxvt_term::flush ()
939	{	957	{
940	flush_ev.stop ();	958	flush_ev.stop ();
941		959
942	#ifdef HAVE_BG_PIXMAP	960	#ifdef HAVE_IMG
943	if (bg_flags & BG_NEEDS_REFRESH)	961	if (bg_flags & BG_NEEDS_REFRESH)
944	{	962	{
945	bg_flags &= ~BG_NEEDS_REFRESH;	963	bg_flags &= ~BG_NEEDS_REFRESH;
946	scr_touch (false);	964	scr_touch (false);
947	}	965	}
…		…
1073		1091
1074	#ifdef SELECTION_SCROLLING	1092	#ifdef SELECTION_SCROLLING
1075	void	1093	void
1076	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1094	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077	{	1095	{
1078	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1096	if (scr_page (scroll_selection_lines))
1079	{	1097	{
1080	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1098	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081	want_refresh = 1;	1099	want_refresh = 1;
1082	refresh_check ();	1100	refresh_check ();
1083	}	1101	}
…		…
1088		1106
1089	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1107	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090	void	1108	void
1091	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1109	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092	{	1110	{
1093	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1111	if (scr_page (mouse_slip_wheel_speed))
1094	{	1112	{
1095	want_refresh = 1;	1113	want_refresh = 1;
1096	refresh_check ();	1114	refresh_check ();
1097	}	1115	}
1098		1116
…		…
1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1481	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464	;	1482	;
1465		1483
1466	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);	1484	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467		1485
		1486	bool moved = false;
1468	#ifdef HAVE_BG_PIXMAP	1487	#ifdef HAVE_BG_PIXMAP
1469	if (bg_window_position_sensitive ())	1488	if (bg_window_position_sensitive ())
		1489	{
1470	want_position_change = true;	1490	want_position_change = true;
		1491	if (bg_img == 0)
		1492	moved = true;
		1493	}
1471	#endif	1494	#endif
1472
1473	bool moved = false;
1474		1495
1475	if (want_position_change)	1496	if (want_position_change)
1476	{	1497	{
1477	int x, y;	1498	int x, y;
1478		1499
…		…
1484	else	1505	else
1485	get_window_origin (x, y);	1506	get_window_origin (x, y);
1486		1507
1487	if (x != parent_x \|\| y != parent_y)	1508	if (x != parent_x \|\| y != parent_y)
1488	{	1509	{
1489	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490	parent_x = x;	1510	parent_x = x;
1491	parent_y = y;	1511	parent_y = y;
		1512	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1513	moved = true;
1492	}	1514	}
1493
1494	if (bg_set_position (x, y)
1495	\|\| !(bg_flags & BG_IS_VALID))
1496	moved = true;
1497	}	1515	}
1498		1516
1499	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1517	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1500	{	1518	{
1501	seen_resize = 1;	1519	seen_resize = 1;
…		…
1525	selection_send (ev.xselectionrequest);	1543	selection_send (ev.xselectionrequest);
1526	break;	1544	break;
1527		1545
1528	case MapNotify:	1546	case MapNotify:
1529	#ifdef HAVE_BG_PIXMAP	1547	#ifdef HAVE_BG_PIXMAP
1530	/* This is needed specifically to fix the case of no window manager or a	1548	// This is needed at startup for the case of no window manager
1531	* non-reparenting window manager. In those cases we never get first	1549	// or a non-reparenting window manager and also because we
1532	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1550	// defer bg image updates if the window is not mapped. The
1533	* care of multiplicity of ConfigureNotify events arriving while WM does	1551	// short delay is to optimize for multiple ConfigureNotify
1534	* reparenting.	1552	// events at startup when the window manager reparents the
1535	* We should not render background immediately, as there could be several	1553	// window, so as to perform the computation after we have
1536	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1554	// received all of them.
1537	* by scheduling background redraw as soon as we can, but giving a short	1555	if (bg_img == 0)
1538	* bit of time for ConfigureNotifies to arrive.
1539	* We should render background PRIOR to drawing any text, but AFTER all
1540	* of ConfigureNotifys for the best results.
1541	*/
1542	if (!(bg_flags & BG_IS_VALID))
1543	update_background_ev.start (0.025);	1556	update_background_ev.start (0.025);
1544	#endif	1557	#endif
1545	mapped = 1;	1558	mapped = 1;
1546	#ifdef TEXT_BLINK	1559	#ifdef TEXT_BLINK
1547	text_blink_ev.start ();	1560	text_blink_ev.start ();
…		…
1639		1652
1640	#ifdef SELECTION_SCROLLING	1653	#ifdef SELECTION_SCROLLING
1641	if (ev.xbutton.y < int_bwidth	1654	if (ev.xbutton.y < int_bwidth
1642	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1655	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1643	{	1656	{
		1657	page_dirn scroll_selection_dir;
1644	int dist;	1658	int dist;
1645		1659
1646	/* don't clobber the current delay if we are	1660	/* don't clobber the current delay if we are
1647	* already in the middle of scrolling.	1661	* already in the middle of scrolling.
1648	*/	1662	*/
…		…
1671	scroll_selection_lines = Pixel2Height (dist)	1685	scroll_selection_lines = Pixel2Height (dist)
1672	/ SELECTION_SCROLL_LINE_SPEEDUP	1686	/ SELECTION_SCROLL_LINE_SPEEDUP
1673	+ 1;	1687	+ 1;
1674	min_it (scroll_selection_lines,	1688	min_it (scroll_selection_lines,
1675	SELECTION_SCROLL_MAX_LINES);	1689	SELECTION_SCROLL_MAX_LINES);
		1690	scroll_selection_lines *= scroll_selection_dir;
1676	}	1691	}
1677	else	1692	else
1678	{	1693	{
1679	/* we are within the text window, so we	1694	/* we are within the text window, so we
1680	* shouldn't be scrolling	1695	* shouldn't be scrolling
…		…
1834	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1849	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1835	}	1850	}
1836	#endif	1851	#endif
1837	}	1852	}
1838		1853
1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1854	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1840	void ecb_hot	1855	void ecb_hot
1841	rxvt_term::rootwin_cb (XEvent &ev)	1856	rxvt_term::rootwin_cb (XEvent &ev)
1842	{	1857	{
1843	make_current ();	1858	make_current ();
1844		1859
1845	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1860	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1846	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1861	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1847	return;	1862	return;
1848		1863
1849	# if ENABLE_TRANSPARENCY
1850	switch (ev.type)	1864	switch (ev.type)
1851	{	1865	{
1852	case PropertyNotify:	1866	case PropertyNotify:
1853	/*	1867	/*
1854	* if user used some Esetroot compatible prog to set the root bg,	1868	* if user used some Esetroot compatible prog to set the root bg,
1855	* use the property to determine the pixmap. We use it later on.	1869	* use the property to determine the pixmap. We use it later on.
1856	*/	1870	*/
1857	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1871	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1858	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1872	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1859	{	1873	{
1860	bg_set_root_pixmap ();	1874	#if BG_IMAGE_FROM_ROOT
		1875	if (option (Opt_transparent))
		1876	{
		1877	rxvt_img::new_from_root (this)->replace (root_img);
1861	update_background ();	1878	update_background ();
		1879	}
		1880	#endif
		1881	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1862	}	1882	}
1863		1883
1864	break;	1884	break;
1865	}	1885	}
1866	# endif
1867		1886
1868	refresh_check ();	1887	refresh_check ();
1869	}	1888	}
1870	#endif	1889	#endif
1871		1890
…		…
2192		2211
2193	#ifdef MOUSE_WHEEL	2212	#ifdef MOUSE_WHEEL
2194	case Button4:	2213	case Button4:
2195	case Button5:	2214	case Button5:
2196	{	2215	{
2197	int i;	2216	int lines;
2198	page_dirn v;	2217	page_dirn dirn;
2199		2218
2200	v = ev.button == Button4 ? UP : DN;	2219	dirn = ev.button == Button4 ? UP : DN;
2201		2220
2202	if (ev.state & ShiftMask)	2221	if (ev.state & ShiftMask)
2203	i = 1;	2222	lines = 1;
2204	else if (option (Opt_mouseWheelScrollPage))	2223	else if (option (Opt_mouseWheelScrollPage))
2205	i = nrow - 1;	2224	lines = nrow - 1;
2206	else	2225	else
2207	i = 5;	2226	lines = 5;
2208		2227
2209	# ifdef MOUSE_SLIP_WHEELING	2228	# ifdef MOUSE_SLIP_WHEELING
2210	if (ev.state & ControlMask)	2229	if (ev.state & ControlMask)
2211	{	2230	{
2212	mouse_slip_wheel_speed += v ? -1 : 1;	2231	mouse_slip_wheel_speed += dirn;
2213	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2232	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2214	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215		2233
2216	if (!slip_wheel_ev.is_active ())	2234	if (!slip_wheel_ev.is_active ())
2217	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2235	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218	}	2236	}
2219	else	2237	else
2220	# endif	2238	# endif
2221	{	2239	{
2222	scr_page (v, i);	2240	scr_page (dirn, lines);
2223	scrollBar.show (1);	2241	scrollBar.show (1);
2224	}	2242	}
2225	}	2243	}
2226	break;	2244	break;
2227	#endif	2245	#endif
…		…
2380	}	2398	}
2381		2399
2382	if (len == (size_t)-1)	2400	if (len == (size_t)-1)
2383	{	2401	{
2384	mbstate.reset (); // reset now undefined conversion state	2402	mbstate.reset (); // reset now undefined conversion state
		2403	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2404	// in which case we "erroneously" return the next byte which might be valid.
2385	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2405	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2386	}	2406	}
2387		2407
2388	// assume wchar == unicode	2408	// assume wchar == unicode
2389	cmdbuf_ptr += len;	2409	cmdbuf_ptr += len;
…		…
2794	};	2814	};
2795		2815
2796	void ecb_hot	2816	void ecb_hot
2797	rxvt_term::process_csi_seq ()	2817	rxvt_term::process_csi_seq ()
2798	{	2818	{
2799	unicode_t ch, priv, i;	2819	unicode_t ch, priv, prev_ch, i;
2800	unsigned int nargs, p;	2820	unsigned int nargs, p;
2801	int n, ndef;	2821	int n, ndef;
2802	int arg[ESC_ARGS] = { };	2822	int arg[ESC_ARGS] = { };
2803		2823
2804	nargs = 0;	2824	nargs = 0;
…		…
2810	/* '<' '=' '>' '?' '!' */	2830	/* '<' '=' '>' '?' '!' */
2811	priv = ch;	2831	priv = ch;
2812	ch = cmd_getc ();	2832	ch = cmd_getc ();
2813	}	2833	}
2814		2834
		2835	prev_ch = 0;
2815	/* read any numerical arguments */	2836	/* read any numerical arguments */
2816	for (n = -1; ch < CSI_ICH; )	2837	for (n = -1; ch < CSI_ICH; )
2817	{	2838	{
2818	if (isdigit (ch))	2839	if (isdigit (ch))
2819	{	2840	{
…		…
2829	n = -1;	2850	n = -1;
2830	}	2851	}
2831	else if (IS_CONTROL (ch))	2852	else if (IS_CONTROL (ch))
2832	process_nonprinting (ch);	2853	process_nonprinting (ch);
2833		2854
		2855	prev_ch = ch;
2834	ch = cmd_getc ();	2856	ch = cmd_getc ();
2835	}	2857	}
2836		2858
2837	if (ch > CSI_7F)	2859	if (ch > CSI_7F)
2838	return;	2860	return;
…		…
3072	scr_insert_mode (1);	3094	scr_insert_mode (1);
3073	else if (arg[0] == 20)	3095	else if (arg[0] == 20)
3074	priv_modes \|= PrivMode_LFNL;	3096	priv_modes \|= PrivMode_LFNL;
3075	break;	3097	break;
3076		3098
		3099	case CSI_71: // DESCUSR: set cursor style
		3100	if (prev_ch == ' ')
		3101	set_cursor_style (arg[0]);
		3102	break;
		3103
3077	/*	3104	/*
3078	* PRIVATE USE beyond this point. All CSI_7? sequences here	3105	* PRIVATE USE beyond this point. All CSI_7? sequences here
3079	*/	3106	*/
3080	case CSI_72: /* DECSTBM: set top and bottom margins */	3107	case CSI_72: /* DECSTBM: set top and bottom margins */
3081	if (nargs == 1)	3108	if (nargs == 1)
…		…
3214	rxvt_term::get_to_st (unicode_t &ends_how)	3241	rxvt_term::get_to_st (unicode_t &ends_how)
3215	{	3242	{
3216	unicode_t ch;	3243	unicode_t ch;
3217	bool seen_esc = false;	3244	bool seen_esc = false;
3218	unsigned int n = 0;	3245	unsigned int n = 0;
3219	wchar_t string[STRING_MAX];	3246	wchar_t string[CBUFSIZ];
3220		3247
3221	while ((ch = cmd_getc ()) != NOCHAR)	3248	while ((ch = cmd_getc ()) != NOCHAR)
3222	{	3249	{
3223	if (seen_esc)	3250	if (seen_esc)
3224	{	3251	{
…		…
3239	else if (ch < 0x20)	3266	else if (ch < 0x20)
3240	return NULL; /* other control character - exit */	3267	return NULL; /* other control character - exit */
3241		3268
3242	seen_esc = false;	3269	seen_esc = false;
3243		3270
3244	if (n >= STRING_MAX - 1)	3271	if (n >= sizeof (string) - 1)
3245	// stop at some sane length	3272	// stop at some sane length
3246	return NULL;	3273	return NULL;
3247		3274
3248	string[n++] = ch;	3275	string[n++] = ch;
3249	}	3276	}
…		…
3366	&nitems, &bytes_after, &value) == Success	3393	&nitems, &bytes_after, &value) == Success
3367	&& actual_type != None	3394	&& actual_type != None
3368	&& actual_format == 8)	3395	&& actual_format == 8)
3369	str = (const char *)(value);	3396	str = (const char *)(value);
3370		3397
3371	tt_printf ("\033]%d;%s%c", op, str, resp);	3398	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3372		3399
3373	XFree (value);	3400	XFree (value);
3374	}	3401	}
3375	else	3402	else
3376	{	3403	{
…		…
3444	break;	3471	break;
3445	#endif	3472	#endif
3446	case URxvt_Color_border:	3473	case URxvt_Color_border:
3447	process_color_seq (op, Color_border, str, resp);	3474	process_color_seq (op, Color_border, str, resp);
3448	break;	3475	break;
3449	#if ENABLE_TRANSPARENCY	3476
		3477	#if BG_IMAGE_FROM_ROOT
3450	case URxvt_Color_tint:	3478	case URxvt_Color_tint:
3451	process_color_seq (op, Color_tint, str, resp);	3479	process_color_seq (op, Color_tint, str, resp);
3452	{	3480	{
3453	bool changed = false;	3481	bool changed = false;
3454		3482
…		…
3465	#if BG_IMAGE_FROM_FILE	3493	#if BG_IMAGE_FROM_FILE
3466	case Rxvt_Pixmap:	3494	case Rxvt_Pixmap:
3467	if (!strcmp (str, "?"))	3495	if (!strcmp (str, "?"))
3468	{	3496	{
3469	char str[256];	3497	char str[256];
3470	int h_scale = 0, v_scale = 0;
3471	int h_align = 0, v_align = 0;
3472	if (image_vec.size () > 0)
3473	{
3474	h_scale = image_vec[0].h_scale;	3498	int h_scale = fimage.h_scale;
3475	v_scale = image_vec[0].v_scale;	3499	int v_scale = fimage.v_scale;
3476	h_align = image_vec[0].h_align;	3500	int h_align = fimage.h_align;
3477	v_align = image_vec[0].v_align;	3501	int v_align = fimage.v_align;
3478	}
3479		3502
3480	sprintf (str, "[%dx%d+%d+%d]",	3503	sprintf (str, "[%dx%d+%d+%d]",
3481	h_scale, v_scale,	3504	h_scale, v_scale,
3482	h_align, v_align);	3505	h_align, v_align);
3483	process_xterm_seq (XTerm_title, str, CHAR_ST);	3506	process_xterm_seq (XTerm_title, str, CHAR_ST);
…		…
3486	{	3509	{
3487	bool changed = false;	3510	bool changed = false;
3488		3511
3489	if (*str != ';')	3512	if (*str != ';')
3490	{	3513	{
3491	if (image_vec.size () > 0)
3492	changed = image_vec[0].set_file_geometry (str);
3493	else	3514	try
3494	{	3515	{
3495	rxvt_image *image = new_image ();
3496	if (!image->set_file_geometry (str))	3516	fimage.set_file_geometry (this, str);
3497	image_vec.pop_back ();
3498	else
3499	changed = true;	3517	changed = true;
		3518	}
		3519	catch (const class rxvt_failure_exception &e)
		3520	{
3500	}	3521	}
3501	}	3522	}
3502	else	3523	else
3503	{	3524	{
3504	str++;	3525	str++;
3505	if (image_vec.size () > 0)
3506	changed = image_vec[0].set_geometry (str, true);	3526	if (fimage.set_geometry (str, true))
		3527	changed = true;
3507	}	3528	}
3508		3529
3509	if (changed)	3530	if (changed)
3510	{	3531	{
3511	if (bg_window_position_sensitive ())	3532	if (bg_window_position_sensitive ())
3512	{	3533	{
3513	int x, y;	3534	int x, y;
3514	get_window_origin (x, y);	3535	get_window_origin (x, y);
3515	bg_set_position (x, y);	3536	parent_x = x;
		3537	parent_y = y;
3516	}	3538	}
3517	update_background ();	3539	update_background ();
3518	}	3540	}
3519	}	3541	}
3520	break;	3542	break;
…		…
3991	break;	4013	break;
3992	#endif	4014	#endif
3993	}	4015	}
3994	}	4016	}
3995	}	4017	}
		4018
		4019	void
		4020	rxvt_term::set_cursor_style (int style)
		4021	{
		4022	if (!IN_RANGE_INC (style, 0, 4))
		4023	return;
		4024
		4025	set_option (Opt_cursorUnderline, style >= 3);
		4026
		4027	#ifdef CURSOR_BLINK
		4028	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4029	cursor_blink_reset ();
		4030	#endif
		4031
		4032	want_refresh = 1;
		4033	}
3996	/}}} /	4034	/}}} /
3997		4035
3998	/* ------------------------------------------------------------------------- */	4036	/* ---------------------------------------------------------------------- */
		4037	/* Write data to the pty as typed by the user, pasted with the mouse,
		4038	* or generated by us in response to a query ESC sequence.
		4039	*/
3999		4040
4000	/*	4041	/*
4001	* Send printf () formatted output to the command.	4042	* Send printf () formatted output to the command.
4002	* Only use for small amounts of data.	4043	* Only use for small amounts of data.
4003	*/	4044	*/
…		…
4011	vsnprintf ((char *)buf, 256, fmt, arg_ptr);	4052	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4012	va_end (arg_ptr);	4053	va_end (arg_ptr);
4013	tt_write (buf, strlen (buf));	4054	tt_write (buf, strlen (buf));
4014	}	4055	}
4015		4056
4016	/* ---------------------------------------------------------------------- */
4017	/* Write data to the pty as typed by the user, pasted with the mouse,	4057	/* Write data to the pty as typed by the user. */
4018	* or generated by us in response to a query ESC sequence.	4058	void
4019	*/	4059	rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4020	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4060	{
		4061	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4062	return;
		4063
		4064	if (option (Opt_scrollTtyKeypress))
		4065	if (view_start)
		4066	{
		4067	view_start = 0;
		4068	want_refresh = 1;
		4069	}
		4070
		4071	tt_write_ (data, len);
		4072	}
4021		4073
4022	void	4074	void
4023	rxvt_term::tt_write (const char *data, unsigned int len)	4075	rxvt_term::tt_write (const char *data, unsigned int len)
4024	{	4076	{
4025	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4077	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4026	return;	4078	return;
4027		4079
		4080	tt_write_ (data, len);
		4081	}
		4082
		4083	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4084
		4085	void
		4086	rxvt_term::tt_write_ (const char *data, unsigned int len)
		4087	{
4028	if (pty->pty < 0)	4088	if (pty->pty < 0)
4029	return;	4089	return;
4030		4090
4031	if (v_buflen == 0)	4091	if (v_buflen == 0)
4032	{	4092	{

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC vs. Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC