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

Diff Legend

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