ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.191 by root, Wed Jan 26 07:08:15 2005 UTC vs.
Revision 1.550 by root, Thu May 22 18:54:32 2014 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * 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,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <cwchar>
58#include <csignal> 59#include <signal.h>
60
61#if LINUX_YIELD_HACK
62# include <time.h>
63#endif
59 64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63
64// exception thrown when the command parser runs out of input data
65class out_of_input { } out_of_input;
66 68
67#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
68 70
69#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
70#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
94 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
95 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
96 98
97 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
118 XK_Escape, 0x238b, 119 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 120 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 121 XK_Print, 0x2399,
121 122
122 XK_space, 0x2423, 123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif
124 0, 133 0,
125}; 134};
126 135
127void 136void ecb_cold
128rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
129{ 138{
130 x = Pixel2Col (x); 139 x = Pixel2Col (x);
131 y = Pixel2Row (y); 140 y = Pixel2Row (y);
132 141
133 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 144 return;
136 145
137 for (;;) 146 for (;;)
138 { 147 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
140 151
141 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
142 { 153 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
146 break; 156 break;
147 } 157 }
148 158
149 x--; 159 x--;
150 } 160 }
151
152} 161}
153#endif
154 162
155#if ENABLE_OVERLAY 163void ecb_cold
156void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
158{ 165{
159 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 167 wchar_t *chr, *alloc, ch2, **fname;
162 int len; 168 int len;
163 169
164#if ENABLE_COMBINING 170# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
166 { 172 {
167 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
170 } 176 }
171 else 177 else
172#endif 178# endif
173 { 179 {
174 ch2 = ch; 180 ch2 = ch;
175 181
176 alloc = 0; 182 alloc = 0;
177 chr = &ch2; 183 chr = &ch2;
178 len = 1; 184 len = 1;
179 } 185 }
180 186
181 int width = strlen (f->name); 187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
182 189
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
210
211 max_it (width, strlen (attr));
212
213 if (y >= 0)
214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
216 x = 0;
217 }
218
219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
184 222
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 224
187 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
188 { 226 {
189 char buf[9]; 227 char buf[9];
190 228
191 ch = *chr++; 229 ch = *chr++;
192 230
193 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
195 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
196#if !UNICODE3 234# if !UNICODE_3
197 if (ch >= 0x10000) 235 if (ch >= 0x10000)
198 ch = 0xfffd; 236 ch = 0xfffd;
199#endif 237# endif
200 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
239
240 if (WCWIDTH (ch) >= 2)
201 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
202 } 242 }
203 243
244// {
245// char buf[4+4+3+1];
246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
247// scr_overlay_set (0, 0, buf);
248// }
204 scr_overlay_set (0, len, f->name); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
252 scr_overlay_set (0, len + 2 + i, fname[i]);
253 free (fname[i]);
254 }
205 255
206#if ENABLE_COMBINING 256# if ENABLE_COMBINING
207 if (alloc) 257 if (alloc)
208 delete [] alloc; 258 delete [] alloc;
209#endif 259# endif
210} 260}
211#endif 261#endif
212 262
213void 263void ecb_cold
214rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
215{ 265{
216 wchar_t ch[2];
217
218 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
219 ch[1] = 0;
220 267
221 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
222 { 269 {
223 char mb[16]; 270 char mb[MB_LEN_MAX];
224 int len; 271 int len;
225 272
226 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
227 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
228 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
229 else 276 else
230 { 277 {
231 mb[0] = ch[0]; 278 mb[0] = ch;
232 len = 1; 279 len = 1;
233 } 280 }
234 281
235 if (len > 0) 282 if (len > 0)
236 tt_write ((unsigned char *)mb, len); 283 tt_write (mb, len);
237 else 284 else
238 scr_bell (); 285 scr_bell ();
239 } 286 }
240 287
241 iso14755buf = 0; 288 iso14755buf = 0;
242} 289}
243 290
244int 291static int ecb_cold
245rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
246{ 293{
247 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
248 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
249 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
250 { 297 {
251 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
252 299
… …
258 305
259 return -1; 306 return -1;
260} 307}
261#endif 308#endif
262 309
263/*{{{ Convert the keypress event into a string */ 310static inline KeySym ecb_cold
264void 311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_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
414void ecb_cold
265rxvt_term::lookup_key (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
266{ 416{
267 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
268 unsigned int newlen;
269 KeySym keysym; 418 KeySym keysym;
270#ifdef DEBUG_CMD
271 static int debug_key = 1; /* accessible by a debugger only */
272#endif
273 int valid_keysym; 419 int valid_keysym;
274 unsigned char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
422
423#if ISO_14755
424 if (iso14755buf & ISO_14755_52)
425 return;
426#endif
275 427
276 /* 428 /*
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 429 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 430 * escape sequence to toggle the Keypad.
279 * 431 *
280 * Always permit `shift' to override the current setting 432 * Always permit `shift' to override the current setting
281 */ 433 */
282 shft = (ev.state & ShiftMask); 434 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 435 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 436 meta = ev.state & ModMetaMask;
285
286 if (numlock_state || (ev.state & ModNumLockMask))
287 {
288 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP);
290 }
291 437
292 kbuf[0] = 0; 438 kbuf[0] = 0;
293 439
294#ifdef USE_XIM 440#if USE_XIM
295 if (Input_Context) 441 if (Input_Context)
296 { 442 {
297 Status status_return; 443 Status status_return;
298 444
299#if 0 445#if 0
300#ifdef X_HAVE_UTF8_STRING 446#ifdef X_HAVE_UTF8_STRING
301 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 447 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
302 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 448 len = Xutf8LookupString (Input_Context, &ev, kbuf,
303 KBUFSZ, &keysym, &status_return); 449 KBUFSZ, &keysym, &status_return);
304 else 450 else
305#endif 451#endif
306#endif 452#endif
307 { 453 {
… …
309 455
310 // the XOpenIM manpage lies about hardcoding the locale 456 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 457 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 458 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 459 SET_LOCALE (rs[Rs_imLocale]);
460
314 // assume wchar_t == unicode or better 461 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 462 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 463 KBUFSZ, &keysym, &status_return);
464
317 if (rs[Rs_imLocale]) 465 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 466 SET_LOCALE (locale);
319 467
320 if (status_return == XLookupChars 468 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 469 || status_return == XLookupBoth)
… …
342 || status_return == XLookupBoth; 490 || status_return == XLookupBoth;
343 } 491 }
344 else 492 else
345#endif 493#endif
346 { 494 {
347 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 495 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
348 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
349 } 497 }
350 498
351 if (valid_keysym) 499 if (valid_keysym)
352 { 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 {
353#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
355 return; 710 return;
356#endif 711#endif
357 712
358 if (TermWin.saveLines) 713 if (saveLines)
359 { 714 {
360#ifdef UNSHIFTED_SCROLLKEYS 715#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 716 if (!ctrl && !meta)
362#else 717#else
363 if (IS_SCROLL_MOD) 718 if (IS_SCROLL_MOD)
364#endif 719#endif
365 { 720 {
366 int lnsppg; 721 int lnsppg;
367 722
368#ifdef PAGING_CONTEXT_LINES 723#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 724 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 725#else
371 lnsppg = TermWin.nrow * 4 / 5; 726 lnsppg = nrow * 4 / 5;
372#endif 727#endif
728 max_it (lnsppg, 1);
729
373 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
374 { 731 {
375 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
376 return; 733 return;
377 } 734 }
378 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
379 { 736 {
380 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
381 return; 738 return;
382 } 739 }
383 } 740 }
384#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
385 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
386 { 743 {
387 if (keysym == XK_Up) 744 if (keysym == XK_Up)
388 { 745 {
389 scr_page (UP, 1); 746 scr_page (1);
390 return; 747 return;
391 } 748 }
392 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
393 { 750 {
394 scr_page (DN, 1); 751 scr_page (-1);
395 return; 752 return;
396 } 753 }
397 } 754 }
398#endif 755#endif
399#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
400 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
401 { 758 {
402 if (keysym == XK_Home) 759 if (keysym == XK_Home)
403 { 760 {
404 scr_move_to (0, 1); 761 scr_changeview (top_row);
405 return; 762 return;
406 } 763 }
407 else if (keysym == XK_End) 764 else if (keysym == XK_End)
408 { 765 {
409 scr_move_to (1, 0); 766 scr_changeview (0);
410 return; 767 return;
411 } 768 }
412 } 769 }
413#endif 770#endif
414 } 771 }
… …
425 { 782 {
426 switch (keysym) 783 switch (keysym)
427 { 784 {
428 /* normal XTerm key bindings */ 785 /* normal XTerm key bindings */
429 case XK_Insert: /* Shift+Insert = paste mouse selection */ 786 case XK_Insert: /* Shift+Insert = paste mouse selection */
430 selection_request (ev.time, 0, 0); 787 selection_request (ev.time);
431 return; 788 return;
432#if TODO 789#if TODO
433 /* rxvt extras */ 790 /* rxvt extras */
434 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
435 change_font (FONT_UP);
436 return; 792 return;
437 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
438 change_font (FONT_DN);
439 return; 794 return;
440#endif 795#endif
441 } 796 }
442 } 797 }
443 } 798 }
444 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;
813 }
814
445#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
446 // ISO 14755 support 816 // ISO 14755 support
447 if (shft && ctrl) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
448 { 818 {
449 int hv; 819 int hv;
450 820
451 if (iso14755buf & ISO_14755_51 821 if (iso14755buf & ISO_14755_51
452 && (keysym == XK_space || keysym == XK_KP_Space 822 && (keysym == XK_space || keysym == XK_KP_Space
… …
454 { 824 {
455 commit_iso14755 (); 825 commit_iso14755 ();
456 iso14755buf = ISO_14755_51; 826 iso14755buf = ISO_14755_51;
457# if ISO_14755 827# if ISO_14755
458 iso14755_51 (0); 828 iso14755_51 (0);
829# endif
830 return;
831 }
832 else if (keysym == XK_BackSpace)
833 {
834 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
835# if ISO_14755
836 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif 837# endif
460 return; 838 return;
461 } 839 }
462 else if ((hv = hex_keyval (ev)) >= 0) 840 else if ((hv = hex_keyval (ev)) >= 0)
463 { 841 {
… …
468# endif 846# endif
469 return; 847 return;
470 } 848 }
471 else 849 else
472 { 850 {
473# if ENABLE_OVERLAY 851# if ISO_14755
474 scr_overlay_off (); 852 scr_overlay_off ();
475# endif 853# endif
476 iso14755buf = 0; 854 iso14755buf = 0;
477 } 855 }
478 } 856 }
857 else if (option (Opt_iso14755) &&
479 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 858 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
480 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 859 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
481 if (!(iso14755buf & ISO_14755_STARTED)) 860 if (!(iso14755buf & ISO_14755_STARTED))
482 { 861 {
483 iso14755buf |= ISO_14755_STARTED; 862 iso14755buf |= ISO_14755_STARTED;
484# if ENABLE_OVERLAY 863# if ISO_14755
485 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 864 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
486 scr_overlay_set (0, 0, "ISO 14755 mode"); 865 scr_overlay_set (0, 0, "ISO 14755 mode");
487# endif 866# endif
488 } 867 }
489#endif 868#endif
490 869
491#ifdef PRINTPIPE 870#ifdef PRINTPIPE
492 if (keysym == XK_Print) 871 if (keysym == XK_Print)
493 { 872 {
494 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
495 return; 874 return;
496 } 875 }
497#endif 876#endif
498
499 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
500 {
501 {
502 newlen = 1;
503 switch (keysym)
504 {
505#ifndef NO_BACKSPACE_KEY
506 case XK_BackSpace:
507 if (priv_modes & PrivMode_HaveBackSpace)
508 {
509 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
510 ^ !!ctrl) ? '\b' : '\177';
511 kbuf[1] = '\0';
512 }
513 else
514 strcpy (kbuf, key_backspace);
515 break;
516#endif
517#ifndef NO_DELETE_KEY
518 case XK_Delete:
519 strcpy (kbuf, key_delete);
520 break;
521#endif
522 case XK_Tab:
523 if (shft)
524 strcpy (kbuf, "\033[Z");
525 else
526 {
527#ifdef CTRL_TAB_MAKES_META
528 if (ctrl)
529 meta = 1;
530#endif
531#ifdef MOD4_TAB_MAKES_META
532 if (ev.state & Mod4Mask)
533 meta = 1;
534#endif
535 newlen = 0;
536 }
537 break;
538
539#ifdef XK_KP_Left
540 case XK_KP_Up: /* \033Ox or standard */
541 case XK_KP_Down: /* \033Or or standard */
542 case XK_KP_Right: /* \033Ov or standard */
543 case XK_KP_Left: /* \033Ot or standard */
544 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
545 {
546 strcpy (kbuf, "\033OZ");
547 kbuf[2] = "txvr"[keysym - XK_KP_Left];
548 break;
549 }
550 else
551 /* translate to std. cursor key */
552 keysym = XK_Left + (keysym - XK_KP_Left);
553 /* FALLTHROUGH */
554#endif
555 case XK_Up: /* "\033[A" */
556 case XK_Down: /* "\033[B" */
557 case XK_Right: /* "\033[C" */
558 case XK_Left: /* "\033[D" */
559 strcpy (kbuf, "\033[Z");
560 kbuf[2] = "DACB"[keysym - XK_Left];
561 /* do Shift first */
562 if (shft)
563 kbuf[2] = "dacb"[keysym - XK_Left];
564 else if (ctrl)
565 {
566 kbuf[1] = 'O';
567 kbuf[2] = "dacb"[keysym - XK_Left];
568 }
569 else if (priv_modes & PrivMode_aplCUR)
570 kbuf[1] = 'O';
571 break;
572
573#ifndef UNSHIFTED_SCROLLKEYS
574# ifdef XK_KP_Prior
575 case XK_KP_Prior:
576 /* allow shift to override */
577 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
578 {
579 strcpy (kbuf, "\033Oy");
580 break;
581 }
582 /* FALLTHROUGH */
583# endif
584 case XK_Prior:
585 strcpy (kbuf, "\033[5~");
586 break;
587# ifdef XK_KP_Next
588 case XK_KP_Next:
589 /* allow shift to override */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033Os");
593 break;
594 }
595 /* FALLTHROUGH */
596# endif
597 case XK_Next:
598 strcpy (kbuf, "\033[6~");
599 break;
600#endif
601 case XK_KP_Enter:
602 /* allow shift to override */
603 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
604 {
605 strcpy (kbuf, "\033OM");
606 break;
607 }
608
609 /* FALLTHROUGH */
610
611 case XK_Return:
612 if (priv_modes & PrivMode_LFNL)
613 {
614 kbuf[0] = '\015';
615 kbuf[1] = '\012';
616 kbuf[2] = '\0';
617 }
618 else
619 {
620 kbuf[0] = '\015';
621 kbuf[1] = '\0';
622 }
623 break;
624
625#ifdef XK_KP_Begin
626 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou");
628 break;
629
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif
638 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */
642 strcpy (kbuf, "\033OP");
643 kbuf[2] += (keysym - XK_KP_F1);
644 break;
645
646 case XK_KP_Multiply: /* "\033Oj" : "*" */
647 case XK_KP_Add: /* "\033Ok" : "+" */
648 case XK_KP_Separator: /* "\033Ol" : "," */
649 case XK_KP_Subtract: /* "\033Om" : "-" */
650 case XK_KP_Decimal: /* "\033On" : "." */
651 case XK_KP_Divide: /* "\033Oo" : "/" */
652 case XK_KP_0: /* "\033Op" : "0" */
653 case XK_KP_1: /* "\033Oq" : "1" */
654 case XK_KP_2: /* "\033Or" : "2" */
655 case XK_KP_3: /* "\033Os" : "3" */
656 case XK_KP_4: /* "\033Ot" : "4" */
657 case XK_KP_5: /* "\033Ou" : "5" */
658 case XK_KP_6: /* "\033Ov" : "6" */
659 case XK_KP_7: /* "\033Ow" : "7" */
660 case XK_KP_8: /* "\033Ox" : "8" */
661 case XK_KP_9: /* "\033Oy" : "9" */
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033Oj");
666 kbuf[2] += (keysym - XK_KP_Multiply);
667 }
668 else
669 {
670 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
671 kbuf[1] = '\0';
672 }
673 break;
674
675 case XK_Find:
676 strcpy (kbuf, "\033[1~");
677 break;
678 case XK_Insert:
679 strcpy (kbuf, "\033[2~");
680 break;
681#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove:
683 /* FALLTHROUGH */
684#endif
685 case XK_Execute:
686 strcpy (kbuf, "\033[3~");
687 break;
688 case XK_Select:
689 strcpy (kbuf, "\033[4~");
690 break;
691#ifdef XK_KP_End
692 case XK_KP_End:
693 /* allow shift to override */
694 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
695 {
696 strcpy (kbuf, "\033Oq");
697 break;
698 }
699 /* FALLTHROUGH */
700#endif
701 case XK_End:
702 strcpy (kbuf, KS_END);
703 break;
704#ifdef XK_KP_Home
705 case XK_KP_Home:
706 /* allow shift to override */
707 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
708 {
709 strcpy (kbuf, "\033Ow");
710 break;
711 }
712 /* FALLTHROUGH */
713#endif
714 case XK_Home:
715 strcpy (kbuf, KS_HOME);
716 break;
717
718#define FKEY(n, fkey) \
719 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
720
721 case XK_F1: /* "\033[11~" */
722 case XK_F2: /* "\033[12~" */
723 case XK_F3: /* "\033[13~" */
724 case XK_F4: /* "\033[14~" */
725 case XK_F5: /* "\033[15~" */
726 FKEY (11, XK_F1);
727 break;
728 case XK_F6: /* "\033[17~" */
729 case XK_F7: /* "\033[18~" */
730 case XK_F8: /* "\033[19~" */
731 case XK_F9: /* "\033[20~" */
732 case XK_F10: /* "\033[21~" */
733 FKEY (17, XK_F6);
734 break;
735 case XK_F11: /* "\033[23~" */
736 case XK_F12: /* "\033[24~" */
737 case XK_F13: /* "\033[25~" */
738 case XK_F14: /* "\033[26~" */
739 FKEY (23, XK_F11);
740 break;
741 case XK_F15: /* "\033[28~" */
742 case XK_F16: /* "\033[29~" */
743 FKEY (28, XK_F15);
744 break;
745 case XK_Help: /* "\033[28~" */
746 FKEY (28, XK_Help);
747 break;
748 case XK_Menu: /* "\033[29~" */
749 FKEY (29, XK_Menu);
750 break;
751 case XK_F17: /* "\033[31~" */
752 case XK_F18: /* "\033[32~" */
753 case XK_F19: /* "\033[33~" */
754 case XK_F20: /* "\033[34~" */
755 case XK_F21: /* "\033[35~" */
756 case XK_F22: /* "\033[36~" */
757 case XK_F23: /* "\033[37~" */
758 case XK_F24: /* "\033[38~" */
759 case XK_F25: /* "\033[39~" */
760 case XK_F26: /* "\033[40~" */
761 case XK_F27: /* "\033[41~" */
762 case XK_F28: /* "\033[42~" */
763 case XK_F29: /* "\033[43~" */
764 case XK_F30: /* "\033[44~" */
765 case XK_F31: /* "\033[45~" */
766 case XK_F32: /* "\033[46~" */
767 case XK_F33: /* "\033[47~" */
768 case XK_F34: /* "\033[48~" */
769 case XK_F35: /* "\033[49~" */
770 FKEY (31, XK_F17);
771 break;
772#undef FKEY
773 default:
774 newlen = 0;
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780 }
781
782 /*
783 * Pass meta for all function keys, if 'meta' option set
784 */
785#ifdef META8_OPTION
786 if (meta && (meta_char == 0x80) && len > 0)
787 kbuf[len - 1] |= 0x80;
788#endif
789
790 }
791 else if (ctrl && keysym == XK_minus)
792 {
793 len = 1;
794 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
795 }
796 else if (keysym == XK_ISO_Left_Tab)
797 {
798 strcpy (kbuf, "\033[Z");
799 len = 3;
800 }
801 else
802 {
803#ifdef META8_OPTION
804 /* set 8-bit on */
805 if (meta && (meta_char == 0x80))
806 {
807 unsigned char *ch;
808
809 for (ch = kbuf; ch < kbuf + len; ch++)
810 *ch |= 0x80;
811
812 meta = 0;
813 }
814#endif
815 /* nil */ ;
816 }
817 } 877 }
818 878
819 if (len <= 0) 879 if (len <= 0)
820 return; /* not mapped */ 880 return; /* not mapped */
821 881
822 if (options & Opt_scrollTtyKeypress) 882 tt_write_user_input (kbuf, (unsigned int)len);
823 if (TermWin.view_start) 883}
884
885void ecb_cold
886rxvt_term::key_release (XKeyEvent &ev)
887{
888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
889 KeySym keysym;
890
891 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
892#endif
893
894#if ENABLE_FRILLS || ISO_14755
895 // ISO 14755 support
896 if (iso14755buf)
897 if (iso14755buf & ISO_14755_52)
824 { 898 {
825 TermWin.view_start = 0; 899# if ISO_14755
826 want_refresh = 1; 900 scr_overlay_off ();
901# endif
902# if ISO_14755
903 // iso14755 part 5.2 handling: release time
904 // first: controls
905 if ((ev.state & ControlMask)
906 && ((keysym >= 0x40 && keysym <= 0x5f)
907 || (keysym >= 0x61 && keysym <= 0x7f)))
908 {
909 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
910 commit_iso14755 ();
911
912 return;
913 }
914
915 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
916 if (i[0] == keysym)
917 {
918 iso14755buf = ISO_14755_51 | i[1];
919 commit_iso14755 ();
920
921 return;
922 }
923
924 scr_bell ();
925# endif
926 iso14755buf = 0;
927
928 return;
827 } 929 }
828 930 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
829 /* 931 {
830 * these modifications only affect the static keybuffer 932# if ISO_14755
831 * pass Shift/Control indicators for function keys ending with `~' 933 scr_overlay_off ();
832 *
833 * eg,
834 * Prior = "ESC[5~"
835 * Shift+Prior = "ESC[5$"
836 * Ctrl+Prior = "ESC[5^"
837 * Ctrl+Shift+Prior = "ESC[5@"
838 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
839 */
840 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
841 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
842
843 /* escape prefix */
844 if (meta
845#ifdef META8_OPTION
846 && meta_char == C0_ESC
847#endif 934# endif
848 ) 935 if (iso14755buf & ISO_14755_51)
849 { 936 commit_iso14755 ();
850 const unsigned char ch = C0_ESC; 937#if ISO_14755
851 tt_write (&ch, 1); 938 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
852 } 939 {
940 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
853 941
854#if defined(DEBUG_CMD) 942 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
855 /* Display keyboard buffer contents */ 943 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
856 unsigned char *p; 944 }
857 int i;
858
859 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
860 for (i = 0, p = kbuf; i < len; i++, p++)
861 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
862 fprintf (stderr, "'\n");
863#endif /* DEBUG_CMD */
864 tt_write (kbuf, (unsigned int)len);
865}
866/*}}} */
867
868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
870/* attempt to `write' count to the input buffer */
871unsigned int
872rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
873{
874 unsigned int n, s;
875
876 n = cmdbuf_ptr - cmdbuf_base;
877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
878
879 if (n > 0 && s < count)
880 {
881 memmove (cmdbuf_base, cmdbuf_ptr,
882 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
883 cmdbuf_ptr = cmdbuf_base;
884 cmdbuf_endp -= n;
885 s += n;
886 }
887
888 if (count > s)
889 {
890 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
891 count = s;
892 }
893
894 for (; count--;)
895 *cmdbuf_endp++ = *str++;
896
897 cmd_parse ();
898
899 return 0;
900}
901#endif 945# endif
946 else
947 iso14755buf = 0;
948 }
949#endif
950
951 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
952 return;
953
954#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
955 if (!(ev.state & ControlMask))
956 slip_wheel_ev.stop ();
957 else if (keysym == XK_Control_L || keysym == XK_Control_R)
958 mouse_slip_wheel_speed = 0;
959#endif
960}
902 961
903void 962void
904rxvt_term::flush () 963rxvt_term::flush ()
905{ 964{
906 flush_ev.stop (); 965 flush_ev.stop ();
907 966
908#ifdef TRANSPARENT 967#ifdef HAVE_IMG
909 if (want_full_refresh) 968 if (bg_flags & BG_NEEDS_REFRESH)
910 { 969 {
911 want_full_refresh = 0; 970 bg_flags &= ~BG_NEEDS_REFRESH;
912 scr_clear ();
913 scr_touch (false); 971 scr_touch (false);
914 } 972 }
915#endif 973#endif
916 974
917 if (want_refresh) 975 if (want_refresh)
918 { 976 {
977 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
978 {
979 int row = view_start;
980 int end_row = row + nrow;
981
982 while (row > top_row && ROW (row - 1).is_longer ())
983 --row;
984
985 do
986 {
987 int start_row = row;
988 line_t *l;
989
990 do
991 {
992 l = &ROW (row++);
993
994 if (!(l->f & LINE_FILTERED))
995 {
996 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED;
998 while (l->is_longer ())
999 {
1000 l = &ROW (row++);
1001 l->f |= LINE_FILTERED;
1002 }
1003
1004 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1006
1007 break;
1008 }
1009 }
1010 while (l->is_longer () && row < end_row);
1011 }
1012 while (row < end_row);
1013 }
1014
919 scr_refresh (refresh_type); 1015 scr_refresh ();
920 scrollbar_show (1); 1016 scrollBar.show (1);
921#ifdef USE_XIM 1017#if USE_XIM
922 IMSendSpot (); 1018 im_send_spot ();
923#endif 1019#endif
924 } 1020 }
925 1021
926 display->flush (); 1022 display->flush ();
927} 1023}
928 1024
1025/* checks whether a refresh is requested and starts the refresh timer */
929void 1026void
930rxvt_term::check_cb (check_watcher &w) 1027rxvt_term::refresh_check ()
931{ 1028{
932 SET_R (this); 1029 if (want_refresh && !flush_ev.is_active ())
933 SET_LOCALE (locale); 1030 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
934 1031
935 display->flush (); 1032 display->flush ();
936
937 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01);
939} 1033}
940 1034
941void 1035void
942rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (ev::timer &w, int revents)
943{ 1037{
944 SET_R (this); 1038 make_current ();
945 SET_LOCALE (locale);
946 1039
947 refresh_limit = 1;
948 refresh_count = 0; 1040 refresh_count = 0;
949 flush (); 1041 flush ();
950} 1042}
951 1043
952#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
953void 1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1060void
954rxvt_term::cursor_blink_cb (time_watcher &w) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
955{ 1062{
956 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
957 want_refresh = 1; 1064 want_refresh = 1;
958 1065 refresh_check ();
959 w.start (w.at + BLINK_INTERVAL);
960} 1066}
961#endif 1067#endif
962 1068
963#ifdef TEXT_BLINK 1069#ifdef TEXT_BLINK
964void 1070void
965rxvt_term::text_blink_cb (time_watcher &w) 1071rxvt_term::text_blink_cb (ev::timer &w, int revents)
966{ 1072{
967 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1073 if (scr_refresh_rend (RS_Blink, RS_Blink))
968 { 1074 {
969 hidden_text = !hidden_text; 1075 hidden_text = !hidden_text;
970 want_refresh = 1; 1076 want_refresh = 1;
971 w.start (w.at + TEXT_BLINK_INTERVAL); 1077 refresh_check ();
972 } 1078 }
1079 else
1080 w.stop ();
973} 1081}
974#endif 1082#endif
975 1083
976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
977void 1085void
978rxvt_term::cont_scroll_cb (time_watcher &w) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
979{ 1087{
980 if ((scrollbar_isUp() || scrollbar_isDn()) && 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
981 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
982 { 1090 {
983 refresh_type |= SMOOTH_REFRESH;
984 want_refresh = 1; 1091 want_refresh = 1;
985 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1092 refresh_check ();
986 } 1093 }
1094 else
1095 w.stop ();
987} 1096}
988#endif 1097#endif
989 1098
990#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
991void 1100void
992rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
993{ 1102{
994 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
995 { 1104 {
996 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
997 refresh_type |= SMOOTH_REFRESH;
998 want_refresh = 1; 1106 want_refresh = 1;
999 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 refresh_check ();
1000 } 1108 }
1109 else
1110 w.stop ();
1001} 1111}
1002#endif 1112#endif
1003 1113
1004#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1005void 1115void
1006rxvt_term::slip_wheel_cb (time_watcher &w) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1007{ 1117{
1008 if (mouse_slip_wheel_speed == 0 1118 if (scr_page (mouse_slip_wheel_speed))
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1119 {
1012 if (TermWin.view_start == TermWin.nscrolled ||
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0;
1015
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1120 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1121 refresh_check ();
1122 }
1123
1124 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1019 } 1125 {
1126 mouse_slip_wheel_speed = 0;
1127 w.stop ();
1128 }
1129}
1130#endif
1131
1132#if LINUX_YIELD_HACK
1133static struct event_handler
1134{
1135 ev::prepare yield_ev;
1136
1137 void yield_cb (ev::prepare &w, int revents)
1138 {
1139 // this should really be sched_yield(), but the linux guys thought
1140 // that giving a process calling sched_yield () less cpu time than
1141 // ones with high nice levels is a useful thing to do. It surely is is
1142 // allowed by the sus... as is returning ENOSYS.
1143 // since the linux guys additionally thought that breaking the only
1144 // known workaround against their unusable sched_yield hack is cool,
1145 // we just nanosleep a bit and hope for the best.
1146
1147 struct timespec ts = { 0, 1000 };
1148 nanosleep (&ts, 0);
1149
1150 w.stop ();
1151 }
1152
1153 event_handler ()
1154 : yield_ev (this, &event_handler::yield_cb)
1155 {
1156 }
1157} event_handler;
1158#endif
1159
1160/* make sure all the cmd data is at beginning of cmdbuf */
1161void
1162rxvt_term::cmdbuf_reify ()
1163{
1164 if (cmdbuf_ptr == cmdbuf_base)
1165 return;
1166
1167 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1168
1169 memmove (cmdbuf_base, cmdbuf_ptr, used);
1170 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + used;
1172
1173}
1174
1175#if defined (KEYSYM_RESOURCE)
1176void
1177rxvt_term::cmdbuf_append (const char *str, size_t count)
1178{
1179 cmdbuf_reify ();
1180
1181 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1182
1183 if (count > avail)
1184 return;
1185
1186 memcpy (cmdbuf_endp, str, count);
1187 cmdbuf_endp += count;
1188
1189 cmd_parse ();
1020} 1190}
1021#endif 1191#endif
1022 1192
1023bool 1193bool
1024rxvt_term::pty_fill () 1194rxvt_term::pty_fill ()
1025{ 1195{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1196 cmdbuf_reify ();
1027 1197
1028 if (CBUFSIZ == n) 1198 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1029 { 1199
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1200 if (!avail)
1031 n = 0;
1032 } 1201 {
1033 1202 // normally this indicates a "too long" command sequence - just drop the data we have
1034 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1203 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1204 cmdbuf_endp = cmdbuf_ptr;
1205 avail = CBUFSIZ;
1206 }
1037 1207
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1208 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1039 1209
1040 if (n > 0) 1210 if (r > 0)
1041 { 1211 {
1042 cmdbuf_endp += n; 1212 cmdbuf_endp += r;
1043 return true; 1213 return true;
1044 } 1214 }
1045 else if (n < 0 && errno != EAGAIN) 1215 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1216 {
1217#if LINUX_YIELD_HACK
1218 if (display->is_local)
1219 event_handler.yield_ev.start ();
1220#endif
1221 }
1222 else
1223 {
1224 pty_ev.stop ();
1225
1226 if (!option (Opt_hold))
1046 destroy (); 1227 destroy ();
1047 1228 }
1229
1048 return false; 1230 return false;
1049} 1231}
1050 1232
1051void 1233void
1052rxvt_term::pty_cb (io_watcher &w, short revents) 1234rxvt_term::pty_cb (ev::io &w, int revents)
1053{ 1235{
1054 SET_R (this); 1236 make_current ();
1055 SET_LOCALE (locale);
1056 1237
1057 if (revents & EVENT_READ) 1238 if (revents & ev::READ)
1058 // loop, but don't allow a single term to monopolize us 1239 // loop, but don't allow a single term to monopolize us
1059 while (pty_fill ()) 1240 for (int i = CBUFCNT; i-- && pty_fill (); )
1060 if (cmd_parse ()) 1241 cmd_parse ();
1061 break;
1062 1242
1063 if (revents & EVENT_WRITE) 1243 if (revents & ev::WRITE)
1064 pty_write (); 1244 pty_write ();
1065}
1066 1245
1067void 1246 refresh_check ();
1247}
1248
1249void ecb_cold
1068rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1069{ 1251{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1071 recolour_cursor (); 1253 recolour_cursor ();
1072 1254
1073#ifdef POINTER_BLANK 1255#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1256 hidden_pointer = 0;
1075 1257
1076 if (options & Opt_pointerBlank) 1258 if (option (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1078#endif 1260#endif
1079} 1261}
1080 1262
1081#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1082void 1264void ecb_cold
1083rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1084{ 1266{
1085 if (! (options & Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1086 return; 1268 return;
1087 1269
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1270 XDefineCursor (dpy, vt, display->blank_cursor);
1089 XFlush (display->display); 1271 XFlush (dpy);
1090 1272
1091 hidden_pointer = 1; 1273 hidden_pointer = 1;
1092} 1274}
1093 1275
1094void 1276void ecb_cold
1095rxvt_term::pointer_cb (time_watcher &w) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1096{ 1278{
1097 SET_R (this); 1279 make_current ();
1098 SET_LOCALE (locale);
1099 1280
1100 pointer_blank (); 1281 pointer_blank ();
1101} 1282}
1102#endif 1283#endif
1103 1284
1104void 1285void
1105rxvt_term::mouse_report (XButtonEvent &ev) 1286rxvt_term::mouse_report (XButtonEvent &ev)
1106{ 1287{
1107 int button_number, key_state = 0; 1288 int button_number, key_state = 0;
1108 int x, y; 1289 int x, y;
1290 int code = 32;
1109 1291
1110 x = ev.x; 1292 x = Pixel2Col (ev.x) + 1;
1111 y = ev.y; 1293 y = Pixel2Row (ev.y) + 1;
1112 pixel_position (&x, &y); 1294
1295 if (ev.type == MotionNotify)
1296 {
1297 if (x == mouse_row && y == mouse_col)
1298 return;
1299
1300 mouse_row = x;
1301 mouse_col = y;
1302 code += 32;
1303 }
1113 1304
1114 if (MEvent.button == AnyButton) 1305 if (MEvent.button == AnyButton)
1115 button_number = 3; 1306 button_number = 3;
1116 else 1307 else
1117 { 1308 {
1118 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
1119 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
1120 if (button_number >= 3) 1311 if (button_number >= 3)
1121 button_number += (64 - 3); 1312 button_number += 64 - 3;
1122 } 1313 }
1123 1314
1124 if (priv_modes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
1125 { 1316 {
1126 /* 1317 /*
… …
1158 fputc ('A', stderr); 1349 fputc ('A', stderr);
1159 if (key_state & 32) 1350 if (key_state & 32)
1160 fputc ('2', stderr); 1351 fputc ('2', stderr);
1161 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1162 button_number, 1353 button_number,
1163 x + 1, 1354 x,
1164 y + 1); 1355 y);
1165#endif 1356#endif
1166 1357
1358#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight)
1360 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state,
1362 x,
1363 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370#endif
1167 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1168 (32 + button_number + key_state), 1372 code + button_number + key_state,
1169 (32 + x + 1), 1373 32 + x,
1170 (32 + y + 1)); 1374 32 + y);
1171} 1375}
1172
1173#ifdef USING_W11LIB
1174void
1175rxvt_W11_process_x_event (XEvent *ev)
1176{
1177 rxvt_t *r = rxvt_get_r ();
1178
1179 x_cb (*ev);
1180}
1181#endif
1182 1376
1183/*{{{ process an X event */ 1377/*{{{ process an X event */
1184void 1378void ecb_hot
1185rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1186{ 1380{
1187 SET_R (this); 1381 make_current ();
1188 SET_LOCALE (locale);
1189 1382
1190#if defined(CURSOR_BLINK) 1383 dLocal (Display *, dpy);
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1192 {
1193 if (hidden_cursor)
1194 {
1195 hidden_cursor = 0;
1196 want_refresh = 1;
1197 }
1198 1384
1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 if (ev.xany.window == vt
1200 } 1386 && SHOULD_INVOKE (HOOK_X_EVENT)
1201#endif 1387 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1388 return;
1202 1389
1203#if defined(POINTER_BLANK) 1390 // for XQueryPointer
1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1205 {
1206 if (ev.type == MotionNotify
1207 || ev.type == ButtonPress
1208 || ev.type == ButtonRelease)
1209 if (hidden_pointer)
1210 pointer_unblank ();
1211
1212 if (ev.type == KeyPress && hidden_pointer == 0)
1213 pointer_blank ();
1214 }
1215#endif
1216
1217 Window unused_root, unused_child; 1391 Window unused_root, unused_child;
1218 int unused_root_x, unused_root_y; 1392 int unused_root_x, unused_root_y;
1219 unsigned int unused_mask; 1393 unsigned int unused_mask;
1220 1394
1221 switch (ev.type) 1395 switch (ev.type)
1222 { 1396 {
1223 case KeyPress: 1397 case KeyPress:
1224#if ISO_14755 1398 key_press (ev.xkey);
1225 if (!(iso14755buf & ISO_14755_52))
1226#endif
1227 lookup_key (ev.xkey);
1228
1229 break; 1399 break;
1230 1400
1231 case KeyRelease: 1401 case KeyRelease:
1232 { 1402 key_release (ev.xkey);
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1234 KeySym ks;
1235
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif
1238
1239#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support
1241 if (iso14755buf)
1242 if (iso14755buf & ISO_14755_52)
1243 {
1244# if ENABLE_OVERLAY
1245 scr_overlay_off ();
1246# endif
1247# if ISO_14755
1248 // iso14755 part 5.2 handling: release time
1249 // first: controls
1250 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f)))
1253 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1255 commit_iso14755 ();
1256 return; // case-break;
1257 }
1258
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks)
1261 {
1262 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 ();
1264 return; // case-break;
1265 }
1266
1267 scr_bell ();
1268# endif
1269 iso14755buf = 0;
1270 break;
1271 }
1272 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277 if (iso14755buf & ISO_14755_51)
1278 commit_iso14755 ();
1279#if ISO_14755
1280 else if (iso14755buf & ISO_14755_STARTED)
1281 {
1282 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1283
1284 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1285 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1286 }
1287# endif
1288 else
1289 iso14755buf = 0;
1290 }
1291#endif
1292
1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1294 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R)
1297 mouse_slip_wheel_speed = 0;
1298#endif
1299 break; 1403 break;
1300 }
1301 1404
1302 case ButtonPress: 1405 case ButtonPress:
1303 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1304 break; 1407 break;
1305 1408
… …
1307 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1308 break; 1411 break;
1309 1412
1310 case ClientMessage: 1413 case ClientMessage:
1311 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1415 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1313 destroy ();
1314#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink))
1320 { 1416 {
1321 /* Get Dnd data */ 1417 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1322 Atom ActualType; 1418 {
1323 int ActualFormat; 1419 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1324 unsigned char *data; 1420 {
1325 unsigned long Size, RemainingBytes; 1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1326 1422 {
1327 XGetWindowProperty (display->display, display->root, 1423 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1328 xa[XA_DNDSELECTION], 1424 destroy ();
1329 0L, 1000000L, 1425 }
1330 False, AnyPropertyType, 1426#if ENABLE_EWMH
1331 &ActualType, &ActualFormat, 1427 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1332 &Size, &RemainingBytes, 1428 XSendEvent (dpy, ev.xclient.window = display->root,
1429 False, SubstructureRedirectMask | SubstructureNotifyMask,
1333 &data); 1430 &ev);
1334 set_string_property (XA_CUT_BUFFER0, data); 1431#endif
1335 XFree (data); 1432 }
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1433 }
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1434#if ENABLE_XEMBED
1435 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1436 {
1437 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1438 focus_in ();
1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1440 focus_out ();
1441 }
1442#endif
1338 } 1443 }
1339#endif /* OFFIX_DND */
1340 break;
1341
1342 case MappingNotify:
1343 XRefreshKeyboardMapping (&ev.xmapping);
1344 break; 1444 break;
1345 1445
1346 /* 1446 /*
1347 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1348 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1367 break; 1467 break;
1368 } 1468 }
1369 break; 1469 break;
1370 1470
1371 case FocusIn: 1471 case FocusIn:
1372 if (!TermWin.focus) 1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1475 focus_in ();
1476 break;
1477
1478 case FocusOut:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1482 focus_out ();
1483 break;
1484
1485 case ConfigureNotify:
1486 if (ev.xconfigure.window == parent)
1373 { 1487 {
1374 TermWin.focus = 1; 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1375 want_refresh = 1; 1489 ;
1376#ifdef USE_XIM 1490
1377 if (Input_Context != NULL) 1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1494#ifdef HAVE_BG_PIXMAP
1495 if (bg_window_position_sensitive ())
1378 { 1496 {
1379 IMSetStatusPosition (); 1497 want_position_change = true;
1380 XSetICFocus (Input_Context); 1498 if (bg_img == 0)
1499 moved = true;
1381 } 1500 }
1382#endif 1501#endif
1383#ifdef CURSOR_BLINK 1502
1384 if (options & Opt_cursorBlink) 1503 if (want_position_change)
1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 { 1504 {
1390 pix_colors = pix_colors_focused; 1505 int x, y;
1391 scr_recolour (); 1506
1507 if (ev.xconfigure.send_event)
1508 {
1509 x = ev.xconfigure.x;
1510 y = ev.xconfigure.y;
1511 }
1512 else
1513 get_window_origin (x, y);
1514
1515 if (x != parent_x || y != parent_y)
1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 }
1392 } 1522 }
1393#endif
1394 1523
1395 }
1396 break;
1397
1398 case FocusOut:
1399 if (TermWin.focus)
1400 {
1401 TermWin.focus = 0;
1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1410#ifdef USE_XIM
1411 if (Input_Context != NULL)
1412 XUnsetICFocus (Input_Context);
1413#endif
1414#ifdef CURSOR_BLINK
1415 if (options & Opt_cursorBlink)
1416 cursor_blink_ev.stop ();
1417 hidden_cursor = 0;
1418#endif
1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1525 {
1444 seen_resize = 1; 1526 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1528 }
1447 1529 else
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1530 {
1449 if (options & Opt_transparent) 1531#ifdef HAVE_BG_PIXMAP
1450 check_our_parents (); 1532 if (moved)
1533 update_background ();
1451#endif 1534#endif
1535 }
1536
1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1538 }
1453 break; 1539 break;
1454 1540
1455 case PropertyNotify: 1541 case PropertyNotify:
1456 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 && ev.xproperty.state == PropertyNewValue)
1458 selection_property (ev.xproperty.window, ev.xproperty.atom);
1459
1460 break; 1543 break;
1461 1544
1462 case SelectionClear: 1545 case SelectionClear:
1463 selection_clear (); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1464 break;
1465
1466 case SelectionNotify:
1467 if (selection_wait == Sel_normal)
1468 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1469 break; 1547 break;
1470 1548
1471 case SelectionRequest: 1549 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1473 break; 1551 break;
1474 1552
1553 case MapNotify:
1554#ifdef HAVE_BG_PIXMAP
1555 // This is needed at startup for the case of no window manager
1556 // or a non-reparenting window manager and also because we
1557 // defer bg image updates if the window is not mapped. The
1558 // short delay is to optimize for multiple ConfigureNotify
1559 // events at startup when the window manager reparents the
1560 // window, so as to perform the computation after we have
1561 // received all of them.
1562 if (bg_img == 0)
1563 update_background_ev.start (0.025);
1564#endif
1565 mapped = 1;
1566#ifdef TEXT_BLINK
1567 text_blink_ev.start ();
1568#endif
1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1570 break;
1571
1475 case UnmapNotify: 1572 case UnmapNotify:
1476 TermWin.mapped = 0; 1573 mapped = 0;
1477#ifdef TEXT_BLINK 1574#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1575 text_blink_ev.stop ();
1479#endif 1576#endif
1577 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1480 break; 1578 break;
1481
1482 case MapNotify:
1483 TermWin.mapped = 1;
1484#ifdef TEXT_BLINK
1485 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486#endif
1487 break;
1488
1489#ifdef TRANSPARENT
1490 case ReparentNotify:
1491 rootwin_cb (ev);
1492 break;
1493#endif /* TRANSPARENT */
1494 1579
1495 case GraphicsExpose: 1580 case GraphicsExpose:
1496 case Expose: 1581 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1582 if (ev.xany.window == vt)
1498 { 1583 {
1499 do 1584 do
1585 {
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1503 1590
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1592
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1594 {
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1597 }
1509 1598
1510 scr_refresh (refresh_type); 1599 want_refresh = 1;
1511 } 1600 }
1512 else 1601 else
1513 { 1602 {
1514 XEvent unused_event; 1603 XEvent unused_event;
1515 1604
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1605 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1517 ; 1606 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1608 ;
1520 1609
1521 if (isScrollbarWindow (ev.xany.window)) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1522 { 1611 {
1523 scrollBar.setIdle (); 1612 scrollBar.state = SB_STATE_IDLE;
1524 scrollbar_show (0); 1613 scrollBar.show (0);
1525 } 1614 }
1526#ifdef MENUBAR
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose ();
1529#endif
1530
1531#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0])
1533 XClearWindow (display->display, ev.xany.window);
1534#endif
1535 } 1615 }
1536 break; 1616 break;
1537 1617
1538 case MotionNotify: 1618 case MotionNotify:
1539#ifdef POINTER_BLANK 1619#ifdef POINTER_BLANK
1540 if (hidden_pointer) 1620 if (hidden_pointer)
1541 pointer_unblank (); 1621 pointer_unblank ();
1542#endif 1622#endif
1543#if MENUBAR 1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1544 if (isMenuBarWindow (ev.xany.window)) 1624 || priv_modes & PrivMode_MouseAnyEvent)
1545 {
1546 menubar_control (ev.xbutton); 1625 mouse_report (ev.xbutton);
1547 break;
1548 }
1549#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1627 break;
1552 1628
1553 if (ev.xany.window == TermWin.vt) 1629 if (ev.xany.window == vt)
1554 { 1630 {
1631 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1632 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1633 ; // nop
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1634 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1635 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1636 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1558 ; 1637 ;
1559 1638
1560 XQueryPointer (display->display, TermWin.vt, 1639 XQueryPointer (dpy, vt,
1561 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1642 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1643 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
… …
1577#endif 1656#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1657 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1658 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1659
1581#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1663 {
1664 page_dirn scroll_selection_dir;
1585 int dist; 1665 int dist;
1586 1666
1587 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1589 */ 1669 */
1590 if (!sel_scroll_ev.active) 1670 if (!sel_scroll_ev.is_active ())
1591 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1671 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1592 1672
1593 /* save the event params so we can highlight 1673 /* save the event params so we can highlight
1594 * the selection in the pending-scroll loop 1674 * the selection in the pending-scroll loop
1595 */ 1675 */
1596 selection_save_x = ev.xbutton.x; 1676 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1677 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1678 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1679
1600 /* calc number of lines to scroll */ 1680 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1681 if (ev.xbutton.y < int_bwidth)
1602 { 1682 {
1603 scroll_selection_dir = UP; 1683 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1605 } 1685 }
1606 else 1686 else
1607 { 1687 {
1608 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1610 } 1690 }
1611 1691
1612 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1694 + 1;
1615 MIN_IT (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1617 } 1698 }
1618 else 1699 else
1619 { 1700 {
1620 /* we are within the text window, so we 1701 /* we are within the text window, so we
1621 * shouldn't be scrolling 1702 * shouldn't be scrolling
1622 */ 1703 */
1623 if (sel_scroll_ev.active)
1624 sel_scroll_ev.stop(); 1704 sel_scroll_ev.stop();
1625 } 1705 }
1626#endif 1706#endif
1627#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1628 } 1708 }
1629#endif 1709#endif
1630 } 1710 }
1631 } 1711 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1633 { 1713 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1635 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1636 ; 1716 ;
1637 1717
1638 XQueryPointer (display->display, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1639 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1722 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1644 scrollbar_size ()); 1724 scrollBar.size ());
1645 scr_refresh (refresh_type);
1646 refresh_limit = 0; 1725 want_refresh = 1;
1647 scrollbar_show (1); 1726 scrollBar.show (1);
1648 } 1727 }
1649 break; 1728 break;
1650 } 1729 }
1651}
1652 1730
1653#if TRANSPARENT 1731#if defined(CURSOR_BLINK)
1654void 1732 if (ev.type == KeyPress)
1733 cursor_blink_reset ();
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1749
1750 refresh_check ();
1751}
1752
1753#if ENABLE_FRILLS
1754void ecb_cold
1755rxvt_term::set_urgency (bool enable)
1756{
1757 if (enable == urgency_hint)
1758 return;
1759
1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1761 {
1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1763 XSetWMHints (dpy, parent, h);
1764 urgency_hint = enable;
1765 XFree (h);
1766 }
1767}
1768#endif
1769
1770void ecb_cold
1771rxvt_term::focus_in ()
1772{
1773 if (!focus)
1774 {
1775 focus = 1;
1776 want_refresh = 1;
1777
1778#if USE_XIM
1779 if (Input_Context != NULL)
1780 {
1781 im_set_position ();
1782 XSetICFocus (Input_Context);
1783 }
1784#endif
1785#if CURSOR_BLINK
1786 if (option (Opt_cursorBlink))
1787 cursor_blink_ev.again ();
1788#endif
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 pix_colors = pix_colors_focused;
1793 scr_recolour ();
1794 }
1795#endif
1796#if ENABLE_FRILLS
1797 if (option (Opt_urgentOnBell))
1798 set_urgency (0);
1799#endif
1800
1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 }
1803}
1804
1805void ecb_cold
1806rxvt_term::focus_out ()
1807{
1808 if (focus)
1809 {
1810 focus = 0;
1811 want_refresh = 1;
1812
1813#if ENABLE_FRILLS
1814 if (option (Opt_urgentOnBell))
1815 set_urgency (0);
1816#endif
1817#if ENABLE_FRILLS || ISO_14755
1818 if (iso14755buf)
1819 {
1820 iso14755buf = 0;
1821# if ISO_14755
1822 scr_overlay_off ();
1823# endif
1824 }
1825#endif
1826#if USE_XIM
1827 if (Input_Context != NULL)
1828 XUnsetICFocus (Input_Context);
1829#endif
1830#if CURSOR_BLINK
1831 if (option (Opt_cursorBlink))
1832 cursor_blink_ev.stop ();
1833
1834 hidden_cursor = 0;
1835#endif
1836#if OFF_FOCUS_FADING
1837 if (rs[Rs_fade])
1838 {
1839 pix_colors = pix_colors_unfocused;
1840 scr_recolour ();
1841 }
1842#endif
1843
1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 }
1846}
1847
1848void ecb_cold
1849rxvt_term::update_fade_color (unsigned int idx)
1850{
1851#if OFF_FOCUS_FADING
1852 if (rs[Rs_fade])
1853 {
1854 rgba c;
1855 pix_colors [Color_fade].get (c);
1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1857 }
1858#endif
1859}
1860
1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1862void ecb_hot
1655rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1656{ 1864{
1657 SET_R (this); 1865 make_current ();
1658 SET_LOCALE (locale); 1866
1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1869 return;
1659 1870
1660 switch (ev.type) 1871 switch (ev.type)
1661 { 1872 {
1662 case PropertyNotify: 1873 case PropertyNotify:
1663 /* 1874 /*
1664 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1665 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1666 */ 1877 */
1667 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1669 return; 1880 {
1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1889 }
1670 1890
1671 /* FALLTHROUGH */
1672 case ReparentNotify:
1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1674 want_refresh = want_full_refresh = 1;
1675 break; 1891 break;
1676 } 1892 }
1893
1894 refresh_check ();
1677} 1895}
1678#endif 1896#endif
1679 1897
1680void 1898void
1681rxvt_term::button_press (XButtonEvent &ev) 1899rxvt_term::button_press (XButtonEvent &ev)
1682{ 1900{
1683 int reportmode = 0, clickintime; 1901 int reportmode = 0, clickintime;
1684 1902
1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1903 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1904
1686 if (!bypass_keystate) 1905 if (!bypass_keystate)
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1906 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1907
1689 /* 1908 /*
1690 * VT window processing of button press 1909 * VT window processing of button press
1691 */ 1910 */
1692 if (ev.window == TermWin.vt) 1911 if (ev.window == vt)
1693 { 1912 {
1913 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914 return;
1915
1694#if ISO_14755 1916#if ISO_14755
1695 // 5.4 1917 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1918 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1919 {
1698 iso14755_54 (ev.x, ev.y); 1920 iso14755_54 (ev.x, ev.y);
… …
1708 /* save the xbutton state (for ButtonRelease) */ 1930 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1931 MEvent.state = ev.state;
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1932#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1933 if (ev.button == MEvent.button && clickintime)
1712 { 1934 {
1713 /* same button, within alloted time */ 1935 /* same button, within allowed time */
1714 MEvent.clicks++; 1936 MEvent.clicks++;
1937
1715 if (MEvent.clicks > 1) 1938 if (MEvent.clicks > 1)
1716 { 1939 {
1717 /* only report double clicks */ 1940 /* only report double clicks */
1718 MEvent.clicks = 2; 1941 MEvent.clicks = 2;
1719 mouse_report (ev); 1942 mouse_report (ev);
… …
1731 mouse_report (ev); 1954 mouse_report (ev);
1732 } 1955 }
1733#else 1956#else
1734 MEvent.button = ev.button; 1957 MEvent.button = ev.button;
1735 mouse_report (ev); 1958 mouse_report (ev);
1736#endif /* MOUSE_REPORT_DOUBLECLICK */ 1959#endif /* MOUSE_REPORT_DOUBLECLICK */
1737 1960
1738 } 1961 }
1739 else 1962 else
1740 { 1963 {
1741 if (ev.button != MEvent.button) 1964 if (ev.button != MEvent.button)
… …
1751#else 1974#else
1752 selection.rect = false; 1975 selection.rect = false;
1753#endif 1976#endif
1754 1977
1755 /* allow shift+left click to extend selection */ 1978 /* allow shift+left click to extend selection */
1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1979 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1757 { 1980 {
1758 if (MEvent.button == Button1 && clickintime) 1981 if (MEvent.button == Button1 && clickintime)
1759 selection_rotate (ev.x, ev.y); 1982 selection_rotate (ev.x, ev.y);
1760 else 1983 else
1761 selection_extend (ev.x, ev.y, 1); 1984 selection_extend (ev.x, ev.y, 1);
… …
1789 } 2012 }
1790 2013
1791 /* 2014 /*
1792 * Scrollbar window processing of button press 2015 * Scrollbar window processing of button press
1793 */ 2016 */
1794 if (isScrollbarWindow (ev.window)) 2017 if (scrollBar.state && ev.window == scrollBar.win)
1795 { 2018 {
1796 scrollBar.setIdle (); 2019 page_dirn direction = NO_DIR;
2020
2021 if (scrollBar.upButton (ev.y))
2022 direction = UP; /* up */
2023 else if (scrollBar.dnButton (ev.y))
2024 direction = DN; /* down */
2025
2026 scrollBar.state = SB_STATE_IDLE;
1797 /* 2027 /*
1798 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1799 * move up if mouse is above slider 2029 * move up if mouse is above slider
1800 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1801 * 2031 *
… …
1810 /* 2040 /*
1811 * Mouse report disabled scrollbar: 2041 * Mouse report disabled scrollbar:
1812 * arrow buttons - send up/down 2042 * arrow buttons - send up/down
1813 * click on scrollbar - send pageup/down 2043 * click on scrollbar - send pageup/down
1814 */ 2044 */
1815 if ((scrollBar.style == R_SB_NEXT 2045 if (direction == UP)
1816 && scrollbarnext_upButton (ev.y))
1817 || (scrollBar.style == R_SB_RXVT
1818 && scrollbarrxvt_upButton (ev.y)))
1819 tt_printf ("\033[A"); 2046 tt_printf ("\033[A");
1820 else if ((scrollBar.style == R_SB_NEXT 2047 else if (direction == DN)
1821 && scrollbarnext_dnButton (ev.y))
1822 || (scrollBar.style == R_SB_RXVT
1823 && scrollbarrxvt_dnButton (ev.y)))
1824 tt_printf ("\033[B"); 2048 tt_printf ("\033[B");
1825 else 2049 else
1826 switch (ev.button) 2050 switch (ev.button)
1827 { 2051 {
1828 case Button2: 2052 case Button2:
… …
1835 tt_printf ("\033[5~"); 2059 tt_printf ("\033[5~");
1836 break; 2060 break;
1837 } 2061 }
1838 } 2062 }
1839 else 2063 else
1840#endif /* NO_SCROLLBAR_REPORT */ 2064#endif /* NO_SCROLLBAR_REPORT */
1841
1842 {
1843 char upordown = 0;
1844
1845 if (scrollBar.style == R_SB_NEXT)
1846 { 2065 {
1847 if (scrollbarnext_upButton (ev.y)) 2066 if (direction != NO_DIR)
1848 upordown = -1; /* up */
1849 else if (scrollbarnext_dnButton (ev.y))
1850 upordown = 1; /* down */
1851 }
1852 else if (scrollBar.style == R_SB_RXVT)
1853 {
1854 if (scrollbarrxvt_upButton (ev.y))
1855 upordown = -1; /* up */
1856 else if (scrollbarrxvt_dnButton (ev.y))
1857 upordown = 1; /* down */
1858 }
1859 if (upordown)
1860 { 2067 {
1861#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2069 if (!cont_scroll_ev.is_active ())
1862 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1863#endif 2071#endif
1864 if (scr_page (upordown < 0 ? UP : DN, 1)) 2072 if (scr_page (direction, 1))
1865 { 2073 {
1866 if (upordown < 0) 2074 if (direction == UP)
1867 scrollBar.setUp (); 2075 scrollBar.state = SB_STATE_UP;
1868 else 2076 else
1869 scrollBar.setDn (); 2077 scrollBar.state = SB_STATE_DOWN;
1870 } 2078 }
1871 } 2079 }
1872 else 2080 else
1873 switch (ev.button) 2081 switch (ev.button)
1874 { 2082 {
1875 case Button2: 2083 case Button2:
1876 switch (scrollbar_align) 2084 switch (scrollBar.align)
1877 { 2085 {
1878 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
1879 csrO = 0; 2087 csrO = 0;
1880 break; 2088 break;
1881 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
1882 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
1883 break; 2091 break;
1884 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
1885 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
1886 break; 2094 break;
1887 } 2095 }
1888 2096
1889 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
1890 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
1891 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
1892 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1893 2101
1894 scrollBar.setMotion (); 2102 scrollBar.state = SB_STATE_MOTION;
1895 break; 2103 break;
1896 2104
1897 case Button1: 2105 case Button1:
1898 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
1899 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
1900 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
1901 2109
1902 case Button3: 2110 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
1904 { 2112 {
1905 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 2115 scr_page (UP, nrow - 1);
1908# else 2116# else
1909 scr_page (UP, TermWin.nrow / 4); 2117 scr_page (UP, nrow / 4);
1910# endif 2118# endif
1911 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 2121 scr_page (DN, nrow - 1);
1914# else 2122# else
1915 scr_page (DN, TermWin.nrow / 4); 2123 scr_page (DN, nrow / 4);
1916# endif 2124# endif
1917 else 2125 else
1918 scrollBar.setMotion (); 2126 scrollBar.state = SB_STATE_MOTION;
1919 } 2127 }
1920 else 2128 else
1921 { 2129 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 2131 (nrow
1924 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
1925 / scrollbar_size ())); 2133 / scrollBar.size ()));
1926 } 2134 }
1927 2135
1928 break; 2136 break;
1929 } 2137 }
1930 } 2138 }
2139
1931 return; 2140 return;
1932 } 2141 }
1933#if MENUBAR
1934 /*
1935 * Menubar window processing of button press
1936 */
1937 if (isMenuBarWindow (ev.window))
1938 menubar_control (ev);
1939#endif
1940} 2142}
1941 2143
1942void 2144void
1943rxvt_term::button_release (XButtonEvent &ev) 2145rxvt_term::button_release (XButtonEvent &ev)
1944{ 2146{
… …
1946 2148
1947 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
1948 if (!bypass_keystate) 2150 if (!bypass_keystate)
1949 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
1950 2152
1951 if (scrollbar_isUpDn ()) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1952 { 2154 {
1953 scrollBar.setIdle (); 2155 scrollBar.state = SB_STATE_IDLE;
1954 scrollbar_show (0); 2156 scrollBar.show (0);
1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1956 refresh_type &= ~SMOOTH_REFRESH;
1957#endif
1958 } 2157 }
1959 2158
1960#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
1963#endif 2161#endif
1964 2162
1965 if (ev.window == TermWin.vt) 2163 if (ev.window == vt)
1966 { 2164 {
2165 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2166 return;
2167
1967#if ISO_14755 2168#if ISO_14755
1968 // 5.4 2169 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2170 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2171 return;
1971#endif 2172#endif
2173
1972 if (reportmode) 2174 if (reportmode)
1973 { 2175 {
1974 /* mouse report from vt window */ 2176 /* mouse report from vt window */
1975 /* don't report release of wheel "buttons" */ 2177 /* don't report release of wheel "buttons" */
1976 if (ev.button >= 4) 2178 if (ev.button >= 4)
… …
1987 mouse_report (ev); 2189 mouse_report (ev);
1988 } 2190 }
1989#else /* MOUSE_REPORT_DOUBLECLICK */ 2191#else /* MOUSE_REPORT_DOUBLECLICK */
1990 MEvent.button = AnyButton; 2192 MEvent.button = AnyButton;
1991 mouse_report (ev); 2193 mouse_report (ev);
1992#endif /* MOUSE_REPORT_DOUBLECLICK */ 2194#endif /* MOUSE_REPORT_DOUBLECLICK */
1993 return; 2195 return;
1994 } 2196 }
1995 2197
1996 /* 2198 /*
1997 * dumb hack to compensate for the failure of click-and-drag 2199 * dumb hack to compensate for the failure of click-and-drag
… …
2006 { 2208 {
2007 case Button1: 2209 case Button1:
2008 case Button3: 2210 case Button3:
2009 selection_make (ev.time); 2211 selection_make (ev.time);
2010 break; 2212 break;
2213
2011 case Button2: 2214 case Button2:
2012 selection_request (ev.time, ev.x, ev.y); 2215 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2013 break; 2217 break;
2218
2014#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2015 case Button4: 2220 case Button4:
2016 case Button5: 2221 case Button5:
2017 { 2222 {
2018 int i; 2223 int lines;
2019 page_dirn v; 2224 page_dirn dirn;
2020 2225
2021 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2022 2227
2023 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2024 i = 1; 2229 lines = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2230 else if (option (Opt_mouseWheelScrollPage))
2026 i = TermWin.nrow - 1; 2231 lines = nrow - 1;
2027 else 2232 else
2028 i = 5; 2233 lines = 5;
2029 2234
2030# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2032 { 2237 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2035 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2036 2240
2037 if (slip_wheel_ev.at < NOW) 2241 if (!slip_wheel_ev.is_active ())
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2039
2040 slip_wheel_ev.start ();
2041 } 2243 }
2042 else 2244 else
2245# endif
2043 { 2246 {
2044# endif
2045# ifdef JUMP_MOUSE_WHEEL
2046 scr_page (v, i); 2247 scr_page (dirn, lines);
2047 scr_refresh (SMOOTH_REFRESH);
2048 scrollbar_show (1); 2248 scrollBar.show (1);
2049# else
2050 while (i--)
2051 {
2052 scr_page (v, 1);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1);
2055 }
2056# endif
2057# ifdef MOUSE_SLIP_WHEELING
2058 } 2249 }
2059#endif
2060 } 2250 }
2061 break; 2251 break;
2062#endif 2252#endif
2063 } 2253 }
2064 } 2254 }
2065#ifdef MENUBAR
2066 else if (isMenuBarWindow (ev.window))
2067 menubar_control (ev);
2068#endif
2069} 2255}
2070
2071#ifdef TRANSPARENT
2072#if TINTING
2073/* taken from aterm-0.4.2 */
2074
2075typedef uint32_t RUINT32T;
2076
2077void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2078{
2079 int sh_r, sh_g, sh_b;
2080 RUINT32T mask_r, mask_g, mask_b;
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i;
2085
2086 Visual* visual = display->visual;
2087
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089
2090 /* for convenience */
2091 mask_r = visual->red_mask;
2092 mask_g = visual->green_mask;
2093 mask_b = visual->blue_mask;
2094
2095 /* boring lookup table pre-initialization */
2096 switch (srcImage->bits_per_pixel) {
2097 case 15:
2098 if ((mask_r != 0x7c00) ||
2099 (mask_g != 0x03e0) ||
2100 (mask_b != 0x001f))
2101 return;
2102 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2103 lookup_r = lookup;
2104 lookup_g = lookup+32;
2105 lookup_b = lookup+32+32;
2106 sh_r = 10;
2107 sh_g = 5;
2108 sh_b = 0;
2109 break;
2110 case 16:
2111 if ((mask_r != 0xf800) ||
2112 (mask_g != 0x07e0) ||
2113 (mask_b != 0x001f))
2114 return;
2115 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2116 lookup_r = lookup;
2117 lookup_g = lookup+32;
2118 lookup_b = lookup+32+64;
2119 sh_r = 11;
2120 sh_g = 5;
2121 sh_b = 0;
2122 break;
2123 case 24:
2124 if ((mask_r != 0xff0000) ||
2125 (mask_g != 0x00ff00) ||
2126 (mask_b != 0x0000ff))
2127 return;
2128 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2129 lookup_r = lookup;
2130 lookup_g = lookup+256;
2131 lookup_b = lookup+256+256;
2132 sh_r = 16;
2133 sh_g = 8;
2134 sh_b = 0;
2135 break;
2136 case 32:
2137 if ((mask_r != 0xff0000) ||
2138 (mask_g != 0x00ff00) ||
2139 (mask_b != 0x0000ff))
2140 return;
2141 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2142 lookup_r = lookup;
2143 lookup_g = lookup+256;
2144 lookup_b = lookup+256+256;
2145 sh_r = 16;
2146 sh_g = 8;
2147 sh_b = 0;
2148 break;
2149 default:
2150 return; /* we do not support this color depth */
2151 }
2152
2153 /* prepare limits for color transformation (each channel is handled separately) */
2154 if (shade < 0) {
2155 shade = -shade;
2156 if (shade < 0) shade = 0;
2157 if (shade > 100) shade = 100;
2158
2159 lower_lim_r = 65535-rm;
2160 lower_lim_g = 65535-gm;
2161 lower_lim_b = 65535-bm;
2162
2163 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2164 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2165 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2166
2167 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2168 } else {
2169 if (shade < 0) shade = 0;
2170 if (shade > 100) shade = 100;
2171
2172 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2173
2174 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2175 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2176 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2177 }
2178
2179 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2180 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2181 {
2182 unsigned int tmp;
2183
2184 tmp = lower_lim_r;
2185 lower_lim_r = lower_lim_b;
2186 lower_lim_b = tmp;
2187
2188 tmp = upper_lim_r;
2189 upper_lim_r = upper_lim_b;
2190 upper_lim_b = tmp;
2191 }
2192
2193 /* fill our lookup tables */
2194 for (i = 0; i <= mask_r>>sh_r; i++)
2195 {
2196 RUINT32T tmp;
2197 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2198 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2199 lookup_r[i] = (tmp/65535)<<sh_r;
2200 }
2201 for (i = 0; i <= mask_g>>sh_g; i++)
2202 {
2203 RUINT32T tmp;
2204 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2205 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2206 lookup_g[i] = (tmp/65535)<<sh_g;
2207 }
2208 for (i = 0; i <= mask_b>>sh_b; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2212 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2213 lookup_b[i] = (tmp/65535)<<sh_b;
2214 }
2215
2216 /* apply table to input image (replacing colors by newly calculated ones) */
2217 switch (srcImage->bits_per_pixel)
2218 {
2219 case 15:
2220 {
2221 unsigned short *p1, *pf, *p, *pl;
2222 p1 = (unsigned short *) srcImage->data;
2223 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2224 while (p1 < pf)
2225 {
2226 p = p1;
2227 pl = p1 + srcImage->width;
2228 for (; p < pl; p++)
2229 {
2230 *p = lookup_r[(*p & 0x7c00)>>10] |
2231 lookup_g[(*p & 0x03e0)>> 5] |
2232 lookup_b[(*p & 0x001f)];
2233 }
2234 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2235 }
2236 break;
2237 }
2238 case 16:
2239 {
2240 unsigned short *p1, *pf, *p, *pl;
2241 p1 = (unsigned short *) srcImage->data;
2242 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2243 while (p1 < pf)
2244 {
2245 p = p1;
2246 pl = p1 + srcImage->width;
2247 for (; p < pl; p++)
2248 {
2249 *p = lookup_r[(*p & 0xf800)>>11] |
2250 lookup_g[(*p & 0x07e0)>> 5] |
2251 lookup_b[(*p & 0x001f)];
2252 }
2253 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2254 }
2255 break;
2256 }
2257 case 24:
2258 {
2259 unsigned char *p1, *pf, *p, *pl;
2260 p1 = (unsigned char *) srcImage->data;
2261 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2262 while (p1 < pf)
2263 {
2264 p = p1;
2265 pl = p1 + srcImage->width * 3;
2266 for (; p < pl; p += 3)
2267 {
2268 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2269 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2270 p[2] = lookup_r[(p[2] & 0x0000ff)];
2271 }
2272 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2273 }
2274 break;
2275 }
2276 case 32:
2277 {
2278 RUINT32T *p1, *pf, *p, *pl;
2279 p1 = (RUINT32T *) srcImage->data;
2280 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2281
2282 while (p1 < pf)
2283 {
2284 p = p1;
2285 pl = p1 + srcImage->width;
2286 for (; p < pl; p++)
2287 {
2288 *p = lookup_r[(*p & 0xff0000)>>16] |
2289 lookup_g[(*p & 0x00ff00)>> 8] |
2290 lookup_b[(*p & 0x0000ff)] |
2291 (*p & ~0xffffff);
2292 }
2293 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2294 }
2295 break;
2296 }
2297 }
2298
2299 free (lookup);
2300}
2301#endif
2302
2303/*
2304 * Check our parents are still who we think they are.
2305 * Do transparency updates if required
2306 */
2307int
2308rxvt_term::check_our_parents ()
2309{
2310 int i, pchanged, aformat, have_pixmap, rootdepth;
2311 unsigned long nitems, bytes_after;
2312 Atom atype;
2313 unsigned char *prop = NULL;
2314 Window root, oldp, *list;
2315 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr;
2317
2318 pchanged = 0;
2319
2320 if (!(options & Opt_transparent))
2321 return pchanged; /* Don't try any more */
2322
2323 XGetWindowAttributes (display->display, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth;
2325
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2327
2328 if (rootdepth != wattr.depth)
2329 {
2330 if (am_transparent)
2331 {
2332 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0;
2335 }
2336
2337 return pchanged; /* Don't try any more */
2338 }
2339
2340 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False);
2342
2343 /*
2344 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that.
2347 */
2348 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success);
2352
2353 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success);
2358
2359 if (!i || prop == NULL
2360#if TINTING
2361 || !rs[Rs_color + Color_tint]
2362#endif
2363 )
2364 have_pixmap = 0;
2365 else
2366 {
2367 have_pixmap = 1;
2368 rootpixmap = *(Pixmap *)prop;
2369 XFree (prop);
2370 }
2371
2372 if (have_pixmap)
2373 {
2374 /*
2375 * Copy display->root pixmap transparency
2376 */
2377 int sx, sy, nx, ny;
2378 unsigned int nw, nh;
2379 Window cr;
2380 XImage *image;
2381 GC gc;
2382 XGCValues gcvalue;
2383
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2385 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height;
2388 nx = ny = 0;
2389
2390 if (sx < 0)
2391 {
2392 nw += sx;
2393 nx = -sx;
2394 sx = 0;
2395 }
2396
2397 if (sy < 0)
2398 {
2399 nh += sy;
2400 ny = -sy;
2401 sy = 0;
2402 }
2403
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406
2407 XSync (display->display, False);
2408 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */
2413 allowedxerror = 0;
2414
2415 if (image == NULL)
2416 {
2417 if (am_transparent && am_pixmap_trans)
2418 {
2419 pchanged = 1;
2420 if (TermWin.pixmap != None)
2421 {
2422 XFreePixmap (display->display, TermWin.pixmap);
2423 TermWin.pixmap = None;
2424 }
2425 }
2426
2427 am_pixmap_trans = 0;
2428 }
2429 else
2430 {
2431 if (TermWin.pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap);
2433
2434#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint))
2436 {
2437 unsigned short rm, gm, bm;
2438 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2439
2440 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2441
2442 ShadeXImage (display, image, shade, rm, gm, bm);
2443 }
2444#endif
2445
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2447 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc);
2452 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]);
2455
2456 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1;
2458
2459 am_transparent = am_pixmap_trans = 1;
2460 }
2461 }
2462
2463 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2465 else
2466 {
2467 unsigned int n;
2468 /*
2469 * InheritPixmap transparency
2470 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2472 {
2473 oldp = TermWin.parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n);
2476 XFree (list);
2477
2478 if (TermWin.parent[i] == display->root)
2479 {
2480 if (oldp != None)
2481 pchanged = 1;
2482
2483 break;
2484 }
2485
2486 if (oldp != TermWin.parent[i])
2487 pchanged = 1;
2488 }
2489
2490 n = 0;
2491
2492 if (pchanged)
2493 {
2494 for (; n < (unsigned int)i; n++)
2495 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2500 break;
2501 }
2502 }
2503 }
2504
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2506 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */
2511 }
2512 else
2513 {
2514#if WAIT_FOR_WM
2515 /* wait (an arbitrary period) for the WM to do its thing
2516 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1);
2518#endif
2519 for (n = 0; n < (unsigned int)i; n++)
2520 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]);
2523 }
2524
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2526 am_transparent = 1;
2527 }
2528
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None;
2531 }
2532
2533 if (scrollBar.win)
2534 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle ();
2537 scrollbar_show (0);
2538 }
2539
2540 if (am_transparent)
2541 {
2542 want_refresh = want_full_refresh = 1;
2543 if (am_pixmap_trans)
2544 flush ();
2545 }
2546
2547 return pchanged;
2548}
2549#endif
2550 2256
2551/*}}} */ 2257/*}}} */
2552 2258
2553bool 2259void ecb_hot
2554rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2555{ 2261{
2556 bool flag = false;
2557 unicode_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2558 unsigned char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2559 2264
2560 for (;;) 2265 for (;;)
2561 { 2266 {
2562 if (ch == NOCHAR) 2267 if (ecb_unlikely (ch == NOCHAR))
2563 { 2268 {
2564 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2565 ch = next_char (); 2270 ch = next_char ();
2566 }
2567 2271
2568 if (ch == NOCHAR) // TODO: improve 2272 if (ch == NOCHAR)
2569 break; 2273 break;
2274 }
2570 2275
2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2276 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2572 { 2277 {
2573 if (!seen_input) 2278 if (ecb_unlikely (!seen_input))
2574 { 2279 {
2575 seen_input = 1; 2280 seen_input = 1;
2576 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2577 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2578 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2284 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2285 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2286 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2287 // resized.
2583 if (seen_resize) 2288 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2289 kill (-cmd_pid, SIGWINCH);
2585 } 2290 }
2586 2291
2587 /* Read a text string from the input buffer */ 2292 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2293 wchar_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2294 bool refreshnow = false;
2590 int nlines = 0; 2295 int nlines = 0;
2591 unicode_t *str = buf; 2296 wchar_t *str = buf;
2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2592 2298
2593 for (;;) 2299 for (;;)
2594 { 2300 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2301 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2596 break; 2302 break;
2597 2303
2598 *str++ = ch; 2304 *str++ = ch;
2599 2305
2600 if (ch == C0_LF) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2601 { 2307 {
2308 if (ch == C0_LF)
2602 nlines++; 2309 nlines++;
2310
2603 refresh_count++; 2311 refresh_count++;
2604 2312
2605 if (!(options & Opt_jumpScroll) 2313 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2607 { 2314 {
2315 refresh_count = 0;
2316
2317 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2318 {
2608 refreshnow = true; 2319 refreshnow = true;
2609 ch = NOCHAR; 2320 ch = NOCHAR;
2610 break; 2321 break;
2322 }
2611 } 2323 }
2612 2324
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2325 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2326 if (nlines >= nrow - 1)
2615 { 2327 {
2328 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2329 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2616 scr_add_lines (buf, nlines, str - buf); 2330 scr_add_lines (buf, str - buf, nlines);
2331
2617 nlines = 0; 2332 nlines = 0;
2618 str = buf; 2333 str = buf;
2334 eol = str + min (ncol, UBUFSIZ);
2619 } 2335 }
2620 }
2621 2336
2622 if (str >= buf + UBUFSIZ) 2337 if (str >= eol)
2623 { 2338 {
2339 if (eol >= buf + UBUFSIZ)
2340 {
2624 ch = NOCHAR; 2341 ch = NOCHAR;
2625 break; 2342 break;
2343 }
2344 else
2345 eol = min (eol + ncol, buf + UBUFSIZ);
2346 }
2347
2626 } 2348 }
2627 2349
2628 seq_begin = cmdbuf_ptr; 2350 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2351 ch = next_char ();
2630 } 2352 }
2631 2353
2354 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2355 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2632 scr_add_lines (buf, nlines, str - buf); 2356 scr_add_lines (buf, str - buf, nlines);
2633 2357
2634 /* 2358 /*
2635 * If there have been a lot of new lines, then update the screen 2359 * If there have been a lot of new lines, then update the screen
2636 * What the heck I'll cheat and only refresh less than every page-full. 2360 * What the heck we'll cheat and only refresh less than every page-full.
2637 * the number of pages between refreshes is refresh_limit, which 2361 * if skipScroll is enabled.
2638 * is incremented here because we must be doing flat-out scrolling.
2639 */ 2362 */
2640 if (refreshnow) 2363 if (refreshnow)
2641 { 2364 {
2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643 refresh_limit++;
2644 else
2645 {
2646 flag = true;
2647 scr_refresh (refresh_type); 2365 scr_refresh ();
2648 } 2366 want_refresh = 1;
2649 } 2367 }
2650
2651 } 2368 }
2652 else 2369 else
2653 { 2370 {
2654 try 2371 try
2655 { 2372 {
… …
2663 } 2380 }
2664 2381
2665 ch = NOCHAR; 2382 ch = NOCHAR;
2666 } 2383 }
2667 } 2384 }
2668
2669 return flag;
2670}
2671
2672// read the next octet
2673unicode_t
2674rxvt_term::next_octet ()
2675{
2676 return cmdbuf_ptr < cmdbuf_endp
2677 ? *cmdbuf_ptr++
2678 : NOCHAR;
2679} 2385}
2680 2386
2681// read the next character 2387// read the next character
2682unicode_t 2388wchar_t ecb_hot
2683rxvt_term::next_char () 2389rxvt_term::next_char () NOTHROW
2684{ 2390{
2685 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2686 { 2392 {
2687 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2688 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2689 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2690 2396
2691 wchar_t wc; 2397 wchar_t wc;
2692 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2693 2399
2694 if (len == (size_t)-2) 2400 if (len == (size_t)-2)
2695 { 2401 {
2696 // the mbstate stores incomplete sequences. didn't know this :/ 2402 // the mbstate stores incomplete sequences. didn't know this :/
2697 cmdbuf_ptr = cmdbuf_endp; 2403 cmdbuf_ptr = cmdbuf_endp;
2698 break; 2404 break;
2699 } 2405 }
2700 2406
2701 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2408 {
2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2413 }
2703 2414
2704 // assume wchar == unicode 2415 // assume wchar == unicode
2705 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
2706 return wc & UNICODE_MASK; 2417 return wc & UNICODE_MASK;
2707 } 2418 }
2708 2419
2709 return NOCHAR; 2420 return NOCHAR;
2710} 2421}
2711 2422
2712/* rxvt_cmd_getc () - Return next input character */ 2423// read the next octet
2713/* 2424uint32_t ecb_hot
2714 * Return the next input character after first passing any keyboard input 2425rxvt_term::next_octet () NOTHROW
2715 * to the command.
2716 */
2717unicode_t
2718rxvt_term::cmd_getc ()
2719{ 2426{
2427 return cmdbuf_ptr < cmdbuf_endp
2428 ? (unsigned char)*cmdbuf_ptr++
2429 : NOCHAR;
2430}
2431
2432static class out_of_input out_of_input;
2433
2434wchar_t ecb_hot
2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2436{
2720 unicode_t c = next_char (); 2437 wchar_t c = next_char ();
2721 2438
2722 if (c == NOCHAR) 2439 if (c == NOCHAR)
2723 throw out_of_input; 2440 throw out_of_input;
2724 2441
2725 return c; 2442 return c;
2726} 2443}
2727 2444
2728unicode_t 2445uint32_t ecb_hot
2729rxvt_term::cmd_get8 () 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2730{ 2447{
2731 unicode_t c = next_octet (); 2448 uint32_t c = next_octet ();
2732 2449
2733 if (c == NOCHAR) 2450 if (c == NOCHAR)
2734 throw out_of_input; 2451 throw out_of_input;
2735 2452
2736 return c; 2453 return c;
2737} 2454}
2738 2455
2739/*{{{ print pipe */ 2456/*{{{ print pipe */
2740/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2741#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2742FILE * 2459FILE * ecb_cold
2743rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2744{ 2461{
2745 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2746 2463
2747 if (stream == NULL) 2464 if (stream == NULL)
2748 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2749 2466
2750 return stream; 2467 return stream;
2751} 2468}
2752 2469
2753int 2470int ecb_cold
2754rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2755{ 2472{
2756 fflush (stream); 2473 fflush (stream);
2757 return pclose (stream); 2474 return pclose (stream);
2758} 2475}
2759 2476
2760/* 2477/*
2761 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2762 */ 2479 */
2763void 2480void ecb_cold
2764rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2765{ 2482{
2766 int done; 2483 FILE *fd = popen_printer ();
2767 FILE *fd;
2768 2484
2769 if ((fd = popen_printer ()) == NULL) 2485 if (!fd)
2770 return; 2486 return;
2771 2487
2772 /* 2488 /*
2773 * Send all input to the printer until either ESC[4i or ESC[?4i 2489 * Send all input to the printer until either ESC[4i or ESC[?4i
2774 * is received. 2490 * is received.
2775 */ 2491 */
2776 for (done = 0; !done;) 2492 for (int done = 0; !done; )
2777 { 2493 {
2778 unsigned char buf[8]; 2494 unsigned char buf[8];
2779 unicode_t ch; 2495 unicode_t ch;
2780 unsigned int i, len; 2496 unsigned int i, len;
2781 2497
… …
2800 { 2516 {
2801 if ((buf[len++] = cmd_getc ()) == 'i') 2517 if ((buf[len++] = cmd_getc ()) == 'i')
2802 break; /* done = 1 */ 2518 break; /* done = 1 */
2803 } 2519 }
2804 } 2520 }
2805 2521
2806 for (i = 0; i < len; i++) 2522 for (i = 0; i < len; i++)
2807 if (putc (buf[i], fd) == EOF) 2523 if (putc (buf[i], fd) == EOF)
2808 { 2524 {
2809 done = 1; 2525 done = 1;
2810 break; 2526 break;
… …
2812 } 2528 }
2813 } 2529 }
2814 2530
2815 pclose_printer (fd); 2531 pclose_printer (fd);
2816} 2532}
2817#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2818/*}}} */ 2534/*}}} */
2819 2535
2820/* *INDENT-OFF* */
2821enum { 2536enum {
2822 C1_40 = 0x40, 2537 C1_40 = 0x40,
2823 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2538 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2824 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2539 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2825 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2826 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2827}; 2542};
2828/* *INDENT-ON* */
2829 2543
2830/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2831void 2545void ecb_hot
2832rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2833{ 2547{
2834 switch (ch) 2548 switch (ch)
2835 { 2549 {
2836 case C0_ESC: 2550 case C0_ESC:
2837 process_escape_seq (); 2551 process_escape_seq ();
2838 break; 2552 break;
2839 case C0_ENQ: /* terminal Status */ 2553 case C0_ENQ: /* terminal Status */
2840 if (rs[Rs_answerbackstring]) 2554 if (rs[Rs_answerbackstring])
2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2555 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2843 else 2556 else
2844 tt_write ((unsigned char *)VT100_ANS, 2557 tt_write (VT100_ANS, strlen (VT100_ANS));
2845 (unsigned int)strlen (VT100_ANS));
2846 break; 2558 break;
2847 case C0_BEL: /* bell */ 2559 case C0_BEL: /* bell */
2848 scr_bell (); 2560 scr_bell ();
2849 break; 2561 break;
2850 case C0_BS: /* backspace */ 2562 case C0_BS: /* backspace */
… …
2874 process_dcs_seq (); 2586 process_dcs_seq ();
2875 break; 2587 break;
2876 case 0x9b: /* CSI */ 2588 case 0x9b: /* CSI */
2877 process_csi_seq (); 2589 process_csi_seq ();
2878 break; 2590 break;
2879 case 0x9d: /* CSI */ 2591 case 0x9d: /* OSC */
2880 process_osc_seq (); 2592 process_osc_seq ();
2881 break; 2593 break;
2882#endif 2594#endif
2883 } 2595 }
2884} 2596}
2885/*}}} */ 2597/*}}} */
2886 2598
2887 2599
2888/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
2889void 2601void ecb_cold
2890rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
2891{ 2603{
2892 int row, col; 2604 int row, col;
2893 2605
2894 switch (ch) 2606 switch (ch)
… …
2928 break; 2640 break;
2929 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
2930 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2931 break; 2643 break;
2932 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
2933 PrivMode (0, PrivMode_vt52); 2645 priv_modes &= ~PrivMode_vt52;
2934 break; 2646 break;
2935 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
2936 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
2937 /* unimplemented */ 2649 /* unimplemented */
2938 break; 2650 break;
… …
2944} 2656}
2945/*}}} */ 2657/*}}} */
2946 2658
2947 2659
2948/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
2949void 2661void ecb_hot
2950rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
2951{ 2663{
2952 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
2953 2665
2954 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
2957 return; 2669 return;
2958 } 2670 }
2959 2671
2960 switch (ch) 2672 switch (ch)
2961 { 2673 {
2962 /* case 1: do_tek_mode (); break; */
2963 case '#': 2674 case '#':
2964 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
2965 scr_E (); 2676 scr_E ();
2966 break; 2677 break;
2967 case '(': 2678 case '(':
… …
2974 scr_charset_set (2, (unsigned int)cmd_getc ()); 2685 scr_charset_set (2, (unsigned int)cmd_getc ());
2975 break; 2686 break;
2976 case '+': 2687 case '+':
2977 scr_charset_set (3, (unsigned int)cmd_getc ()); 2688 scr_charset_set (3, (unsigned int)cmd_getc ());
2978 break; 2689 break;
2979#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
2980 case '6': 2691 case '6':
2981 scr_backindex (); 2692 scr_backindex ();
2982 break; 2693 break;
2983#endif 2694#endif
2984 case '7': 2695 case '7':
2985 scr_cursor (SAVE); 2696 scr_cursor (SAVE);
2986 break; 2697 break;
2987 case '8': 2698 case '8':
2988 scr_cursor (RESTORE); 2699 scr_cursor (RESTORE);
2989 break; 2700 break;
2990#if ENABLE_FRILLS 2701#if !ENABLE_MINIMAL
2991 case '9': 2702 case '9':
2992 scr_forwardindex (); 2703 scr_forwardindex ();
2993 break; 2704 break;
2994#endif 2705#endif
2706 // DECPAM/DECPNM
2995 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
2996 case '>': 2710 case '>':
2997 PrivMode ((ch == '='), PrivMode_aplKP); 2711 priv_modes &= ~PrivMode_aplKP;
2998 break; 2712 break;
2999 2713
3000 case C1_40: 2714 case C1_40:
3001 cmd_getc (); 2715 cmd_getc ();
3002 break; 2716 break;
… …
3005 break; 2719 break;
3006 2720
3007 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
3008 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
3009 { 2723 {
3010 unicode_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
3011 scr_add_lines (nlcr, 1, 2); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3012 } 2726 }
3013 break; 2727 break;
3014 2728
3015 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
3016 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
3017 process_graphics (); 2731 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q')
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3018 break; 2734 break;
3019 2735
3020 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
3021 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
3022 scr_set_tab (1); 2738 scr_set_tab (1);
… …
3026 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
3027 scr_index (DN); 2743 scr_index (DN);
3028 break; 2744 break;
3029 2745
3030 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
3031 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
3032 2748
3033 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
3034 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
3035 2751
3036 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
3037 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
3038 process_dcs_seq (); 2754 process_dcs_seq ();
3039 break; 2755 break;
3040 2756
3041 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2757 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3042 case C1_SCI: /* ESC Z */ 2758 case C1_SCI: /* ESC Z */
3043 tt_write ((const unsigned char *)ESCZ_ANSWER, 2759 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3044 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3045 break; /* steal obsolete ESC [ c */ 2760 break; /* steal obsolete ESC [ c */
3046 2761
3047 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2762 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3048 case C1_CSI: /* ESC [ */ 2763 case C1_CSI: /* ESC [ */
3049 process_csi_seq (); 2764 process_csi_seq ();
3050 break; 2765 break;
3051 2766
3052 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2767 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3053 case C1_OSC: /* ESC ] */ 2768 case C1_OSC: /* ESC ] */
3054 process_osc_seq (); 2769 process_osc_seq ();
3055 break; 2770 break;
3056 2771
3057 /* 8.3.106: RESET TO INITIAL STATE */ 2772 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3058 case 'c': 2773 case 'c':
3059 mbstate.reset (); 2774 mbstate.reset ();
3060 scr_poweron (); 2775 scr_poweron ();
3061 scrollbar_show (1); 2776 scrollBar.show (1);
3062 break; 2777 break;
3063 2778
3064 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2779 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3065 case 'n': 2780 case 'n':
3066 scr_charset_choose (2); 2781 scr_charset_choose (2);
… …
3073 } 2788 }
3074} 2789}
3075/*}}} */ 2790/*}}} */
3076 2791
3077/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3078/* *INDENT-OFF* */
3079enum { 2793enum {
3080 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
3081 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2795 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3082 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2796 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3083 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2797 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3086 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2800 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3087 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2801 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3088 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2802 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3089}; 2803};
3090 2804
3091#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2805#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3092 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2806 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3093 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2807 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3094#define get_byte_array_bit(array, bit) \ 2808#define get_byte_array_bit(array, bit) \
3095 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2809 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3096 2810
3097const unsigned char csi_defaults[] = 2811static const unsigned char csi_defaults[] =
3098 { 2812 {
3099 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2813 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3100 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2814 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3101 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2815 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3102 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2816 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3103 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2817 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3104 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3105 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2819 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3106 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3107 }; 2821 };
3108/* *INDENT-ON* */
3109 2822
3110void 2823void ecb_hot
3111rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
3112{ 2825{
3113 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
3114 unsigned int nargs, p; 2827 unsigned int nargs, p;
3115 int n, ndef; 2828 int n, ndef;
3116 int arg[ESC_ARGS]; 2829 int arg[ESC_ARGS] = { };
3117 2830
3118 for (nargs = ESC_ARGS; nargs > 0;) 2831 nargs = 0;
3119 arg[--nargs] = 0;
3120 2832
3121 priv = 0; 2833 priv = 0;
3122 ch = cmd_getc (); 2834 ch = cmd_getc ();
3123 if (ch >= '<' && ch <= '?') 2835 if ((ch >= '<' && ch <= '?') || ch == '!')
2836 {
3124 { /* '<' '=' '>' '?' */ 2837 /* '<' '=' '>' '?' '!' */
3125 priv = ch; 2838 priv = ch;
3126 ch = cmd_getc (); 2839 ch = cmd_getc ();
3127 } 2840 }
3128 2841
2842 prev_ch = 0;
3129 /* read any numerical arguments */ 2843 /* read any numerical arguments */
3130 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
3131 { 2845 {
3132 if (isdigit (ch)) 2846 if (isdigit (ch))
3133 { 2847 {
… …
3143 n = -1; 2857 n = -1;
3144 } 2858 }
3145 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
3146 process_nonprinting (ch); 2860 process_nonprinting (ch);
3147 2861
2862 prev_ch = ch;
3148 ch = cmd_getc (); 2863 ch = cmd_getc ();
3149 } 2864 }
3150 2865
3151 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
3152 return; 2867 return;
… …
3158 ndef = get_byte_array_bit (csi_defaults, i); 2873 ndef = get_byte_array_bit (csi_defaults, i);
3159 for (p = 0; p < nargs; p++) 2874 for (p = 0; p < nargs; p++)
3160 if (arg[p] == -1) 2875 if (arg[p] == -1)
3161 arg[p] = ndef; 2876 arg[p] = ndef;
3162 2877
3163#ifdef DEBUG_CMD
3164 fprintf (stderr, "CSI ");
3165 for (p = 0; p < nargs; p++)
3166 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3167 fprintf (stderr, "%c\n", ch);
3168#endif
3169
3170 /* 2878 /*
3171 * private mode handling 2879 * private mode handling
3172 */ 2880 */
3173 if (priv) 2881 if (priv)
3174 { 2882 {
3175 switch (priv) 2883 switch (priv)
3176 { 2884 {
3177 case '>': 2885 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 2886 if (ch == CSI_DA) /* secondary device attributes */
2887 {
2888 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2889 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2890 //
2891 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2892 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2893 // versions.
2894 //
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2895 tt_printf ("\033[>%d;95;0c", 'U');
2896 }
3180 break; 2897 break;
2898
3181 case '?': 2899 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 2901 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 2902 break;
2903
2904 case '!':
2905 if (ch == CSI_70)
2906 {
2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2908 scr_soft_reset ();
2909
2910 static const int pm_h[] = { 7, 25 };
2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2912
2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3185 } 2915 }
2916 break;
2917 }
2918
3186 return; 2919 return;
3187 } 2920 }
3188 2921
3189 switch (ch) 2922 switch (ch)
3190 { 2923 {
… …
3204 } 2937 }
3205 break; 2938 break;
3206#endif 2939#endif
3207 2940
3208 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3209 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3210 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
3211 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
3212 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3213 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3214 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
3215 break; 2948 break;
3216 2949
3217 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3218 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3289 3022
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3023 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 3024 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 3025 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3026 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3027 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3028 break;
3296 3029
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3030 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3031 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3299 (unsigned int) (sizeof (VT100_ANS) - 1));
3300 break; 3032 break;
3301 3033
3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3034 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3303 process_sgr_mode (nargs, arg); 3035 process_sgr_mode (nargs, arg);
3304 break; 3036 break;
… …
3311 break; 3043 break;
3312 case 6: /* CPR requested */ 3044 case 6: /* CPR requested */
3313 scr_report_position (); 3045 scr_report_position ();
3314 break; 3046 break;
3315 case 7: /* unofficial extension */ 3047 case 7: /* unofficial extension */
3316 if (options & Opt_insecure) 3048 if (option (Opt_insecure))
3317 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3049 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318 break; 3050 break;
3319 case 8: /* unofficial extension */ 3051 case 8: /* unofficial extension */
3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3052 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321 break; 3053 break;
… …
3369 scr_insert_mode (1); 3101 scr_insert_mode (1);
3370 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3371 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3372 break; 3104 break;
3373 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3374 /* 3111 /*
3375 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3376 */ 3113 */
3377 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3378 if (nargs == 1) 3115 if (nargs == 1)
… …
3388 break; 3125 break;
3389 case CSI_75: 3126 case CSI_75:
3390 scr_cursor (RESTORE); 3127 scr_cursor (RESTORE);
3391 break; 3128 break;
3392 3129
3393#if ENABLE_FRILLS 3130#if !ENABLE_MINIMAL
3394 case CSI_74: 3131 case CSI_74:
3395 process_window_ops (arg, nargs); 3132 process_window_ops (arg, nargs);
3396 break; 3133 break;
3397#endif 3134#endif
3398 3135
… …
3405 break; 3142 break;
3406 } 3143 }
3407} 3144}
3408/*}}} */ 3145/*}}} */
3409 3146
3410#if ENABLE_FRILLS 3147#if !ENABLE_MINIMAL
3411/* ARGSUSED */
3412void 3148void
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3150{
3415 int x, y; 3151 int x, y;
3416 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
3417 Window wdummy; 3153 Window wdummy;
3154
3155 dLocal (Display *, dpy);
3418 3156
3419 if (nargs == 0) 3157 if (nargs == 0)
3420 return; 3158 return;
3421 3159
3422 switch (args[0]) 3160 switch (args[0])
3423 { 3161 {
3424 /* 3162 /*
3425 * commands 3163 * commands
3426 */ 3164 */
3427 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3166 XMapWindow (dpy, parent);
3429 break; 3167 break;
3430 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3169 XIconifyWindow (dpy, parent, display->screen);
3432 DefaultScreen (display->display));
3433 break; 3170 break;
3434 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3436 break; 3173 break;
3437 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3176 break;
3440 case 5: /* raise window */ 3177 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3178 XRaiseWindow (dpy, parent);
3442 break; 3179 break;
3443 case 6: /* lower window */ 3180 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3181 XLowerWindow (dpy, parent);
3445 break; 3182 break;
3446 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3447 scr_touch (true); 3184 scr_touch (true);
3448 break; 3185 break;
3449 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3187 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3188 (unsigned int) (args[1] * fheight));
3452 break; 3189 break;
3453 3190
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3192 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3194 set_widthheight ((unsigned int)vt_width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3195 (unsigned int) (args[1] * fheight));
3459 break; 3196 break;
3460
3461 3197
3462 /* 3198 /*
3463 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3464 */ 3200 */
3465 case 11: /* report window state */ 3201 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3204 break;
3469 case 13: /* report window position */ 3205 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3211 break;
3476 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3215 break;
3480 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3218 break;
3483 case 19: /* report window size (chars) */ 3219 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3221 break;
3486 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3487 { 3223 {
3488 char *s; 3224 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3226 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3227 XFree (s);
3492 } 3228 }
3493 break; 3229 break;
3494 case 21: /* report window title */ 3230 case 21: /* report window title */
3495 { 3231 {
3496 char *s; 3232 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3234 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3235 XFree (s);
3500 } 3236 }
3501 break; 3237 break;
3502 } 3238 }
3503} 3239}
… …
3506/*----------------------------------------------------------------------*/ 3242/*----------------------------------------------------------------------*/
3507/* 3243/*
3508 * get input up until STRING TERMINATOR (or BEL) 3244 * get input up until STRING TERMINATOR (or BEL)
3509 * ends_how is terminator used. returned input must be free()'d 3245 * ends_how is terminator used. returned input must be free()'d
3510 */ 3246 */
3511unsigned char * 3247char *
3512rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3513{ 3249{
3514 unicode_t ch; 3250 unicode_t ch;
3515 bool seen_esc = false; 3251 bool seen_esc = false;
3516 unsigned int n = 0; 3252 unsigned int n = 0;
3517 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3518 3254
3519 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3520 { 3256 {
3521 if (seen_esc) 3257 if (seen_esc)
3522 { 3258 {
… …
3530 seen_esc = true; 3266 seen_esc = true;
3531 continue; 3267 continue;
3532 } 3268 }
3533 else if (ch == C0_BEL || ch == CHAR_ST) 3269 else if (ch == C0_BEL || ch == CHAR_ST)
3534 break; 3270 break;
3271 else if (ch == C0_SYN)
3272 ch = cmd_get8 ();
3535 else if (ch < 0x20) 3273 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3537 3275
3538 seen_esc = false; 3276 seen_esc = false;
3539 3277
3540 if (n >= sizeof (string) - 1) 3278 if (n >= sizeof (string) - 1)
3541 // stop at some sane length 3279 // stop at some sane length
3542 return NULL; 3280 return NULL;
3543 3281
3544 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 ();
3546 else
3547 string[n++] = ch; 3282 string[n++] = ch;
3548 } 3283 }
3549 3284
3550 string[n++] = '\0'; 3285 string[n++] = '\0';
3551 3286
3552 ends_how = (ch == 0x5c ? C0_ESC : ch); 3287 ends_how = (ch == 0x5c ? C0_ESC : ch);
3553 3288
3554 return (unsigned char *)rxvt_wcstombs (string); 3289 return rxvt_wcstombs (string);
3555} 3290}
3556 3291
3557/*----------------------------------------------------------------------*/ 3292/*----------------------------------------------------------------------*/
3558/* 3293/*
3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3294 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3560 */ 3295 */
3561void 3296void
3562rxvt_term::process_dcs_seq () 3297rxvt_term::process_dcs_seq ()
3563{ 3298{
3564 unsigned char *s;
3565 unicode_t eh;
3566
3567 /* 3299 /*
3568 * Not handled yet 3300 * Not handled yet
3569 */ 3301 */
3302
3303 unicode_t eh;
3570 s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3571 if (s) 3305 if (s)
3572 free (s); 3306 free (s);
3573 3307
3574 return; 3308 return;
3575} 3309}
… …
3579 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3313 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3580 */ 3314 */
3581void 3315void
3582rxvt_term::process_osc_seq () 3316rxvt_term::process_osc_seq ()
3583{ 3317{
3584 unicode_t ch, eh;
3585 int arg; 3318 int arg;
3586 3319
3587 ch = cmd_getc (); 3320 unicode_t ch = cmd_getc ();
3588 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3321 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3589 arg = arg * 10 + (ch - '0'); 3322 arg = arg * 10 + (ch - '0');
3590 3323
3591 if (ch == ';') 3324 if (ch == ';')
3592 { 3325 {
3326 unicode_t eh;
3593 unsigned char *s = get_to_st (eh); 3327 char *s = get_to_st (eh);
3594 3328
3595 if (s) 3329 if (s)
3596 { 3330 {
3597 process_xterm_seq (arg, (char *)s, eh); 3331 process_xterm_seq (arg, s, eh);
3598 free (s); 3332 free (s);
3599 } 3333 }
3600 } 3334 }
3601} 3335}
3602 3336
3603void 3337void
3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3338rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3605{ 3339{
3606 if (str[0] == '?' && !str[1]) 3340 if (str[0] == '?' && !str[1])
3607 { 3341 {
3608 unsigned short r, g, b; 3342 rgba c;
3609 pix_colors_focused[color].get (display, r, g, b); 3343 pix_colors_focused[color].get (c);
3344
3345#if XFT
3346 if (c.a != rgba::MAX_CC)
3347 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3348 else
3349#endif
3610 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3350 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3611 } 3351 }
3612 else 3352 else
3613 set_window_color (color, str); 3353 set_window_color (color, str);
3614} 3354}
3615 3355
3616/* 3356/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3357 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3618 * 0 = change iconName/title
3619 * 1 = change iconName
3620 * 2 = change title
3621 * 4 = change color
3622 * 10 = change fg color
3623 * 11 = change bg color
3624 * 12 = change text color
3625 * 13 = change mouse foreground color
3626 * 17 = change highlight character colour
3627 * 18 = change bold character color
3628 * 19 = change underlined character color
3629 * 46 = change logfile (not implemented)
3630 * 50 = change font
3631 *
3632 * rxvt extensions:
3633 * 20 = bg pixmap
3634 * 39 = change default fg color
3635 * 49 = change default bg color
3636 * 55 = dump scrollback buffer and all of screen
3637 * 701 = change locale
3638 * 702 = find font
3639 * 703 = menu
3640 */ 3358 */
3641void 3359void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3360rxvt_term::process_xterm_seq (int op, char *str, char resp)
3643{ 3361{
3644 int changed = 0;
3645 int color; 3362 int color;
3646 char *buf, *name; 3363 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3364 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3365 int saveop = op;
3649 3366
3367 dLocal (Display *, dpy);
3368
3650 assert (str != NULL); 3369 assert (str != NULL);
3370
3371 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3372 return;
3373
3651 switch (op) 3374 switch (op)
3652 { 3375 {
3653 case XTerm_name: 3376 case XTerm_name:
3654 set_title (str); 3377 set_title (str);
3655 /* FALLTHROUGH */ 3378 /* FALLTHROUGH */
… …
3669 unsigned long bytes_after; 3392 unsigned long bytes_after;
3670 unsigned char *value = 0; 3393 unsigned char *value = 0;
3671 const char *str = ""; 3394 const char *str = "";
3672 3395
3673 if (prop 3396 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3397 && XGetWindowProperty (dpy, parent,
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3401 && actual_type != None
3679 && actual_format == 8) 3402 && actual_format == 8)
3680 str = (const char *)(value); 3403 str = (const char *)(value);
3681 3404
3682 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3683 3406
3684 XFree (value); 3407 XFree (value);
3685 } 3408 }
3686 else 3409 else
3687 { 3410 {
3688 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3411 char *eq = strchr (str, '=');
3689 3412
3690 if (eq) 3413 if (eq)
3691 { 3414 {
3692 *eq = 0; 3415 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3694 } 3417 }
3695 else 3418 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3419 XDeleteProperty (dpy, parent,
3697 display->atom (str)); 3420 display->atom (str));
3698 } 3421 }
3699 break; 3422 break;
3700 3423
3701 case XTerm_Color: 3424 case XTerm_Color:
… …
3703 { 3426 {
3704 if ((name = strchr (buf, ';')) == NULL) 3427 if ((name = strchr (buf, ';')) == NULL)
3705 break; 3428 break;
3706 3429
3707 *name++ = '\0'; 3430 *name++ = '\0';
3708 color = atoi (buf); 3431 color = atoi (buf) + minCOLOR;
3709 3432
3710 if (color < 0 || color >= TOTAL_COLORS) 3433 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3711 break; 3434 break;
3712 3435
3713 if ((buf = strchr (name, ';')) != NULL) 3436 if ((buf = strchr (name, ';')) != NULL)
3714 *buf++ = '\0'; 3437 *buf++ = '\0';
3715 3438
3716 if (name[0] == '?' && !name[1]) 3439 process_color_seq (op, color, name, resp);
3440 }
3441 break;
3442 case Rxvt_restoreFG:
3443 case XTerm_Color00:
3444 process_color_seq (op, Color_fg, str, resp);
3445 break;
3446 case Rxvt_restoreBG:
3447 case XTerm_Color01:
3448 process_color_seq (op, Color_bg, str, resp);
3449 break;
3450#ifndef NO_CURSORCOLOR
3451 case XTerm_Color_cursor:
3452 process_color_seq (op, Color_cursor, str, resp);
3453 break;
3454#endif
3455 case XTerm_Color_pointer_fg:
3456 process_color_seq (op, Color_pointer_fg, str, resp);
3457 break;
3458 case XTerm_Color_pointer_bg:
3459 process_color_seq (op, Color_pointer_bg, str, resp);
3460 break;
3461#ifdef OPTION_HC
3462 case XTerm_Color_HC:
3463 process_color_seq (op, Color_HC, str, resp);
3464 break;
3465 case XTerm_Color_HTC:
3466 process_color_seq (op, Color_HTC, str, resp);
3467 break;
3468#endif
3469#ifndef NO_BOLD_UNDERLINE_REVERSE
3470 case URxvt_Color_BD:
3471 process_color_seq (op, Color_BD, str, resp);
3472 break;
3473 case URxvt_Color_UL:
3474 process_color_seq (op, Color_UL, str, resp);
3475 break;
3476 case URxvt_Color_IT:
3477 process_color_seq (op, Color_IT, str, resp);
3478 break;
3479#endif
3480 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp);
3482 break;
3483
3484#if BG_IMAGE_FROM_ROOT
3485 case URxvt_Color_tint:
3486 process_color_seq (op, Color_tint, str, resp);
3487 {
3488 bool changed = false;
3489
3490 if (ISSET_PIXCOLOR (Color_tint))
3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3492
3493 if (changed)
3494 update_background ();
3495 }
3496
3497 break;
3498#endif
3499
3500#if BG_IMAGE_FROM_FILE
3501 case Rxvt_Pixmap:
3502 if (!strcmp (str, "?"))
3503 {
3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3509
3510 sprintf (str, "[%dx%d+%d+%d]",
3511 h_scale, v_scale,
3512 h_align, v_align);
3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3514 }
3515 else
3516 {
3517 bool changed = false;
3518
3519 if (*str != ';')
3717 { 3520 {
3718 unsigned short r, g, b; 3521 try
3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3522 {
3720 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3523 fimage.set_file_geometry (this, str);
3524 changed = true;
3525 }
3526 catch (const class rxvt_failure_exception &e)
3527 {
3528 }
3721 } 3529 }
3722 else 3530 else
3723 set_window_color (color + minCOLOR, name); 3531 {
3532 str++;
3533 if (fimage.set_geometry (str, true))
3534 changed = true;
3535 }
3536
3537 if (changed)
3538 {
3539 if (bg_window_position_sensitive ())
3540 {
3541 int x, y;
3542 get_window_origin (x, y);
3543 parent_x = x;
3544 parent_y = y;
3545 }
3546 update_background ();
3547 }
3724 } 3548 }
3725 break; 3549 break;
3726 case XTerm_Color00:
3727 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3728 break;
3729 case XTerm_Color01:
3730 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3731 break;
3732#ifndef NO_CURSORCOLOR
3733 case XTerm_Color_cursor:
3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3735 break;
3736#endif 3550#endif
3737 case XTerm_Color_pointer_fg:
3738 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3739 break;
3740 case XTerm_Color_pointer_bg:
3741 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3742 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE
3744 case XTerm_Color_BD:
3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3750 case XTerm_Color_UL:
3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752 break;
3753 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break;
3756#endif
3757#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3760 check_our_parents ();
3761 if (am_transparent)
3762 want_full_refresh = want_refresh = 1;
3763 break;
3764#endif
3765
3766 case XTerm_Pixmap:
3767 if (*str != ';')
3768 {
3769#if XPM_BACKGROUND
3770 scale_pixmap (""); /* reset to default scaling */
3771 set_bgPixmap (str); /* change pixmap */
3772#endif
3773 scr_touch (true);
3774 }
3775 while ((str = strchr (str, ';')) != NULL)
3776 {
3777 str++;
3778#if XPM_BACKGROUND
3779 changed += scale_pixmap (str);
3780#endif
3781 }
3782
3783 if (changed)
3784 {
3785#ifdef XPM_BACKGROUND
3786 resize_pixmap ();
3787#endif
3788 scr_touch (true);
3789 }
3790 break;
3791
3792 case XTerm_restoreFG:
3793 set_window_color (Color_fg, str);
3794 break;
3795 case XTerm_restoreBG:
3796 set_window_color (Color_bg, str);
3797 break;
3798 3551
3799 case XTerm_logfile: 3552 case XTerm_logfile:
3800 // TODO, when secure mode? 3553 // TODO, when secure mode?
3801 break; 3554 break;
3802 3555
3556#if 0
3557 case Rxvt_dumpscreen: /* no error notices */
3558 {
3559 int fd;
3560 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3561 {
3562 scr_dump (fd);
3563 close (fd);
3564 }
3565 }
3566 break;
3567#endif
3803 case XTerm_font: 3568 case XTerm_font:
3804 op = URxvt_font; 3569 op = URxvt_font;
3805 case URxvt_font: 3570 case URxvt_font:
3806#if ENABLE_STYLES 3571#if ENABLE_STYLES
3807 case URxvt_boldFont: 3572 case URxvt_boldFont:
3808 case URxvt_italicFont: 3573 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3574 case URxvt_boldItalicFont:
3810#endif 3575#endif
3811 if (query) 3576 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3577 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3578 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3579 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3580 resp);
3816 else 3581 else
3817 { 3582 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3583 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3584
… …
3821 allocated.push_back ((void *)res); 3586 allocated.push_back ((void *)res);
3822 set_fonts (); 3587 set_fonts ();
3823 } 3588 }
3824 break; 3589 break;
3825 3590
3826#if ENABLE_FRILLS 3591 case URxvt_version:
3827 case XTerm_locale:
3828 if (query) 3592 if (query)
3593 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3594 op,
3595 rs[Rs_name], VERSION[0], VERSION[2],
3596 resp);
3597 break;
3598
3599#if !ENABLE_MINIMAL
3600 case URxvt_locale:
3601 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3602 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3830 else 3603 else
3831 { 3604 {
3832 set_locale (str); 3605 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 3606 pty->set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 3607 init_xlocale ();
3836# endif
3837 } 3608 }
3838 break; 3609 break;
3839#endif
3840 3610
3841#ifdef MENUBAR 3611 case URxvt_view_up:
3842 case XTerm_Menu: 3612 case URxvt_view_down:
3843 if (options & Opt_insecure) 3613 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3614 int lines = atoi (str);
3615
3616 if (lines)
3617 scr_page (op == URxvt_view_up ? UP : DN, lines);
3618 else
3619 scr_erase_savelines ();
3620 }
3621
3845 break; 3622 break;
3846#endif 3623#endif
3847#if 0 3624
3848 case XTerm_dumpscreen: /* no error notices */ 3625#if ENABLE_PERL
3849 { 3626 case URxvt_perl:
3850 int fd; 3627 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 3628 break;
3858#endif 3629#endif
3859 } 3630 }
3860} 3631}
3861/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
… …
3868 * 's' = save 3639 * 's' = save
3869 * 'r' = restore 3640 * 'r' = restore
3870 * 't' = toggle 3641 * 't' = toggle
3871 * so no need for fancy checking 3642 * so no need for fancy checking
3872 */ 3643 */
3873int 3644int ecb_cold
3874rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
3875{ 3646{
3876 int state; 3647 int state;
3877 3648
3878 if (mode == 's') 3649 if (mode == 's')
3879 { 3650 {
3880 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
3881 return -1; 3655 return -1;
3882 } 3656 }
3883 else 3657 else
3884 { 3658 {
3885 if (mode == 'r') 3659 if (mode == 'r')
3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3887 else 3661 else
3888 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3889 PrivMode (state, bit); 3663
3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
3890 } 3668 }
3891 3669
3892 return state; 3670 return state;
3893} 3671}
3894 3672
3895/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
3896void 3674void
3897rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3675rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3898{ 3676{
3899 unsigned int i, j; 3677 unsigned int i, j;
3900 int state; 3678 int state;
3901 3679
3902 static const struct 3680 static const struct
3903 { 3681 {
3904 const int argval; 3682 const int argval;
3905 const unsigned long bit; 3683 const unsigned long bit;
3906 }
3907
3908 argtopriv[] = { 3684 } argtopriv[] = {
3909 { 1, PrivMode_aplCUR }, 3685 { 1, PrivMode_aplCUR }, // DECCKM
3910 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
3911 { 3, PrivMode_132 }, 3687 { 3, PrivMode_132 }, // DECCOLM
3912 { 4, PrivMode_smoothScroll }, 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
3913 { 5, PrivMode_rVideo }, 3689 { 5, PrivMode_rVideo }, // DECSCNM
3914 { 6, PrivMode_relOrigin }, 3690 { 6, PrivMode_relOrigin }, // DECOM
3915 { 7, PrivMode_Autowrap }, 3691 { 7, PrivMode_Autowrap }, // DECAWM
3916 // 8, bi-directional support mode 3692 // 8, auto-repeat keys // DECARM
3917 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
3918#ifdef menuBar_esc 3694 // 18 end FF to printer after print screen
3919 { menuBar_esc, PrivMode_menuBar }, 3695 // 19 Print screen prints full screen/scroll region
3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor }, 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3923#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3924 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
3925#endif 3699#endif
3926 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3701 // 38, tektronix mode // DECTEK
3927 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
3928 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
3929 // 45 margin bell NYI 3704 // 45 margin bell NYI
3930 // 46 start logging 3705 // 46 start logging
3931 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
3932 { 66, PrivMode_aplKP }, 3707 { 66, PrivMode_aplKP }, // DECNKM
3933#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
3934 { 67, PrivMode_BackSpace }, 3709 { 67, PrivMode_BackSpace }, // DECBKM
3935#endif 3710#endif
3936 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
3937 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3712 { 1002, PrivMode_MouseBtnEvent },
3938 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3713 { 1003, PrivMode_MouseAnyEvent },
3939 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3714#if ENABLE_FRILLS
3715 { 1005, PrivMode_ExtModeMouse },
3716#endif
3940 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3941 { 1011, PrivMode_Keypress }, // rxvt extension 3718 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3721#endif
3942 // 1035 enable modifiers for alt, numlock NYI 3722 // 1035 enable modifiers for alt, numlock NYI
3943 // 1036 send ESC for meta keys NYI 3723 // 1036 send ESC for meta keys NYI
3944 // 1037 send DEL for keypad delete NYI 3724 // 1037 send DEL for keypad delete NYI
3945 { 1047, PrivMode_Screen }, 3725 { 1047, PrivMode_Screen },
3946 // 1048 save and restore cursor 3726 // 1048 save and restore cursor, implemented in code
3947 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3948 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3729 { 2004, PrivMode_BracketPaste },
3949 }; 3730 };
3950 3731
3951 if (nargs == 0) 3732 if (nargs == 0)
3952 return; 3733 return;
3953 3734
… …
3960 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
3961 { 3742 {
3962 state = -1; 3743 state = -1;
3963 3744
3964 /* basic handling */ 3745 /* basic handling */
3965 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
3966 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
3967 { 3748 {
3968 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
3969 break; 3750 break;
3970 } 3751 }
3971 3752
3972 /* extra handling for values with state unkept */ 3753 /* extra handling for values with state unkept */
3973 switch (arg[i]) 3754 switch (arg[i])
3974 { 3755 {
3756#if ENABLE_STYLES
3757 case 1021:
3758 set_option (Opt_intensityStyles, mode);
3759
3760 scr_touch (true);
3761 break;
3762#endif
3975 case 1048: /* alternative cursor save */ 3763 case 1048: /* alternative cursor save */
3976 case 1049:
3977 if (options & Opt_secondaryScreen) 3764 if (option (Opt_secondaryScreen))
3978 if (mode == 0) 3765 if (mode == 0)
3979 scr_cursor (RESTORE); 3766 scr_cursor (RESTORE);
3980 else if (mode == 1) 3767 else if (mode == 1)
3981 scr_cursor (SAVE); 3768 scr_cursor (SAVE);
3982 break; 3769 break;
… …
3990 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
3991 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
3992 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
3993 * within VT52 mode 3780 * within VT52 mode
3994 */ 3781 */
3995 PrivMode (1, PrivMode_vt52); 3782 priv_modes |= PrivMode_vt52;
3996 break; 3783 break;
3997 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4000 break; 3787 break;
4001 case 4: /* smooth scrolling */ 3788 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 3789 set_option (Opt_jumpScroll, !state);
4006 break; 3790 break;
4007 case 5: /* reverse video */ 3791 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 3792 scr_rvideo_mode (state);
4009 break; 3793 break;
4010 case 6: /* relative/absolute origins */ 3794 case 6: /* relative/absolute origins */
… …
4014 scr_autowrap (state); 3798 scr_autowrap (state);
4015 break; 3799 break;
4016 /* case 8: - auto repeat, can't do on a per window basis */ 3800 /* case 8: - auto repeat, can't do on a per window basis */
4017 case 9: /* X10 mouse reporting */ 3801 case 9: /* X10 mouse reporting */
4018 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
4019 priv_modes &= ~PrivMode_MouseX11; 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4020 break; 3804 break;
4021#ifdef menuBar_esc
4022 case menuBar_esc:
4023#ifdef MENUBAR
4024 map_menuBar (state);
4025#endif
4026 break;
4027#endif
4028#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
4029 case scrollBar_esc: 3806 case scrollBar_esc:
4030 if (scrollbar_mapping (state)) 3807 scrollBar.map (state);
4031 {
4032 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
4033 scr_touch (true); 3809 scr_touch (true);
4034 }
4035 break; 3810 break;
4036#endif 3811#endif
4037 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
4038 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
4039 break; 3814 break;
… …
4044 break; 3819 break;
4045 /* case 66: - application key pad */ 3820 /* case 66: - application key pad */
4046 /* case 67: - backspace key */ 3821 /* case 67: - backspace key */
4047 case 1000: /* X11 mouse reporting */ 3822 case 1000: /* X11 mouse reporting */
4048 if (state) /* orthogonal */ 3823 if (state) /* orthogonal */
4049 priv_modes &= ~PrivMode_MouseX10; 3824 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4050 break; 3825 break;
4051#if 0
4052 case 1001: 3826 case 1002:
4053 break; /* X11 mouse highlighting */ 3827 case 1003:
4054#endif 3828 if (state)
3829 {
3830 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3831 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3832 mouse_row = mouse_col = 0;
3833 vt_emask_mouse = PointerMotionMask;
3834 }
3835 else
3836 vt_emask_mouse = NoEventMask;
3837
3838 vt_select_input ();
3839 break;
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 3840 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 3841 set_option (Opt_scrollTtyOutput, !state);
4060 break; 3842 break;
4061 case 1011: /* scroll to bottom on key press */ 3843 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 3844 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 3845 break;
4067 case 1047: /* secondary screen w/ clearing last */ 3846 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 3847 if (option (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 3848 if (!state)
4070 scr_erase_screen (2); 3849 scr_erase_screen (2);
3850
4071 scr_change_screen (state); 3851 scr_change_screen (state);
4072 break; 3852 break;
4073 case 1049: /* secondary screen w/ clearing first */ 3853 case 1049: /* secondary screen w/ clearing first */
3854 if (option (Opt_secondaryScreen))
3855 if (state)
3856 scr_cursor (SAVE);
3857
4074 scr_change_screen (state); 3858 scr_change_screen (state);
3859
4075 if (options & Opt_secondaryScreen) 3860 if (option (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 3861 if (state)
4077 scr_erase_screen (2); 3862 scr_erase_screen (2);
3863 else
3864 scr_cursor (RESTORE);
4078 break; 3865 break;
4079 default: 3866 default:
4080 break; 3867 break;
4081 } 3868 }
4082 } 3869 }
4083} 3870}
4084/*}}} */ 3871/*}}} */
4085 3872
4086/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
4087void 3874void ecb_hot
4088rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4089{ 3876{
4090 unsigned int i; 3877 unsigned int i;
4091 short rendset; 3878 short rendset;
4092 int rendstyle; 3879 int rendstyle;
… …
4208 scr_color (Color_bg, Color_bg); 3995 scr_color (Color_bg, Color_bg);
4209 break; 3996 break;
4210 3997
4211 //case 50: // not variable spacing 3998 //case 50: // not variable spacing
4212 3999
4213#ifndef NO_BRIGHTCOLOR 4000#if !ENABLE_MINIMAL
4214 case 90: 4001 case 90:
4215 case 91: /* set bright fg color */ 4002 case 91: /* set bright fg color */
4216 case 92: 4003 case 92:
4217 case 93: 4004 case 93:
4218 case 94: 4005 case 94:
… …
4230 case 106: 4017 case 106:
4231 case 107: 4018 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4019 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4020 break;
4234#endif 4021#endif
4235
4236 } 4022 }
4237 } 4023 }
4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4238} 4040}
4239/*}}} */ 4041/*}}} */
4240 4042
4241/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4242void
4243rxvt_term::process_graphics ()
4244{
4245 unicode_t ch, cmd = cmd_getc ();
4246
4247 if (cmd == 'Q')
4248 { /* query graphics */
4249 tt_printf ("\033G0\012"); /* no graphics */
4250 return;
4251 }
4252 /* swallow other graphics sequences until terminating ':' */
4253 do
4254 ch = cmd_getc ();
4255 while (ch != ':');
4256}
4257/*}}} */
4258
4259/* ------------------------------------------------------------------------- */ 4043/* ---------------------------------------------------------------------- */
4044/* Write data to the pty as typed by the user, pasted with the mouse,
4045 * or generated by us in response to a query ESC sequence.
4046 */
4260 4047
4261/* 4048/*
4262 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
4263 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
4264 */ 4051 */
4265void 4052void
4266rxvt_term::tt_printf (const char *fmt,...) 4053rxvt_term::tt_printf (const char *fmt,...)
4267{ 4054{
4268 va_list arg_ptr; 4055 va_list arg_ptr;
4269 unsigned char buf[256]; 4056 char buf[256];
4270 4057
4271 va_start (arg_ptr, fmt); 4058 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 4060 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
4275} 4062}
4276 4063
4277/* ---------------------------------------------------------------------- */
4278/* Write data to the pty as typed by the user, pasted with the mouse, 4064/* Write data to the pty as typed by the user. */
4279 * or generated by us in response to a query ESC sequence.
4280 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282
4283void 4065void
4284rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4285{ 4067{
4068 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4069 return;
4070
4071 if (option (Opt_scrollTtyKeypress))
4072 if (view_start)
4073 {
4074 view_start = 0;
4075 want_refresh = 1;
4076 }
4077
4078 tt_write_ (data, len);
4079}
4080
4081void
4082rxvt_term::tt_write (const char *data, unsigned int len)
4083{
4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4085 return;
4086
4087 tt_write_ (data, len);
4088}
4089
4090static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4091
4092void
4093rxvt_term::tt_write_ (const char *data, unsigned int len)
4094{
4095 if (pty->pty < 0)
4096 return;
4097
4286 if (v_buflen == 0) 4098 if (v_buflen == 0)
4287 { 4099 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4100 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4289 4101
4102 max_it (written, 0);
4103
4290 if ((unsigned int)written == len) 4104 if (written == len)
4291 return; 4105 return;
4292 4106
4293 data += written; 4107 data += written;
4294 len -= written; 4108 len -= written;
4295 } 4109 }
4296 4110
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4111 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4298 4112
4299 memcpy (v_buffer + v_buflen, data, len); 4113 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len; 4114 v_buflen += len;
4301 4115
4302 pty_ev.set (EVENT_READ | EVENT_WRITE); 4116 pty_ev.set (ev::READ | ev::WRITE);
4303} 4117}
4304 4118
4305void rxvt_term::pty_write () 4119void rxvt_term::pty_write ()
4306{ 4120{
4307 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4121 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4308 4122
4309 if (written > 0) 4123 if (written > 0)
4310 { 4124 {
4311 v_buflen -= written; 4125 v_buflen -= written;
4312 4126
4313 if (v_buflen == 0) 4127 if (v_buflen == 0)
4314 { 4128 {
4315 free (v_buffer); 4129 free (v_buffer);
4316 v_buffer = 0; 4130 v_buffer = 0;
4317 v_buflen = 0;
4318 4131
4319 pty_ev.set (EVENT_READ); 4132 pty_ev.set (ev::READ);
4320 return; 4133 return;
4321 } 4134 }
4322 4135
4323 memmove (v_buffer, v_buffer + written, v_buflen); 4136 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 4137 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4138 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 4139 pty_ev.set (ev::READ);
4327 destroy ();
4328} 4140}
4329 4141
4330/*----------------------- end-of-file (C source) -----------------------*/ 4142/*----------------------- end-of-file (C source) -----------------------*/
4331 4143

Diff Legend

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