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

Diff Legend

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