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.384 by ayin, Tue Dec 18 13:07:55 2007 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
304{ 416{
305 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 418 KeySym keysym;
308 int valid_keysym; 419 int valid_keysym;
309 char kbuf[KBUFSZ]; 420 char kbuf[KBUFSZ];
310 421
311#if ISO_14755 422#if ISO_14755
… …
321 */ 432 */
322 shft = ev.state & ShiftMask; 433 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
325 436
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 437 kbuf[0] = 0;
333 438
334#ifdef USE_XIM 439#if USE_XIM
335 if (Input_Context) 440 if (Input_Context)
336 { 441 {
337 Status status_return; 442 Status status_return;
338 443
339#if 0 444#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 515#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 516 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 517#else
413 lnsppg = nrow * 4 / 5; 518 lnsppg = nrow * 4 / 5;
414#endif 519#endif
520 max_it (lnsppg, 1);
521
415 if (keysym == XK_Prior) 522 if (keysym == XK_Prior)
416 { 523 {
417 scr_page (UP, lnsppg); 524 scr_page (lnsppg);
418 return; 525 return;
419 } 526 }
420 else if (keysym == XK_Next) 527 else if (keysym == XK_Next)
421 { 528 {
422 scr_page (DN, lnsppg); 529 scr_page (-lnsppg);
423 return; 530 return;
424 } 531 }
425 } 532 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 533#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 534 if (IS_SCROLL_MOD)
428 { 535 {
429 if (keysym == XK_Up) 536 if (keysym == XK_Up)
430 { 537 {
431 scr_page (UP, 1); 538 scr_page (1);
432 return; 539 return;
433 } 540 }
434 else if (keysym == XK_Down) 541 else if (keysym == XK_Down)
435 { 542 {
436 scr_page (DN, 1); 543 scr_page (-1);
437 return; 544 return;
438 } 545 }
439 } 546 }
440#endif 547#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 548#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 549 if (IS_SCROLL_MOD)
443 { 550 {
444 if (keysym == XK_Home) 551 if (keysym == XK_Home)
445 { 552 {
446 scr_move_to (0, 1); 553 scr_changeview (top_row);
447 return; 554 return;
448 } 555 }
449 else if (keysym == XK_End) 556 else if (keysym == XK_End)
450 { 557 {
451 scr_move_to (1, 1); 558 scr_changeview (0);
452 return; 559 return;
453 } 560 }
454 } 561 }
455#endif 562#endif
456 } 563 }
… …
472 selection_request (ev.time); 579 selection_request (ev.time);
473 return; 580 return;
474#if TODO 581#if TODO
475 /* rxvt extras */ 582 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 583 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 584 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 585 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 586 return;
482#endif 587#endif
483 } 588 }
484 } 589 }
485 } 590 }
486 591
592 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
593 {
594 if (keysym == XK_v)
595 selection_request (ev.time, Sel_Clipboard);
596 else if (selection.len > 0)
597 {
598 free (selection.clip_text);
599 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
600 selection.clip_len = selection.len;
601 selection_grab (CurrentTime, true);
602 }
603
604 return;
605 }
606
487#if ENABLE_FRILLS || ISO_14755 607#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 608 // ISO 14755 support
489 if (shft && ctrl) 609 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 610 {
491 int hv; 611 int hv;
492 612
493 if (iso14755buf & ISO_14755_51 613 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 614 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 644 scr_overlay_off ();
525# endif 645# endif
526 iso14755buf = 0; 646 iso14755buf = 0;
527 } 647 }
528 } 648 }
649 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 650 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 651 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 652 if (!(iso14755buf & ISO_14755_STARTED))
532 { 653 {
533 iso14755buf |= ISO_14755_STARTED; 654 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 655# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 656 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 667 }
547#endif 668#endif
548 669
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 670 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 671 {
672 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
673 unsigned int newlen = 1;
674
675 if (ev.state & ModNumLockMask)
676 kp = false;
677
678 keysym = translate_keypad (keysym, kp);
679
680 switch (keysym)
551 { 681 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 682#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 683 case XK_BackSpace:
554#ifdef XK_KP_Home 684 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 685 {
556 XK_KP_7, // XK_KP_Home 686 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 687 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 688 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 689 }
690 else
691 strcpy (kbuf, rs[Rs_backspace_key]);
692 break;
693#endif
694#ifndef NO_DELETE_KEY
695 case XK_Delete:
696 strcpy (kbuf, rs[Rs_delete_key]);
697 break;
698#endif
699 case XK_Tab:
700 if (shft)
701 strcpy (kbuf, "\033[Z");
702 else
703 {
704#ifdef CTRL_TAB_MAKES_META
705 if (ctrl)
706 meta = 1;
707#endif
708#ifdef MOD4_TAB_MAKES_META
709 if (ev.state & Mod4Mask)
710 meta = 1;
711#endif
712 newlen = 0;
713 }
714 break;
571 715
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 716 case XK_Up: /* "\033[A" */
717 case XK_Down: /* "\033[B" */
718 case XK_Right: /* "\033[C" */
719 case XK_Left: /* "\033[D" */
720 strcpy (kbuf, "\033[Z");
721 kbuf[2] = "DACB"[keysym - XK_Left];
722 /* do Shift first */
723 if (shft)
724 kbuf[2] = "dacb"[keysym - XK_Left];
725 else if (ctrl)
726 {
727 kbuf[1] = 'O';
728 kbuf[2] = "dacb"[keysym - XK_Left];
729 }
730 else if (priv_modes & PrivMode_aplCUR)
731 kbuf[1] = 'O';
732 break;
733
734 case XK_KP_Enter:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033OM");
739 break;
740 }
741
742 /* FALLTHROUGH */
743
744 case XK_Return:
745 if (priv_modes & PrivMode_LFNL)
746 {
747 kbuf[0] = '\015';
748 kbuf[1] = '\012';
749 kbuf[2] = '\0';
750 }
751 else
752 {
753 kbuf[0] = '\015';
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_KP_F1: /* "\033OP" */
759 case XK_KP_F2: /* "\033OQ" */
760 case XK_KP_F3: /* "\033OR" */
761 case XK_KP_F4: /* "\033OS" */
762 strcpy (kbuf, "\033OP");
763 kbuf[2] += (keysym - XK_KP_F1);
764 break;
765
766 case XK_KP_Multiply: /* "\033Oj" : "*" */
767 case XK_KP_Add: /* "\033Ok" : "+" */
768 case XK_KP_Separator: /* "\033Ol" : "," */
769 case XK_KP_Subtract: /* "\033Om" : "-" */
770 case XK_KP_Decimal: /* "\033On" : "." */
771 case XK_KP_Divide: /* "\033Oo" : "/" */
772 case XK_KP_0: /* "\033Op" : "0" */
773 case XK_KP_1: /* "\033Oq" : "1" */
774 case XK_KP_2: /* "\033Or" : "2" */
775 case XK_KP_3: /* "\033Os" : "3" */
776 case XK_KP_4: /* "\033Ot" : "4" */
777 case XK_KP_5: /* "\033Ou" : "5" */
778 case XK_KP_6: /* "\033Ov" : "6" */
779 case XK_KP_7: /* "\033Ow" : "7" */
780 case XK_KP_8: /* "\033Ox" : "8" */
781 case XK_KP_9: /* "\033Oy" : "9" */
782 /* allow shift to override */
783 if (kp)
784 {
785 strcpy (kbuf, "\033Oj");
786 kbuf[2] += (keysym - XK_KP_Multiply);
787 }
788 else
789 {
790 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
791 kbuf[1] = '\0';
792 }
793 break;
794
795 default:
573 { 796 {
574 unsigned int index = keysym - XK_KP_Home; 797 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 798 if (param > 0)
799 sprintf (kbuf,"\033[%d~", param);
800 else
801 newlen = 0;
576 } 802 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 803 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 804 }
794 805
806 if (newlen)
807 len = strlen (kbuf);
808
809 if (len > 0)
810 {
795 /* 811 /*
812 * pass Shift/Control indicators for function keys ending with `~'
813 *
814 * eg,
815 * Prior = "ESC[5~"
816 * Shift+Prior = "ESC[5$"
817 * Ctrl+Prior = "ESC[5^"
818 * Ctrl+Shift+Prior = "ESC[5@"
819 */
820 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
821 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
822
823 /*
796 * Pass meta for all function keys, if 'meta' option set 824 * Pass meta for all function keys, if 'meta' option set
797 */ 825 */
798#ifdef META8_OPTION 826#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0) 827 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80; 828 kbuf[len - 1] |= 0x80;
801#endif 829#endif
830 }
802 831
803 } 832 }
804 else if (ctrl && keysym == XK_minus) 833 else if (ctrl && keysym == XK_minus)
805 { 834 {
806 len = 1; 835 len = 1;
… …
840 { 869 {
841 view_start = 0; 870 view_start = 0;
842 want_refresh = 1; 871 want_refresh = 1;
843 } 872 }
844 873
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
859 /* escape prefix */ 874 /* escape prefix */
860 if (meta 875 if (meta
861#ifdef META8_OPTION 876#ifdef META8_OPTION
862 && meta_char == C0_ESC 877 && meta_char == C0_ESC
863#endif 878#endif
… …
868 } 883 }
869 884
870 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
871} 886}
872 887
873void 888void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 889rxvt_term::key_release (XKeyEvent &ev)
875{ 890{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 891#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 892 KeySym keysym;
878 893
… …
898 commit_iso14755 (); 913 commit_iso14755 ();
899 914
900 return; 915 return;
901 } 916 }
902 917
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 918 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 919 if (i[0] == keysym)
905 { 920 {
906 iso14755buf = ISO_14755_51 | i[1]; 921 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 922 commit_iso14755 ();
908 923
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 960 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 961 mouse_slip_wheel_speed = 0;
947#endif 962#endif
948} 963}
949 964
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 965void
984rxvt_term::flush () 966rxvt_term::flush ()
985{ 967{
986 flush_ev.stop (); 968 flush_ev.stop ();
987 969
988#ifdef HAVE_BG_PIXMAP 970#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 971 if (bg_flags & BG_NEEDS_REFRESH)
990 { 972 {
991// scr_clear (true); This needs to be researched further! 973 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 974 scr_touch (false);
993 } 975 }
994#endif 976#endif
995 977
996 if (want_refresh) 978 if (want_refresh)
… …
1032 } 1014 }
1033 while (row < end_row); 1015 while (row < end_row);
1034 } 1016 }
1035 1017
1036 scr_refresh (); 1018 scr_refresh ();
1037 scrollbar_show (1); 1019 scrollBar.show (1);
1038#ifdef USE_XIM 1020#if USE_XIM
1039 IMSendSpot (); 1021 im_send_spot ();
1040#endif 1022#endif
1041 } 1023 }
1042 1024
1043 display->flush (); 1025 display->flush ();
1044} 1026}
1045 1027
1046/* checks wether a refresh is requested and starts the refresh timer */ 1028/* checks whether a refresh is requested and starts the refresh timer */
1047void 1029void
1048rxvt_term::refresh_check () 1030rxvt_term::refresh_check ()
1049{ 1031{
1050 if (want_refresh && !flush_ev.is_active ()) 1032 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1033 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1061 refresh_count = 0; 1043 refresh_count = 0;
1062 flush (); 1044 flush ();
1063} 1045}
1064 1046
1065#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
1048void
1049rxvt_term::cursor_blink_reset ()
1050{
1051 if (hidden_cursor)
1052 {
1053 hidden_cursor = 0;
1054 want_refresh = 1;
1055 }
1056
1057 if (option (Opt_cursorBlink))
1058 cursor_blink_ev.again ();
1059 else
1060 cursor_blink_ev.stop ();
1061}
1062
1066void 1063void
1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1064rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1068{ 1065{
1069 hidden_cursor = !hidden_cursor; 1066 hidden_cursor = !hidden_cursor;
1070 want_refresh = 1; 1067 want_refresh = 1;
… …
1078{ 1075{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1076 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1077 {
1081 hidden_text = !hidden_text; 1078 hidden_text = !hidden_text;
1082 want_refresh = 1; 1079 want_refresh = 1;
1083 refresh_check (); 1080 refresh_check ();
1084 } 1081 }
1085 else 1082 else
1086 w.stop (); 1083 w.stop ();
1087} 1084}
1088#endif 1085#endif
1089 1086
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1088void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1090{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1091 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1092 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1096 { 1093 {
1097 want_refresh = 1; 1094 want_refresh = 1;
1098 refresh_check (); 1095 refresh_check ();
1099 } 1096 }
1100 else 1097 else
… …
1104 1101
1105#ifdef SELECTION_SCROLLING 1102#ifdef SELECTION_SCROLLING
1106void 1103void
1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1104rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1108{ 1105{
1109 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1106 if (scr_page (scroll_selection_lines))
1110 { 1107 {
1111 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1108 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1112 want_refresh = 1; 1109 want_refresh = 1;
1113 refresh_check (); 1110 refresh_check ();
1114 } 1111 }
… …
1119 1116
1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1117#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1121void 1118void
1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1119rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1123{ 1120{
1124 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1121 if (scr_page (mouse_slip_wheel_speed))
1125 { 1122 {
1126 want_refresh = 1; 1123 want_refresh = 1;
1127 refresh_check (); 1124 refresh_check ();
1128 } 1125 }
1129 1126
… …
1144 { 1141 {
1145 // this should really be sched_yield(), but the linux guys thought 1142 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than 1143 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is 1144 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS. 1145 // allowed by the sus... as is returning ENOSYS.
1146 // since the linux guys additionally thought that breaking the only
1147 // known workaround against their unusable sched_yield hack is cool,
1148 // we just nanosleep a bit and hope for the best.
1149 1149
1150 struct timespec ts = { 0, 0 }; 1150 struct timespec ts = { 0, 1000 };
1151 nanosleep (&ts, 0); 1151 nanosleep (&ts, 0);
1152 1152
1153 w.stop (); 1153 w.stop ();
1154 } 1154 }
1155 1155
… …
1158 { 1158 {
1159 } 1159 }
1160} event_handler; 1160} event_handler;
1161#endif 1161#endif
1162 1162
1163/* make sure all the cmd data is at beginning of cmdbuf */
1164void
1165rxvt_term::cmdbuf_reify ()
1166{
1167 if (cmdbuf_ptr == cmdbuf_base)
1168 return;
1169
1170 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1171
1172 memmove (cmdbuf_base, cmdbuf_ptr, used);
1173 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + used;
1175
1176}
1177
1178#if defined (KEYSYM_RESOURCE)
1179void
1180rxvt_term::cmdbuf_append (const char *str, size_t count)
1181{
1182 cmdbuf_reify ();
1183
1184 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1185
1186 if (count > avail)
1187 return;
1188
1189 memcpy (cmdbuf_endp, str, count);
1190 cmdbuf_endp += count;
1191
1192 cmd_parse ();
1193}
1194#endif
1195
1163bool 1196bool
1164rxvt_term::pty_fill () 1197rxvt_term::pty_fill ()
1165{ 1198{
1166 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1199 cmdbuf_reify ();
1167 1200
1168 if (CBUFSIZ == n) 1201 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1169 { 1202
1170 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1203 if (!avail)
1171 n = 0;
1172 } 1204 {
1173 1205 // normally this indicates a "too long" command sequence - just drop the data we have
1174 memmove (cmdbuf_base, cmdbuf_ptr, n);
1175 cmdbuf_ptr = cmdbuf_base; 1206 cmdbuf_ptr = cmdbuf_base;
1176 cmdbuf_endp = cmdbuf_ptr + n; 1207 cmdbuf_endp = cmdbuf_ptr;
1208 avail = CBUFSIZ;
1209 }
1177 1210
1178 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1211 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1179 1212
1180 if (r > 0) 1213 if (r > 0)
1181 { 1214 {
1182 cmdbuf_endp += r; 1215 cmdbuf_endp += r;
1183 return true; 1216 return true;
… …
1205{ 1238{
1206 make_current (); 1239 make_current ();
1207 1240
1208 if (revents & ev::READ) 1241 if (revents & ev::READ)
1209 // loop, but don't allow a single term to monopolize us 1242 // loop, but don't allow a single term to monopolize us
1210 while (pty_fill ()) 1243 for (int i = CBUFCNT; i-- && pty_fill (); )
1211 if (cmd_parse ()) 1244 cmd_parse ();
1212 break;
1213 1245
1214 if (revents & ev::WRITE) 1246 if (revents & ev::WRITE)
1215 pty_write (); 1247 pty_write ();
1216 1248
1217 refresh_check (); 1249 refresh_check ();
1218} 1250}
1219 1251
1220void 1252void ecb_cold
1221rxvt_term::pointer_unblank () 1253rxvt_term::pointer_unblank ()
1222{ 1254{
1223 XDefineCursor (dpy, vt, TermWin_cursor); 1255 XDefineCursor (dpy, vt, TermWin_cursor);
1224 recolour_cursor (); 1256 recolour_cursor ();
1225 1257
… …
1230 pointer_ev.start (pointerBlankDelay); 1262 pointer_ev.start (pointerBlankDelay);
1231#endif 1263#endif
1232} 1264}
1233 1265
1234#ifdef POINTER_BLANK 1266#ifdef POINTER_BLANK
1235void 1267void ecb_cold
1236rxvt_term::pointer_blank () 1268rxvt_term::pointer_blank ()
1237{ 1269{
1238 if (!option (Opt_pointerBlank)) 1270 if (!option (Opt_pointerBlank))
1239 return; 1271 return;
1240 1272
… …
1242 XFlush (dpy); 1274 XFlush (dpy);
1243 1275
1244 hidden_pointer = 1; 1276 hidden_pointer = 1;
1245} 1277}
1246 1278
1247void 1279void ecb_cold
1248rxvt_term::pointer_cb (ev::timer &w, int revents) 1280rxvt_term::pointer_cb (ev::timer &w, int revents)
1249{ 1281{
1250 make_current (); 1282 make_current ();
1251 1283
1252 pointer_blank (); 1284 pointer_blank ();
… …
1258{ 1290{
1259 int button_number, key_state = 0; 1291 int button_number, key_state = 0;
1260 int x, y; 1292 int x, y;
1261 int code = 32; 1293 int code = 32;
1262 1294
1263 x = Pixel2Col (ev.x); 1295 x = Pixel2Col (ev.x) + 1;
1264 y = Pixel2Row (ev.y); 1296 y = Pixel2Row (ev.y) + 1;
1297
1265 if (ev.type == MotionNotify) 1298 if (ev.type == MotionNotify)
1266 { 1299 {
1267 if (x == mouse_row && y == mouse_col) 1300 if (x == mouse_row && y == mouse_col)
1268 return; 1301 return;
1302
1269 mouse_row = x; 1303 mouse_row = x;
1270 mouse_col = y; 1304 mouse_col = y;
1271 code += 32; 1305 code += 32;
1272 } 1306 }
1273 1307
… …
1276 else 1310 else
1277 { 1311 {
1278 button_number = MEvent.button - Button1; 1312 button_number = MEvent.button - Button1;
1279 /* add 0x3D for wheel events, like xterm does */ 1313 /* add 0x3D for wheel events, like xterm does */
1280 if (button_number >= 3) 1314 if (button_number >= 3)
1281 button_number += (64 - 3); 1315 button_number += 64 - 3;
1282 } 1316 }
1283 1317
1284 if (priv_modes & PrivMode_MouseX10) 1318 if (priv_modes & PrivMode_MouseX10)
1285 { 1319 {
1286 /* 1320 /*
… …
1318 fputc ('A', stderr); 1352 fputc ('A', stderr);
1319 if (key_state & 32) 1353 if (key_state & 32)
1320 fputc ('2', stderr); 1354 fputc ('2', stderr);
1321 fprintf (stderr, "]: <%d>, %d/%d\n", 1355 fprintf (stderr, "]: <%d>, %d/%d\n",
1322 button_number, 1356 button_number,
1323 x + 1, 1357 x,
1324 y + 1); 1358 y);
1325#endif 1359#endif
1326 1360
1361#if ENABLE_FRILLS
1362 if (priv_modes & PrivMode_ExtMouseRight)
1363 tt_printf ("\033[%d;%d;%dM",
1364 code + button_number + key_state,
1365 x,
1366 y);
1367 else if (priv_modes & PrivMode_ExtModeMouse)
1368 tt_printf ("\033[M%c%lc%lc",
1369 code + button_number + key_state,
1370 wint_t (32 + x),
1371 wint_t (32 + y));
1372 else
1373#endif
1327 tt_printf ("\033[M%c%c%c", 1374 tt_printf ("\033[M%c%c%c",
1328 (code + button_number + key_state), 1375 code + button_number + key_state,
1329 (32 + x + 1), 1376 32 + x,
1330 (32 + y + 1)); 1377 32 + y);
1331} 1378}
1332 1379
1333/*{{{ process an X event */ 1380/*{{{ process an X event */
1334void 1381void ecb_hot
1335rxvt_term::x_cb (XEvent &ev) 1382rxvt_term::x_cb (XEvent &ev)
1336{ 1383{
1337 make_current (); 1384 make_current ();
1338 1385
1339 dLocal (Display *, dpy); 1386 dLocal (Display *, dpy);
… …
1437 && ev.xfocus.mode != NotifyGrab) 1484 && ev.xfocus.mode != NotifyGrab)
1438 focus_out (); 1485 focus_out ();
1439 break; 1486 break;
1440 1487
1441 case ConfigureNotify: 1488 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1445 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent)
1446 { 1490 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1492 ;
1493
1494 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1495
1496 bool moved = false;
1497#ifdef HAVE_BG_PIXMAP
1498 if (bg_window_position_sensitive ())
1499 {
1500 want_position_change = true;
1501 if (bg_img == 0)
1502 moved = true;
1503 }
1504#endif
1505
1506 if (want_position_change)
1507 {
1508 int x, y;
1509
1510 if (ev.xconfigure.send_event)
1511 {
1512 x = ev.xconfigure.x;
1513 y = ev.xconfigure.y;
1514 }
1515 else
1516 get_window_origin (x, y);
1517
1518 if (x != parent_x || y != parent_y)
1519 {
1520 parent_x = x;
1521 parent_y = y;
1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1523 moved = true;
1524 }
1525 }
1449 1526
1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1451 { 1528 {
1452 seen_resize = 1; 1529 seen_resize = 1;
1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1454 } 1531 }
1455 else 1532 else
1456 { 1533 {
1457#ifdef HAVE_BG_PIXMAP 1534#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ()) 1535 if (moved)
1459 update_background (); 1536 update_background ();
1460#endif 1537#endif
1461 } 1538 }
1539
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1540 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1541 }
1464 break; 1542 break;
1465 1543
1466 case PropertyNotify: 1544 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break; 1546 break;
1473 1547
1474 case SelectionClear: 1548 case SelectionClear:
1475 selection_clear (); 1549 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476 break;
1477
1478 case SelectionNotify:
1479 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 break; 1550 break;
1482 1551
1483 case SelectionRequest: 1552 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1553 selection_send (ev.xselectionrequest);
1485 break; 1554 break;
1486 1555
1487 case MapNotify: 1556 case MapNotify:
1557#ifdef HAVE_BG_PIXMAP
1558 // This is needed at startup for the case of no window manager
1559 // or a non-reparenting window manager and also because we
1560 // defer bg image updates if the window is not mapped. The
1561 // short delay is to optimize for multiple ConfigureNotify
1562 // events at startup when the window manager reparents the
1563 // window, so as to perform the computation after we have
1564 // received all of them.
1565 if (bg_img == 0)
1566 update_background_ev.start (0.025);
1567#endif
1488 mapped = 1; 1568 mapped = 1;
1489#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1490 text_blink_ev.start (); 1570 text_blink_ev.start ();
1491#endif 1571#endif
1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1505 if (ev.xany.window == vt) 1585 if (ev.xany.window == vt)
1506 { 1586 {
1507 do 1587 do
1508 { 1588 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1511 } 1591 }
1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1592 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1513 1593
1514 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1594 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1515 1595
1516 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1517 { 1597 {
1518 scr_expose (ev.xexpose.x, ev.xexpose.y, 1598 scr_expose (ev.xexpose.x, ev.xexpose.y,
1519 ev.xexpose.width, ev.xexpose.height, False); 1599 ev.xexpose.width, ev.xexpose.height, false);
1520 } 1600 }
1521 1601
1522 want_refresh = 1; 1602 want_refresh = 1;
1523 } 1603 }
1524 else 1604 else
… …
1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1608 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1609 ;
1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1610 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1611 ;
1532 1612
1533 if (isScrollbarWindow (ev.xany.window)) 1613 if (scrollBar.state && ev.xany.window == scrollBar.win)
1534 { 1614 {
1535 scrollBar.setIdle (); 1615 scrollBar.state = SB_STATE_IDLE;
1536 scrollbar_show (0); 1616 scrollBar.show (0);
1537 } 1617 }
1538 } 1618 }
1539 break; 1619 break;
1540 1620
1541 case MotionNotify: 1621 case MotionNotify:
… …
1582 1662
1583#ifdef SELECTION_SCROLLING 1663#ifdef SELECTION_SCROLLING
1584 if (ev.xbutton.y < int_bwidth 1664 if (ev.xbutton.y < int_bwidth
1585 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1665 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1586 { 1666 {
1667 page_dirn scroll_selection_dir;
1587 int dist; 1668 int dist;
1588 1669
1589 /* don't clobber the current delay if we are 1670 /* don't clobber the current delay if we are
1590 * already in the middle of scrolling. 1671 * already in the middle of scrolling.
1591 */ 1672 */
… …
1606 dist = int_bwidth - ev.xbutton.y; 1687 dist = int_bwidth - ev.xbutton.y;
1607 } 1688 }
1608 else 1689 else
1609 { 1690 {
1610 scroll_selection_dir = DN; 1691 scroll_selection_dir = DN;
1611 dist = ev.xbutton.y - (int_bwidth + height); 1692 dist = ev.xbutton.y - (int_bwidth + vt_height);
1612 } 1693 }
1613 1694
1614 scroll_selection_lines = Pixel2Height (dist) 1695 scroll_selection_lines = Pixel2Height (dist)
1615 / SELECTION_SCROLL_LINE_SPEEDUP 1696 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1; 1697 + 1;
1617 min_it (scroll_selection_lines, 1698 min_it (scroll_selection_lines,
1618 SELECTION_SCROLL_MAX_LINES); 1699 SELECTION_SCROLL_MAX_LINES);
1700 scroll_selection_lines *= scroll_selection_dir;
1619 } 1701 }
1620 else 1702 else
1621 { 1703 {
1622 /* we are within the text window, so we 1704 /* we are within the text window, so we
1623 * shouldn't be scrolling 1705 * shouldn't be scrolling
… …
1628#ifdef MOUSE_THRESHOLD 1710#ifdef MOUSE_THRESHOLD
1629 } 1711 }
1630#endif 1712#endif
1631 } 1713 }
1632 } 1714 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1715 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1634 { 1716 {
1635 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1717 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) 1718 MotionNotify, &ev))
1637 ; 1719 ;
1638 1720
1639 XQueryPointer (dpy, scrollBar.win, 1721 XQueryPointer (dpy, scrollBar.win,
1640 &unused_root, &unused_child, 1722 &unused_root, &unused_child,
1641 &unused_root_x, &unused_root_y, 1723 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1724 &ev.xbutton.x, &ev.xbutton.y,
1643 &unused_mask); 1725 &unused_mask);
1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1726 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1645 scrollbar_size ()); 1727 scrollBar.size ());
1646 want_refresh = 1; 1728 want_refresh = 1;
1647 scrollbar_show (1); 1729 scrollBar.show (1);
1648 } 1730 }
1649 break; 1731 break;
1650 } 1732 }
1651 1733
1652#if defined(CURSOR_BLINK) 1734#if defined(CURSOR_BLINK)
1653 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1735 if (ev.type == KeyPress)
1654 {
1655 if (hidden_cursor)
1656 {
1657 hidden_cursor = 0;
1658 want_refresh = 1;
1659 }
1660
1661 cursor_blink_ev.again (); 1736 cursor_blink_reset ();
1662 }
1663#endif 1737#endif
1664 1738
1665#if defined(POINTER_BLANK) 1739#if defined(POINTER_BLANK)
1666 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1740 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1667 { 1741 {
… …
1677#endif 1751#endif
1678 1752
1679 refresh_check (); 1753 refresh_check ();
1680} 1754}
1681 1755
1682void 1756#if ENABLE_FRILLS
1757void ecb_cold
1758rxvt_term::set_urgency (bool enable)
1759{
1760 if (enable == urgency_hint)
1761 return;
1762
1763 if (XWMHints *h = XGetWMHints (dpy, parent))
1764 {
1765 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1766 XSetWMHints (dpy, parent, h);
1767 urgency_hint = enable;
1768 XFree (h);
1769 }
1770}
1771#endif
1772
1773void ecb_cold
1683rxvt_term::focus_in () 1774rxvt_term::focus_in ()
1684{ 1775{
1685 if (!focus) 1776 if (!focus)
1686 { 1777 {
1687 focus = 1; 1778 focus = 1;
1688 want_refresh = 1; 1779 want_refresh = 1;
1689 1780
1690 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1691
1692#if USE_XIM 1781#if USE_XIM
1693 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1694 { 1783 {
1695 IMSetPosition (); 1784 im_set_position ();
1696 XSetICFocus (Input_Context); 1785 XSetICFocus (Input_Context);
1697 } 1786 }
1698#endif 1787#endif
1699#if CURSOR_BLINK 1788#if CURSOR_BLINK
1700 if (option (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
… …
1707 scr_recolour (); 1796 scr_recolour ();
1708 } 1797 }
1709#endif 1798#endif
1710#if ENABLE_FRILLS 1799#if ENABLE_FRILLS
1711 if (option (Opt_urgentOnBell)) 1800 if (option (Opt_urgentOnBell))
1712 { 1801 set_urgency (0);
1713 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1714 {
1715 h->flags &= ~XUrgencyHint;
1716 XSetWMHints (dpy, parent[0], h);
1717 }
1718 }
1719#endif 1802#endif
1720 }
1721}
1722 1803
1723void 1804 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1805 }
1806}
1807
1808void ecb_cold
1724rxvt_term::focus_out () 1809rxvt_term::focus_out ()
1725{ 1810{
1726 if (focus) 1811 if (focus)
1727 { 1812 {
1728 focus = 0; 1813 focus = 0;
1729 want_refresh = 1; 1814 want_refresh = 1;
1730 1815
1731 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1816#if ENABLE_FRILLS
1732 1817 if (option (Opt_urgentOnBell))
1818 set_urgency (0);
1819#endif
1733#if ENABLE_FRILLS || ISO_14755 1820#if ENABLE_FRILLS || ISO_14755
1734 if (iso14755buf) 1821 if (iso14755buf)
1735 { 1822 {
1736 iso14755buf = 0; 1823 iso14755buf = 0;
1737# if ISO_14755 1824# if ISO_14755
… …
1754 { 1841 {
1755 pix_colors = pix_colors_unfocused; 1842 pix_colors = pix_colors_unfocused;
1756 scr_recolour (); 1843 scr_recolour ();
1757 } 1844 }
1758#endif 1845#endif
1759 }
1760}
1761 1846
1762void 1847 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1848 }
1849}
1850
1851void ecb_cold
1763rxvt_term::update_fade_color (unsigned int idx) 1852rxvt_term::update_fade_color (unsigned int idx)
1764{ 1853{
1765#if OFF_FOCUS_FADING 1854#if OFF_FOCUS_FADING
1766 if (rs[Rs_fade]) 1855 if (rs[Rs_fade])
1767 { 1856 {
… …
1770 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1859 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1771 } 1860 }
1772#endif 1861#endif
1773} 1862}
1774 1863
1775#if ENABLE_TRANSPARENCY || ENABLE_PERL 1864#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1776void 1865void ecb_hot
1777rxvt_term::rootwin_cb (XEvent &ev) 1866rxvt_term::rootwin_cb (XEvent &ev)
1778{ 1867{
1779 make_current (); 1868 make_current ();
1780 1869
1781 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1870 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1782 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1871 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1783 return; 1872 return;
1784 1873
1785# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1874 switch (ev.type)
1787 { 1875 {
1788 case PropertyNotify: 1876 case PropertyNotify:
1789 /* 1877 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1878 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1879 * use the property to determine the pixmap. We use it later on.
1792 */ 1880 */
1793 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1881 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1882 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 { 1883 {
1796 bgPixmap.set_root_pixmap (); 1884#if BG_IMAGE_FROM_ROOT
1885 if (option (Opt_transparent))
1886 {
1887 rxvt_img::new_from_root (this)->replace (root_img);
1797 update_background (); 1888 update_background ();
1889 }
1890#endif
1891 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1798 } 1892 }
1893
1799 break; 1894 break;
1800 } 1895 }
1801# endif
1802 1896
1803 refresh_check (); 1897 refresh_check ();
1804} 1898}
1805#endif 1899#endif
1806 1900
… …
1839 /* save the xbutton state (for ButtonRelease) */ 1933 /* save the xbutton state (for ButtonRelease) */
1840 MEvent.state = ev.state; 1934 MEvent.state = ev.state;
1841#ifdef MOUSE_REPORT_DOUBLECLICK 1935#ifdef MOUSE_REPORT_DOUBLECLICK
1842 if (ev.button == MEvent.button && clickintime) 1936 if (ev.button == MEvent.button && clickintime)
1843 { 1937 {
1844 /* same button, within alloted time */ 1938 /* same button, within allowed time */
1845 MEvent.clicks++; 1939 MEvent.clicks++;
1846 1940
1847 if (MEvent.clicks > 1) 1941 if (MEvent.clicks > 1)
1848 { 1942 {
1849 /* only report double clicks */ 1943 /* only report double clicks */
… …
1921 } 2015 }
1922 2016
1923 /* 2017 /*
1924 * Scrollbar window processing of button press 2018 * Scrollbar window processing of button press
1925 */ 2019 */
1926 if (isScrollbarWindow (ev.window)) 2020 if (scrollBar.state && ev.window == scrollBar.win)
1927 { 2021 {
1928 scrollBar.setIdle (); 2022 page_dirn direction = NO_DIR;
2023
2024 if (scrollBar.upButton (ev.y))
2025 direction = UP; /* up */
2026 else if (scrollBar.dnButton (ev.y))
2027 direction = DN; /* down */
2028
2029 scrollBar.state = SB_STATE_IDLE;
1929 /* 2030 /*
1930 * Rxvt-style scrollbar: 2031 * Rxvt-style scrollbar:
1931 * move up if mouse is above slider 2032 * move up if mouse is above slider
1932 * move dn if mouse is below slider 2033 * move dn if mouse is below slider
1933 * 2034 *
… …
1942 /* 2043 /*
1943 * Mouse report disabled scrollbar: 2044 * Mouse report disabled scrollbar:
1944 * arrow buttons - send up/down 2045 * arrow buttons - send up/down
1945 * click on scrollbar - send pageup/down 2046 * click on scrollbar - send pageup/down
1946 */ 2047 */
1947 if ((scrollBar.style == R_SB_NEXT 2048 if (direction == UP)
1948 && scrollbarnext_upButton (ev.y))
1949 || (scrollBar.style == R_SB_RXVT
1950 && scrollbarrxvt_upButton (ev.y)))
1951 tt_printf ("\033[A"); 2049 tt_printf ("\033[A");
1952 else if ((scrollBar.style == R_SB_NEXT 2050 else if (direction == DN)
1953 && scrollbarnext_dnButton (ev.y))
1954 || (scrollBar.style == R_SB_RXVT
1955 && scrollbarrxvt_dnButton (ev.y)))
1956 tt_printf ("\033[B"); 2051 tt_printf ("\033[B");
1957 else 2052 else
1958 switch (ev.button) 2053 switch (ev.button)
1959 { 2054 {
1960 case Button2: 2055 case Button2:
… …
1968 break; 2063 break;
1969 } 2064 }
1970 } 2065 }
1971 else 2066 else
1972#endif /* NO_SCROLLBAR_REPORT */ 2067#endif /* NO_SCROLLBAR_REPORT */
1973
1974 {
1975 char upordown = 0;
1976
1977 if (scrollBar.style == R_SB_NEXT)
1978 { 2068 {
1979 if (scrollbarnext_upButton (ev.y)) 2069 if (direction != NO_DIR)
1980 upordown = -1; /* up */
1981 else if (scrollbarnext_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 else if (scrollBar.style == R_SB_RXVT)
1985 {
1986 if (scrollbarrxvt_upButton (ev.y))
1987 upordown = -1; /* up */
1988 else if (scrollbarrxvt_dnButton (ev.y))
1989 upordown = 1; /* down */
1990 }
1991
1992 if (upordown)
1993 { 2070 {
1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ()) 2072 if (!cont_scroll_ev.is_active ())
1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2073 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1997#endif 2074#endif
1998 if (scr_page (upordown < 0 ? UP : DN, 1)) 2075 if (scr_page (direction, 1))
1999 { 2076 {
2000 if (upordown < 0) 2077 if (direction == UP)
2001 scrollBar.setUp (); 2078 scrollBar.state = SB_STATE_UP;
2002 else 2079 else
2003 scrollBar.setDn (); 2080 scrollBar.state = SB_STATE_DOWN;
2004 } 2081 }
2005 } 2082 }
2006 else 2083 else
2007 switch (ev.button) 2084 switch (ev.button)
2008 { 2085 {
2009 case Button2: 2086 case Button2:
2010 switch (scrollbar_align) 2087 switch (scrollBar.align)
2011 { 2088 {
2012 case R_SB_ALIGN_TOP: 2089 case SB_ALIGN_TOP:
2013 csrO = 0; 2090 csrO = 0;
2014 break; 2091 break;
2015 case R_SB_ALIGN_CENTRE: 2092 case SB_ALIGN_CENTRE:
2016 csrO = (scrollBar.bot - scrollBar.top) / 2; 2093 csrO = (scrollBar.bot - scrollBar.top) / 2;
2017 break; 2094 break;
2018 case R_SB_ALIGN_BOTTOM: 2095 case SB_ALIGN_BOTTOM:
2019 csrO = scrollBar.bot - scrollBar.top; 2096 csrO = scrollBar.bot - scrollBar.top;
2020 break; 2097 break;
2021 } 2098 }
2022 2099
2023 if (scrollBar.style == R_SB_XTERM 2100 if (scrollBar.style == SB_STYLE_XTERM
2024 || scrollbar_above_slider (ev.y) 2101 || scrollBar.above_slider (ev.y)
2025 || scrollbar_below_slider (ev.y)) 2102 || scrollBar.below_slider (ev.y))
2026 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2103 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2027 2104
2028 scrollBar.setMotion (); 2105 scrollBar.state = SB_STATE_MOTION;
2029 break; 2106 break;
2030 2107
2031 case Button1: 2108 case Button1:
2032 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2109 if (scrollBar.align == SB_ALIGN_CENTRE)
2033 csrO = ev.y - scrollBar.top; 2110 csrO = ev.y - scrollBar.top;
2034 /* FALLTHROUGH */ 2111 /* FALLTHROUGH */
2035 2112
2036 case Button3: 2113 case Button3:
2037 if (scrollBar.style != R_SB_XTERM) 2114 if (scrollBar.style != SB_STYLE_XTERM)
2038 { 2115 {
2039 if (scrollbar_above_slider (ev.y)) 2116 if (scrollBar.above_slider (ev.y))
2040# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
2041 scr_page (UP, nrow - 1); 2118 scr_page (UP, nrow - 1);
2042# else 2119# else
2043 scr_page (UP, nrow / 4); 2120 scr_page (UP, nrow / 4);
2044# endif 2121# endif
2045 else if (scrollbar_below_slider (ev.y)) 2122 else if (scrollBar.below_slider (ev.y))
2046# ifdef RXVT_SCROLL_FULL 2123# ifdef RXVT_SCROLL_FULL
2047 scr_page (DN, nrow - 1); 2124 scr_page (DN, nrow - 1);
2048# else 2125# else
2049 scr_page (DN, nrow / 4); 2126 scr_page (DN, nrow / 4);
2050# endif 2127# endif
2051 else 2128 else
2052 scrollBar.setMotion (); 2129 scrollBar.state = SB_STATE_MOTION;
2053 } 2130 }
2054 else 2131 else
2055 { 2132 {
2056 scr_page ((ev.button == Button1 ? DN : UP), 2133 scr_page ((ev.button == Button1 ? DN : UP),
2057 (nrow 2134 (nrow
2058 * scrollbar_position (ev.y) 2135 * scrollBar.position (ev.y)
2059 / scrollbar_size ())); 2136 / scrollBar.size ()));
2060 } 2137 }
2061 2138
2062 break; 2139 break;
2063 } 2140 }
2064 } 2141 }
… …
2074 2151
2075 csrO = 0; /* reset csr Offset */ 2152 csrO = 0; /* reset csr Offset */
2076 if (!bypass_keystate) 2153 if (!bypass_keystate)
2077 reportmode = !! (priv_modes & PrivMode_mouse_report); 2154 reportmode = !! (priv_modes & PrivMode_mouse_report);
2078 2155
2079 if (scrollbar_isUpDn ()) 2156 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2080 { 2157 {
2081 scrollBar.setIdle (); 2158 scrollBar.state = SB_STATE_IDLE;
2082 scrollbar_show (0); 2159 scrollBar.show (0);
2083 } 2160 }
2084 2161
2085#ifdef SELECTION_SCROLLING 2162#ifdef SELECTION_SCROLLING
2086 sel_scroll_ev.stop(); 2163 sel_scroll_ev.stop();
2087#endif 2164#endif
… …
2136 case Button3: 2213 case Button3:
2137 selection_make (ev.time); 2214 selection_make (ev.time);
2138 break; 2215 break;
2139 2216
2140 case Button2: 2217 case Button2:
2141 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2218 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2142 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2219 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2143 break; 2220 break;
2144 2221
2145#ifdef MOUSE_WHEEL 2222#ifdef MOUSE_WHEEL
2146 case Button4: 2223 case Button4:
2147 case Button5: 2224 case Button5:
2148 { 2225 {
2149 int i; 2226 int lines;
2150 page_dirn v; 2227 page_dirn dirn;
2151 2228
2152 v = ev.button == Button4 ? UP : DN; 2229 dirn = ev.button == Button4 ? UP : DN;
2153 2230
2154 if (ev.state & ShiftMask) 2231 if (ev.state & ShiftMask)
2155 i = 1; 2232 lines = 1;
2156 else if (option (Opt_mouseWheelScrollPage)) 2233 else if (option (Opt_mouseWheelScrollPage))
2157 i = nrow - 1; 2234 lines = nrow - 1;
2158 else 2235 else
2159 i = 5; 2236 lines = 5;
2160 2237
2161# ifdef MOUSE_SLIP_WHEELING 2238# ifdef MOUSE_SLIP_WHEELING
2162 if (ev.state & ControlMask) 2239 if (ev.state & ControlMask)
2163 { 2240 {
2164 mouse_slip_wheel_speed += v ? -1 : 1; 2241 mouse_slip_wheel_speed += dirn;
2165 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2242 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2166 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2167 2243
2168 if (!slip_wheel_ev.is_active ()) 2244 if (!slip_wheel_ev.is_active ())
2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2245 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2170 } 2246 }
2171 else 2247 else
2248# endif
2172 { 2249 {
2173# endif
2174 scr_page (v, i); 2250 scr_page (dirn, lines);
2175 scrollbar_show (1); 2251 scrollBar.show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2252 }
2178# endif
2179 } 2253 }
2180 break; 2254 break;
2181#endif 2255#endif
2182 } 2256 }
2183 } 2257 }
2184} 2258}
2185 2259
2186/*}}} */ 2260/*}}} */
2187 2261
2188bool 2262void ecb_hot
2189rxvt_term::cmd_parse () 2263rxvt_term::cmd_parse ()
2190{ 2264{
2191 bool flag = false;
2192 wchar_t ch = NOCHAR; 2265 wchar_t ch = NOCHAR;
2193 char *seq_begin; // remember start of esc-sequence here 2266 char *seq_begin; // remember start of esc-sequence here
2194 2267
2195 for (;;) 2268 for (;;)
2196 { 2269 {
2197 if (ch == NOCHAR) 2270 if (ecb_unlikely (ch == NOCHAR))
2198 { 2271 {
2199 seq_begin = cmdbuf_ptr; 2272 seq_begin = cmdbuf_ptr;
2200 ch = next_char (); 2273 ch = next_char ();
2201 2274
2202 if (ch == NOCHAR) 2275 if (ch == NOCHAR)
2203 break; 2276 break;
2204 } 2277 }
2205 2278
2206 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2279 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207 { 2280 {
2208 if (!seen_input) 2281 if (ecb_unlikely (!seen_input))
2209 { 2282 {
2210 seen_input = 1; 2283 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition: 2284 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler. 2285 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs 2286 // some window managers resize the window early, and these programs
… …
2226 wchar_t *str = buf; 2299 wchar_t *str = buf;
2227 wchar_t *eol = str + min (ncol, UBUFSIZ); 2300 wchar_t *eol = str + min (ncol, UBUFSIZ);
2228 2301
2229 for (;;) 2302 for (;;)
2230 { 2303 {
2231 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2304 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232 break; 2305 break;
2233 2306
2234 *str++ = ch; 2307 *str++ = ch;
2235 2308
2236 if (ch == C0_LF || str >= eol) 2309 if (ecb_unlikely (ch == C0_LF || str >= eol))
2237 { 2310 {
2238 if (ch == C0_LF) 2311 if (ch == C0_LF)
2239 nlines++; 2312 nlines++;
2240 2313
2241 refresh_count++; 2314 refresh_count++;
… …
2290 * What the heck we'll cheat and only refresh less than every page-full. 2363 * What the heck we'll cheat and only refresh less than every page-full.
2291 * if skipScroll is enabled. 2364 * if skipScroll is enabled.
2292 */ 2365 */
2293 if (refreshnow) 2366 if (refreshnow)
2294 { 2367 {
2295 flag = true;
2296 scr_refresh (); 2368 scr_refresh ();
2297 want_refresh = 1; 2369 want_refresh = 1;
2298 } 2370 }
2299
2300 } 2371 }
2301 else 2372 else
2302 { 2373 {
2303 try 2374 try
2304 { 2375 {
… …
2312 } 2383 }
2313 2384
2314 ch = NOCHAR; 2385 ch = NOCHAR;
2315 } 2386 }
2316 } 2387 }
2317
2318 return flag;
2319} 2388}
2320 2389
2321// read the next character 2390// read the next character
2322wchar_t 2391wchar_t ecb_hot
2323rxvt_term::next_char () NOTHROW 2392rxvt_term::next_char () NOTHROW
2324{ 2393{
2325 while (cmdbuf_ptr < cmdbuf_endp) 2394 while (cmdbuf_ptr < cmdbuf_endp)
2326 { 2395 {
2327 // assume 7-bit to be ascii ALWAYS 2396 // assume 7-bit to be ascii ALWAYS
2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2397 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2329 return *cmdbuf_ptr++; 2398 return *cmdbuf_ptr++;
2330 2399
2331 wchar_t wc; 2400 wchar_t wc;
2332 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2401 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2333 2402
… …
2337 cmdbuf_ptr = cmdbuf_endp; 2406 cmdbuf_ptr = cmdbuf_endp;
2338 break; 2407 break;
2339 } 2408 }
2340 2409
2341 if (len == (size_t)-1) 2410 if (len == (size_t)-1)
2411 {
2412 mbstate.reset (); // reset now undefined conversion state
2413 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2414 // in which case we "erroneously" return the next byte which might be valid.
2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2415 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2416 }
2343 2417
2344 // assume wchar == unicode 2418 // assume wchar == unicode
2345 cmdbuf_ptr += len; 2419 cmdbuf_ptr += len;
2346 return wc & UNICODE_MASK; 2420 return wc & UNICODE_MASK;
2347 } 2421 }
2348 2422
2349 return NOCHAR; 2423 return NOCHAR;
2350} 2424}
2351 2425
2352// read the next octet 2426// read the next octet
2353uint32_t 2427uint32_t ecb_hot
2354rxvt_term::next_octet () NOTHROW 2428rxvt_term::next_octet () NOTHROW
2355{ 2429{
2356 return cmdbuf_ptr < cmdbuf_endp 2430 return cmdbuf_ptr < cmdbuf_endp
2357 ? (unsigned char)*cmdbuf_ptr++ 2431 ? (unsigned char)*cmdbuf_ptr++
2358 : NOCHAR; 2432 : NOCHAR;
2359} 2433}
2360 2434
2361static class out_of_input out_of_input; 2435static class out_of_input out_of_input;
2362 2436
2363/* rxvt_cmd_getc () - Return next input character */ 2437wchar_t ecb_hot
2364/*
2365 * Return the next input character after first passing any keyboard input
2366 * to the command.
2367 */
2368wchar_t
2369rxvt_term::cmd_getc () THROW ((class out_of_input)) 2438rxvt_term::cmd_getc () THROW ((class out_of_input))
2370{ 2439{
2371 wchar_t c = next_char (); 2440 wchar_t c = next_char ();
2372 2441
2373 if (c == NOCHAR) 2442 if (c == NOCHAR)
2374 throw out_of_input; 2443 throw out_of_input;
2375 2444
2376 return c; 2445 return c;
2377} 2446}
2378 2447
2379uint32_t 2448uint32_t ecb_hot
2380rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2449rxvt_term::cmd_get8 () THROW ((class out_of_input))
2381{ 2450{
2382 uint32_t c = next_octet (); 2451 uint32_t c = next_octet ();
2383 2452
2384 if (c == NOCHAR) 2453 if (c == NOCHAR)
… …
2388} 2457}
2389 2458
2390/*{{{ print pipe */ 2459/*{{{ print pipe */
2391/*----------------------------------------------------------------------*/ 2460/*----------------------------------------------------------------------*/
2392#ifdef PRINTPIPE 2461#ifdef PRINTPIPE
2393FILE * 2462FILE * ecb_cold
2394rxvt_term::popen_printer () 2463rxvt_term::popen_printer ()
2395{ 2464{
2396 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2465 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2397 2466
2398 if (stream == NULL) 2467 if (stream == NULL)
2399 rxvt_warn ("can't open printer pipe, not printing.\n"); 2468 rxvt_warn ("can't open printer pipe, not printing.\n");
2400 2469
2401 return stream; 2470 return stream;
2402} 2471}
2403 2472
2404int 2473int ecb_cold
2405rxvt_term::pclose_printer (FILE *stream) 2474rxvt_term::pclose_printer (FILE *stream)
2406{ 2475{
2407 fflush (stream); 2476 fflush (stream);
2408 return pclose (stream); 2477 return pclose (stream);
2409} 2478}
2410 2479
2411/* 2480/*
2412 * simulate attached vt100 printer 2481 * simulate attached vt100 printer
2413 */ 2482 */
2414void 2483void ecb_cold
2415rxvt_term::process_print_pipe () 2484rxvt_term::process_print_pipe ()
2416{ 2485{
2417 int done; 2486 FILE *fd = popen_printer ();
2418 FILE *fd;
2419 2487
2420 if ((fd = popen_printer ()) == NULL) 2488 if (!fd)
2421 return; 2489 return;
2422 2490
2423 /* 2491 /*
2424 * Send all input to the printer until either ESC[4i or ESC[?4i 2492 * Send all input to the printer until either ESC[4i or ESC[?4i
2425 * is received. 2493 * is received.
2426 */ 2494 */
2427 for (done = 0; !done;) 2495 for (int done = 0; !done; )
2428 { 2496 {
2429 unsigned char buf[8]; 2497 unsigned char buf[8];
2430 unicode_t ch; 2498 unicode_t ch;
2431 unsigned int i, len; 2499 unsigned int i, len;
2432 2500
… …
2466 pclose_printer (fd); 2534 pclose_printer (fd);
2467} 2535}
2468#endif /* PRINTPIPE */ 2536#endif /* PRINTPIPE */
2469/*}}} */ 2537/*}}} */
2470 2538
2471/* *INDENT-OFF* */
2472enum { 2539enum {
2473 C1_40 = 0x40, 2540 C1_40 = 0x40,
2474 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2541 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2475 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2542 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2476 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2543 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2477 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2544 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2478}; 2545};
2479/* *INDENT-ON* */
2480 2546
2481/*{{{ process non-printing single characters */ 2547/*{{{ process non-printing single characters */
2482void 2548void ecb_hot
2483rxvt_term::process_nonprinting (unicode_t ch) 2549rxvt_term::process_nonprinting (unicode_t ch)
2484{ 2550{
2485 switch (ch) 2551 switch (ch)
2486 { 2552 {
2487 case C0_ESC: 2553 case C0_ESC:
… …
2533} 2599}
2534/*}}} */ 2600/*}}} */
2535 2601
2536 2602
2537/*{{{ process VT52 escape sequences */ 2603/*{{{ process VT52 escape sequences */
2538void 2604void ecb_cold
2539rxvt_term::process_escape_vt52 (unicode_t ch) 2605rxvt_term::process_escape_vt52 (unicode_t ch)
2540{ 2606{
2541 int row, col; 2607 int row, col;
2542 2608
2543 switch (ch) 2609 switch (ch)
… …
2577 break; 2643 break;
2578 case 'Z': /* identify the terminal type */ 2644 case 'Z': /* identify the terminal type */
2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2645 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580 break; 2646 break;
2581 case '<': /* turn off VT52 mode */ 2647 case '<': /* turn off VT52 mode */
2582 PrivMode (0, PrivMode_vt52); 2648 priv_modes &= ~PrivMode_vt52;
2583 break; 2649 break;
2584 case 'F': /* use special graphics character set */ 2650 case 'F': /* use special graphics character set */
2585 case 'G': /* use regular character set */ 2651 case 'G': /* use regular character set */
2586 /* unimplemented */ 2652 /* unimplemented */
2587 break; 2653 break;
… …
2593} 2659}
2594/*}}} */ 2660/*}}} */
2595 2661
2596 2662
2597/*{{{ process escape sequences */ 2663/*{{{ process escape sequences */
2598void 2664void ecb_hot
2599rxvt_term::process_escape_seq () 2665rxvt_term::process_escape_seq ()
2600{ 2666{
2601 unicode_t ch = cmd_getc (); 2667 unicode_t ch = cmd_getc ();
2602 2668
2603 if (priv_modes & PrivMode_vt52) 2669 if (priv_modes & PrivMode_vt52)
… …
2606 return; 2672 return;
2607 } 2673 }
2608 2674
2609 switch (ch) 2675 switch (ch)
2610 { 2676 {
2611 /* case 1: do_tek_mode (); break; */
2612 case '#': 2677 case '#':
2613 if (cmd_getc () == '8') 2678 if (cmd_getc () == '8')
2614 scr_E (); 2679 scr_E ();
2615 break; 2680 break;
2616 case '(': 2681 case '(':
… …
2639#if !ENABLE_MINIMAL 2704#if !ENABLE_MINIMAL
2640 case '9': 2705 case '9':
2641 scr_forwardindex (); 2706 scr_forwardindex ();
2642 break; 2707 break;
2643#endif 2708#endif
2709 // DECPAM/DECPNM
2644 case '=': 2710 case '=':
2711 priv_modes |= PrivMode_aplKP;
2712 break;
2645 case '>': 2713 case '>':
2646 PrivMode ((ch == '='), PrivMode_aplKP); 2714 priv_modes &= ~PrivMode_aplKP;
2647 break; 2715 break;
2648 2716
2649 case C1_40: 2717 case C1_40:
2650 cmd_getc (); 2718 cmd_getc ();
2651 break; 2719 break;
… …
2655 2723
2656 /* 8.3.87: NEXT LINE */ 2724 /* 8.3.87: NEXT LINE */
2657 case C1_NEL: /* ESC E */ 2725 case C1_NEL: /* ESC E */
2658 { 2726 {
2659 wchar_t nlcr[] = { C0_LF, C0_CR }; 2727 wchar_t nlcr[] = { C0_LF, C0_CR };
2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2728 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2661 } 2729 }
2662 break; 2730 break;
2663 2731
2664 /* kidnapped escape sequence: Should be 8.3.48 */ 2732 /* kidnapped escape sequence: Should be 8.3.48 */
2665 case C1_ESA: /* ESC G */ 2733 case C1_ESA: /* ESC G */
2666 process_graphics (); 2734 // used by original rxvt for rob nations own graphics mode
2735 if (cmd_getc () == 'Q')
2736 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2667 break; 2737 break;
2668 2738
2669 /* 8.3.63: CHARACTER TABULATION SET */ 2739 /* 8.3.63: CHARACTER TABULATION SET */
2670 case C1_HTS: /* ESC H */ 2740 case C1_HTS: /* ESC H */
2671 scr_set_tab (1); 2741 scr_set_tab (1);
… …
2675 case C1_RI: /* ESC M */ 2745 case C1_RI: /* ESC M */
2676 scr_index (DN); 2746 scr_index (DN);
2677 break; 2747 break;
2678 2748
2679 /* 8.3.142: SINGLE-SHIFT TWO */ 2749 /* 8.3.142: SINGLE-SHIFT TWO */
2680 /*case C1_SS2: scr_single_shift (2); break; */ 2750 /* case C1_SS2: break; */
2681 2751
2682 /* 8.3.143: SINGLE-SHIFT THREE */ 2752 /* 8.3.143: SINGLE-SHIFT THREE */
2683 /*case C1_SS3: scr_single_shift (3); break; */ 2753 /* case C1_SS3: break; */
2684 2754
2685 /* 8.3.27: DEVICE CONTROL STRING */ 2755 /* 8.3.27: DEVICE CONTROL STRING */
2686 case C1_DCS: /* ESC P */ 2756 case C1_DCS: /* ESC P */
2687 process_dcs_seq (); 2757 process_dcs_seq ();
2688 break; 2758 break;
… …
2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2760 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2691 case C1_SCI: /* ESC Z */ 2761 case C1_SCI: /* ESC Z */
2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2762 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2693 break; /* steal obsolete ESC [ c */ 2763 break; /* steal obsolete ESC [ c */
2694 2764
2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2765 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2696 case C1_CSI: /* ESC [ */ 2766 case C1_CSI: /* ESC [ */
2697 process_csi_seq (); 2767 process_csi_seq ();
2698 break; 2768 break;
2699 2769
2700 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2770 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2701 case C1_OSC: /* ESC ] */ 2771 case C1_OSC: /* ESC ] */
2702 process_osc_seq (); 2772 process_osc_seq ();
2703 break; 2773 break;
2704 2774
2705 /* 8.3.106: RESET TO INITIAL STATE */ 2775 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2706 case 'c': 2776 case 'c':
2707 mbstate.reset (); 2777 mbstate.reset ();
2708 scr_poweron (); 2778 scr_poweron ();
2709 scrollbar_show (1); 2779 scrollBar.show (1);
2710 break; 2780 break;
2711 2781
2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2782 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2713 case 'n': 2783 case 'n':
2714 scr_charset_choose (2); 2784 scr_charset_choose (2);
… …
2721 } 2791 }
2722} 2792}
2723/*}}} */ 2793/*}}} */
2724 2794
2725/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2795/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2726/* *INDENT-OFF* */
2727enum { 2796enum {
2728 CSI_ICH = 0x40, 2797 CSI_ICH = 0x40,
2729 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2798 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2730 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2799 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2731 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2800 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2734 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2803 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2804 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2805 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737}; 2806};
2738 2807
2739#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2808#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2809 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2810 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742#define get_byte_array_bit(array, bit) \ 2811#define get_byte_array_bit(array, bit) \
2743 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2812 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744 2813
2745const unsigned char csi_defaults[] = 2814static const unsigned char csi_defaults[] =
2746 { 2815 {
2747 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2816 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2817 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2818 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2819 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2751 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2820 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2752 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2821 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2753 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2754 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2823 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2755 }; 2824 };
2756/* *INDENT-ON* */
2757 2825
2758void 2826void ecb_hot
2759rxvt_term::process_csi_seq () 2827rxvt_term::process_csi_seq ()
2760{ 2828{
2761 unicode_t ch, priv, i; 2829 unicode_t ch, priv, prev_ch, i;
2762 unsigned int nargs, p; 2830 unsigned int nargs, p;
2763 int n, ndef; 2831 int n, ndef;
2764 int arg[ESC_ARGS] = { }; 2832 int arg[ESC_ARGS] = { };
2765 2833
2766 nargs = 0; 2834 nargs = 0;
2767 2835
2768 priv = 0; 2836 priv = 0;
2769 ch = cmd_getc (); 2837 ch = cmd_getc ();
2770 if (ch >= '<' && ch <= '?') 2838 if ((ch >= '<' && ch <= '?') || ch == '!')
2771 { 2839 {
2772 /* '<' '=' '>' '?' */ 2840 /* '<' '=' '>' '?' '!' */
2773 priv = ch; 2841 priv = ch;
2774 ch = cmd_getc (); 2842 ch = cmd_getc ();
2775 } 2843 }
2776 2844
2845 prev_ch = 0;
2777 /* read any numerical arguments */ 2846 /* read any numerical arguments */
2778 for (n = -1; ch < CSI_ICH; ) 2847 for (n = -1; ch < CSI_ICH; )
2779 { 2848 {
2780 if (isdigit (ch)) 2849 if (isdigit (ch))
2781 { 2850 {
… …
2791 n = -1; 2860 n = -1;
2792 } 2861 }
2793 else if (IS_CONTROL (ch)) 2862 else if (IS_CONTROL (ch))
2794 process_nonprinting (ch); 2863 process_nonprinting (ch);
2795 2864
2865 prev_ch = ch;
2796 ch = cmd_getc (); 2866 ch = cmd_getc ();
2797 } 2867 }
2798 2868
2799 if (ch > CSI_7F) 2869 if (ch > CSI_7F)
2800 return; 2870 return;
… …
2826 // versions. 2896 // versions.
2827 // 2897 //
2828 tt_printf ("\033[>%d;95;0c", 'U'); 2898 tt_printf ("\033[>%d;95;0c", 'U');
2829 } 2899 }
2830 break; 2900 break;
2901
2831 case '?': 2902 case '?':
2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2903 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833 process_terminal_mode (ch, priv, nargs, arg); 2904 process_terminal_mode (ch, priv, nargs, arg);
2834 break; 2905 break;
2906
2907 case '!':
2908 if (ch == CSI_70)
2909 {
2910 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2911 scr_soft_reset ();
2912
2913 static const int pm_h[] = { 7, 25 };
2914 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2915
2916 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2917 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2835 } 2918 }
2919 break;
2920 }
2921
2836 return; 2922 return;
2837 } 2923 }
2838 2924
2839 switch (ch) 2925 switch (ch)
2840 { 2926 {
… …
2854 } 2940 }
2855 break; 2941 break;
2856#endif 2942#endif
2857 2943
2858 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2944 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2859 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2945 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2860 arg[0] = -arg[0]; 2946 arg[0] = -arg[0];
2861 /* FALLTHROUGH */ 2947 /* FALLTHROUGH */
2862 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2948 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2863 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2949 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2864 scr_gotorc (arg[0], 0, RELATIVE); 2950 scr_gotorc (arg[0], 0, RELATIVE);
2865 break; 2951 break;
2866 2952
2867 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2953 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2868 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2954 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3018 scr_insert_mode (1); 3104 scr_insert_mode (1);
3019 else if (arg[0] == 20) 3105 else if (arg[0] == 20)
3020 priv_modes |= PrivMode_LFNL; 3106 priv_modes |= PrivMode_LFNL;
3021 break; 3107 break;
3022 3108
3109 case CSI_71: // DESCUSR: set cursor style
3110 if (prev_ch == ' ')
3111 set_cursor_style (arg[0]);
3112 break;
3113
3023 /* 3114 /*
3024 * PRIVATE USE beyond this point. All CSI_7? sequences here 3115 * PRIVATE USE beyond this point. All CSI_7? sequences here
3025 */ 3116 */
3026 case CSI_72: /* DECSTBM: set top and bottom margins */ 3117 case CSI_72: /* DECSTBM: set top and bottom margins */
3027 if (nargs == 1) 3118 if (nargs == 1)
… …
3055 } 3146 }
3056} 3147}
3057/*}}} */ 3148/*}}} */
3058 3149
3059#if !ENABLE_MINIMAL 3150#if !ENABLE_MINIMAL
3060/* ARGSUSED */
3061void 3151void
3062rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3152rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3063{ 3153{
3064 int x, y; 3154 int x, y;
3065 XWindowAttributes wattr; 3155 XWindowAttributes wattr;
… …
3074 { 3164 {
3075 /* 3165 /*
3076 * commands 3166 * commands
3077 */ 3167 */
3078 case 1: /* deiconify window */ 3168 case 1: /* deiconify window */
3079 XMapWindow (dpy, parent[0]); 3169 XMapWindow (dpy, parent);
3080 break; 3170 break;
3081 case 2: /* iconify window */ 3171 case 2: /* iconify window */
3082 XIconifyWindow (dpy, parent[0], display->screen); 3172 XIconifyWindow (dpy, parent, display->screen);
3083 break; 3173 break;
3084 case 3: /* set position (pixels) */ 3174 case 3: /* set position (pixels) */
3085 XMoveWindow (dpy, parent[0], args[1], args[2]); 3175 XMoveWindow (dpy, parent, args[1], args[2]);
3086 break; 3176 break;
3087 case 4: /* set size (pixels) */ 3177 case 4: /* set size (pixels) */
3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3178 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3089 break; 3179 break;
3090 case 5: /* raise window */ 3180 case 5: /* raise window */
3091 XRaiseWindow (dpy, parent[0]); 3181 XRaiseWindow (dpy, parent);
3092 break; 3182 break;
3093 case 6: /* lower window */ 3183 case 6: /* lower window */
3094 XLowerWindow (dpy, parent[0]); 3184 XLowerWindow (dpy, parent);
3095 break; 3185 break;
3096 case 7: /* refresh window */ 3186 case 7: /* refresh window */
3097 scr_touch (true); 3187 scr_touch (true);
3098 break; 3188 break;
3099 case 8: /* set size (chars) */ 3189 case 8: /* set size (chars) */
… …
3102 break; 3192 break;
3103 3193
3104 //case 9: NYI, TODO, restore maximized window or maximize window 3194 //case 9: NYI, TODO, restore maximized window or maximize window
3105 default: 3195 default:
3106 if (args[0] >= 24) /* set height (chars) */ 3196 if (args[0] >= 24) /* set height (chars) */
3107 set_widthheight ((unsigned int)width, 3197 set_widthheight ((unsigned int)vt_width,
3108 (unsigned int) (args[1] * fheight)); 3198 (unsigned int) (args[1] * fheight));
3109 break; 3199 break;
3110 3200
3111 /* 3201 /*
3112 * reports - some output format copied from XTerm 3202 * reports - some output format copied from XTerm
3113 */ 3203 */
3114 case 11: /* report window state */ 3204 case 11: /* report window state */
3115 XGetWindowAttributes (dpy, parent[0], &wattr); 3205 XGetWindowAttributes (dpy, parent, &wattr);
3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3206 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3117 break; 3207 break;
3118 case 13: /* report window position */ 3208 case 13: /* report window position */
3119 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3120 XTranslateCoordinates (dpy, parent[0], wattr.root, 3210 XTranslateCoordinates (dpy, parent, wattr.root,
3121 -wattr.border_width, -wattr.border_width, 3211 -wattr.border_width, -wattr.border_width,
3122 &x, &y, &wdummy); 3212 &x, &y, &wdummy);
3123 tt_printf ("\033[3;%d;%dt", x, y); 3213 tt_printf ("\033[3;%d;%dt", x, y);
3124 break; 3214 break;
3125 case 14: /* report window size (pixels) */ 3215 case 14: /* report window size (pixels) */
3126 XGetWindowAttributes (dpy, parent[0], &wattr); 3216 XGetWindowAttributes (dpy, parent, &wattr);
3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3217 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3128 break; 3218 break;
3129 case 18: /* report text area size (chars) */ 3219 case 18: /* report text area size (chars) */
3130 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3131 break; 3221 break;
… …
3133 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3223 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3134 break; 3224 break;
3135 case 20: /* report icon label */ 3225 case 20: /* report icon label */
3136 { 3226 {
3137 char *s; 3227 char *s;
3138 XGetIconName (dpy, parent[0], &s); 3228 XGetIconName (dpy, parent, &s);
3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3229 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3140 XFree (s); 3230 XFree (s);
3141 } 3231 }
3142 break; 3232 break;
3143 case 21: /* report window title */ 3233 case 21: /* report window title */
3144 { 3234 {
3145 char *s; 3235 char *s;
3146 XFetchName (dpy, parent[0], &s); 3236 XFetchName (dpy, parent, &s);
3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3237 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3148 XFree (s); 3238 XFree (s);
3149 } 3239 }
3150 break; 3240 break;
3151 } 3241 }
… …
3161rxvt_term::get_to_st (unicode_t &ends_how) 3251rxvt_term::get_to_st (unicode_t &ends_how)
3162{ 3252{
3163 unicode_t ch; 3253 unicode_t ch;
3164 bool seen_esc = false; 3254 bool seen_esc = false;
3165 unsigned int n = 0; 3255 unsigned int n = 0;
3166 wchar_t string[STRING_MAX]; 3256 wchar_t string[CBUFSIZ];
3167 3257
3168 while ((ch = cmd_getc ()) != NOCHAR) 3258 while ((ch = cmd_getc ()) != NOCHAR)
3169 { 3259 {
3170 if (seen_esc) 3260 if (seen_esc)
3171 { 3261 {
… …
3186 else if (ch < 0x20) 3276 else if (ch < 0x20)
3187 return NULL; /* other control character - exit */ 3277 return NULL; /* other control character - exit */
3188 3278
3189 seen_esc = false; 3279 seen_esc = false;
3190 3280
3191 if (n >= STRING_MAX - 1) 3281 if (n >= sizeof (string) - 1)
3192 // stop at some sane length 3282 // stop at some sane length
3193 return NULL; 3283 return NULL;
3194 3284
3195 string[n++] = ch; 3285 string[n++] = ch;
3196 } 3286 }
… …
3207 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3297 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3208 */ 3298 */
3209void 3299void
3210rxvt_term::process_dcs_seq () 3300rxvt_term::process_dcs_seq ()
3211{ 3301{
3212 char *s;
3213 unicode_t eh;
3214
3215 /* 3302 /*
3216 * Not handled yet 3303 * Not handled yet
3217 */ 3304 */
3305
3306 unicode_t eh;
3218 s = get_to_st (eh); 3307 char *s = get_to_st (eh);
3219 if (s) 3308 if (s)
3220 free (s); 3309 free (s);
3221 3310
3222 return; 3311 return;
3223} 3312}
… …
3227 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3316 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3228 */ 3317 */
3229void 3318void
3230rxvt_term::process_osc_seq () 3319rxvt_term::process_osc_seq ()
3231{ 3320{
3232 unicode_t ch, eh;
3233 int arg; 3321 int arg;
3234 3322
3235 ch = cmd_getc (); 3323 unicode_t ch = cmd_getc ();
3236 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3324 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3237 arg = arg * 10 + (ch - '0'); 3325 arg = arg * 10 + (ch - '0');
3238 3326
3239 if (ch == ';') 3327 if (ch == ';')
3240 { 3328 {
3329 unicode_t eh;
3241 char *s = get_to_st (eh); 3330 char *s = get_to_st (eh);
3242 3331
3243 if (s) 3332 if (s)
3244 { 3333 {
3245 process_xterm_seq (arg, s, eh); 3334 process_xterm_seq (arg, s, eh);
… …
3269 3358
3270/* 3359/*
3271 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3360 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3272 */ 3361 */
3273void 3362void
3274rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3363rxvt_term::process_xterm_seq (int op, char *str, char resp)
3275{ 3364{
3276 int color; 3365 int color;
3277 char *buf, *name; 3366 char *buf, *name;
3278 bool query = str[0] == '?' && !str[1]; 3367 bool query = str[0] == '?' && !str[1];
3279 int saveop = op; 3368 int saveop = op;
… …
3306 unsigned long bytes_after; 3395 unsigned long bytes_after;
3307 unsigned char *value = 0; 3396 unsigned char *value = 0;
3308 const char *str = ""; 3397 const char *str = "";
3309 3398
3310 if (prop 3399 if (prop
3311 && XGetWindowProperty (dpy, parent[0], 3400 && XGetWindowProperty (dpy, parent,
3312 prop, 0, 1<<16, 0, AnyPropertyType, 3401 prop, 0, 1<<16, 0, AnyPropertyType,
3313 &actual_type, &actual_format, 3402 &actual_type, &actual_format,
3314 &nitems, &bytes_after, &value) == Success 3403 &nitems, &bytes_after, &value) == Success
3315 && actual_type != None 3404 && actual_type != None
3316 && actual_format == 8) 3405 && actual_format == 8)
3317 str = (const char *)(value); 3406 str = (const char *)(value);
3318 3407
3319 tt_printf ("\033]%d;%s%c", op, str, resp); 3408 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3320 3409
3321 XFree (value); 3410 XFree (value);
3322 } 3411 }
3323 else 3412 else
3324 { 3413 {
3325 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3414 char *eq = strchr (str, '=');
3326 3415
3327 if (eq) 3416 if (eq)
3328 { 3417 {
3329 *eq = 0; 3418 *eq = 0;
3330 set_utf8_property (display->atom (str), eq + 1); 3419 set_utf8_property (display->atom (str), eq + 1);
3331 } 3420 }
3332 else 3421 else
3333 XDeleteProperty (dpy, parent[0], 3422 XDeleteProperty (dpy, parent,
3334 display->atom (str)); 3423 display->atom (str));
3335 } 3424 }
3336 break; 3425 break;
3337 3426
3338 case XTerm_Color: 3427 case XTerm_Color:
… …
3351 *buf++ = '\0'; 3440 *buf++ = '\0';
3352 3441
3353 process_color_seq (op, color, name, resp); 3442 process_color_seq (op, color, name, resp);
3354 } 3443 }
3355 break; 3444 break;
3445 case Rxvt_restoreFG:
3356 case XTerm_Color00: 3446 case XTerm_Color00:
3357 process_color_seq (op, Color_fg, str, resp); 3447 process_color_seq (op, Color_fg, str, resp);
3358 break; 3448 break;
3449 case Rxvt_restoreBG:
3359 case XTerm_Color01: 3450 case XTerm_Color01:
3360 process_color_seq (op, Color_bg, str, resp); 3451 process_color_seq (op, Color_bg, str, resp);
3361 break; 3452 break;
3362#ifndef NO_CURSORCOLOR 3453#ifndef NO_CURSORCOLOR
3363 case XTerm_Color_cursor: 3454 case XTerm_Color_cursor:
… …
3368 process_color_seq (op, Color_pointer_fg, str, resp); 3459 process_color_seq (op, Color_pointer_fg, str, resp);
3369 break; 3460 break;
3370 case XTerm_Color_pointer_bg: 3461 case XTerm_Color_pointer_bg:
3371 process_color_seq (op, Color_pointer_bg, str, resp); 3462 process_color_seq (op, Color_pointer_bg, str, resp);
3372 break; 3463 break;
3464#ifdef OPTION_HC
3465 case XTerm_Color_HC:
3466 process_color_seq (op, Color_HC, str, resp);
3467 break;
3468 case XTerm_Color_HTC:
3469 process_color_seq (op, Color_HTC, str, resp);
3470 break;
3471#endif
3373#ifndef NO_BOLD_UNDERLINE_REVERSE 3472#ifndef NO_BOLD_UNDERLINE_REVERSE
3374 case XTerm_Color_RV:
3375 process_color_seq (op, Color_RV, str, resp);
3376 break;
3377 case Rxvt_Color_BD:
3378 case URxvt_Color_BD: 3473 case URxvt_Color_BD:
3379 process_color_seq (op, Color_BD, str, resp); 3474 process_color_seq (op, Color_BD, str, resp);
3380 break; 3475 break;
3381 case Rxvt_Color_UL:
3382 case URxvt_Color_UL: 3476 case URxvt_Color_UL:
3383 process_color_seq (op, Color_UL, str, resp); 3477 process_color_seq (op, Color_UL, str, resp);
3384 break; 3478 break;
3385 case URxvt_Color_IT: 3479 case URxvt_Color_IT:
3386 process_color_seq (op, Color_IT, str, resp); 3480 process_color_seq (op, Color_IT, str, resp);
3387 break; 3481 break;
3388#endif 3482#endif
3389#if ENABLE_TRANSPARENCY 3483 case URxvt_Color_border:
3484 process_color_seq (op, Color_border, str, resp);
3485 break;
3486
3487#if BG_IMAGE_FROM_ROOT
3390 case URxvt_Color_tint: 3488 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp); 3489 process_color_seq (op, Color_tint, str, resp);
3392 { 3490 {
3393 bool changed = false; 3491 bool changed = false;
3492
3394 if (ISSET_PIXCOLOR (Color_tint)) 3493 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3494 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3396 else 3495
3397 changed = bgPixmap.unset_tint ();
3398 if (changed) 3496 if (changed)
3399 update_background (); 3497 update_background ();
3400 } 3498 }
3401 3499
3402 break; 3500 break;
… …
3405#if BG_IMAGE_FROM_FILE 3503#if BG_IMAGE_FROM_FILE
3406 case Rxvt_Pixmap: 3504 case Rxvt_Pixmap:
3407 if (!strcmp (str, "?")) 3505 if (!strcmp (str, "?"))
3408 { 3506 {
3409 char str[256]; 3507 char str[256];
3508 int h_scale = fimage.h_scale;
3509 int v_scale = fimage.v_scale;
3510 int h_align = fimage.h_align;
3511 int v_align = fimage.v_align;
3410 3512
3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3513 sprintf (str, "[%dx%d+%d+%d]",
3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3514 h_scale, v_scale,
3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3515 h_align, v_align);
3414 process_xterm_seq (XTerm_title, str, CHAR_ST); 3516 process_xterm_seq (XTerm_title, str, CHAR_ST);
3415 } 3517 }
3416 else 3518 else
3417 { 3519 {
3418 int changed = 0; 3520 bool changed = false;
3419 3521
3420 if (*str != ';') 3522 if (*str != ';')
3421 { 3523 {
3422 /* reset to default scaling :*/ 3524 try
3423 bgPixmap.unset_geometry (); 3525 {
3424 if (bgPixmap.set_file (str)) /* change pixmap */ 3526 fimage.set_file_geometry (this, str);
3425 changed++; 3527 changed = true;
3426 str = strchr (str, ';'); 3528 }
3427 if (str == NULL) 3529 catch (const class rxvt_failure_exception &e)
3428 bgPixmap.set_defaultGeometry (); 3530 {
3531 }
3429 } 3532 }
3430 while (str) 3533 else
3431 { 3534 {
3432 str++; 3535 str++;
3433 if (bgPixmap.set_geometry (str)) 3536 if (fimage.set_geometry (str, true))
3434 changed++; 3537 changed = true;
3435 str = strchr (str, ';');
3436 } 3538 }
3539
3437 if (changed) 3540 if (changed)
3541 {
3542 if (bg_window_position_sensitive ())
3543 {
3544 int x, y;
3545 get_window_origin (x, y);
3546 parent_x = x;
3547 parent_y = y;
3548 }
3438 update_background (); 3549 update_background ();
3550 }
3439 } 3551 }
3440 break; 3552 break;
3441#endif 3553#endif
3442
3443 case Rxvt_restoreFG:
3444 set_window_color (Color_fg, str);
3445 break;
3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break;
3449 3554
3450 case XTerm_logfile: 3555 case XTerm_logfile:
3451 // TODO, when secure mode? 3556 // TODO, when secure mode?
3452 break; 3557 break;
3453 3558
… …
3520 break; 3625 break;
3521#endif 3626#endif
3522 3627
3523#if ENABLE_PERL 3628#if ENABLE_PERL
3524 case URxvt_perl: 3629 case URxvt_perl:
3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3630 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3526 ; // no responses yet
3527 break; 3631 break;
3528#endif 3632#endif
3529 } 3633 }
3530} 3634}
3531/*----------------------------------------------------------------------*/ 3635/*----------------------------------------------------------------------*/
… …
3538 * 's' = save 3642 * 's' = save
3539 * 'r' = restore 3643 * 'r' = restore
3540 * 't' = toggle 3644 * 't' = toggle
3541 * so no need for fancy checking 3645 * so no need for fancy checking
3542 */ 3646 */
3543int 3647int ecb_cold
3544rxvt_term::privcases (int mode, unsigned long bit) 3648rxvt_term::privcases (int mode, unsigned long bit)
3545{ 3649{
3546 int state; 3650 int state;
3547 3651
3548 if (mode == 's') 3652 if (mode == 's')
3549 { 3653 {
3550 SavedModes |= (priv_modes & bit); 3654 if (priv_modes & bit)
3655 SavedModes |= bit;
3656 else
3657 SavedModes &= ~bit;
3551 return -1; 3658 return -1;
3552 } 3659 }
3553 else 3660 else
3554 { 3661 {
3555 if (mode == 'r') 3662 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3663 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3664 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3665 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 PrivMode (state, bit); 3666
3667 if (state)
3668 priv_modes |= bit;
3669 else
3670 priv_modes &= ~bit;
3560 } 3671 }
3561 3672
3562 return state; 3673 return state;
3563} 3674}
3564 3675
3565/* we're not using priv _yet_ */ 3676/* we're not using priv _yet_ */
3566void 3677void
3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3678rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3568{ 3679{
3569 unsigned int i, j; 3680 unsigned int i, j;
3570 int state; 3681 int state;
3571 3682
3572 static const struct 3683 static const struct
3573 { 3684 {
3574 const int argval; 3685 const int argval;
3575 const unsigned long bit; 3686 const unsigned long bit;
3576 } argtopriv[] = { 3687 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3688 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3689 { 2, PrivMode_vt52 }, // DECANM
3579 { 3, PrivMode_132 }, 3690 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3691 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3692 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3693 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3694 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3695 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3696 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3697 // 18 end FF to printer after print screen
3698 // 19 Print screen prints full screen/scroll region
3587 { 25, PrivMode_VisibleCursor }, 3699 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3700#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3701 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3702#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3703 { 35, PrivMode_ShiftKeys }, // rxvt extension
3704 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3705 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3706 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3707 // 45 margin bell NYI
3595 // 46 start logging 3708 // 46 start logging
3596 { 47, PrivMode_Screen }, 3709 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3710 { 66, PrivMode_aplKP }, // DECNKM
3598#ifndef NO_BACKSPACE_KEY 3711#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3712 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3713#endif
3601 { 1000, PrivMode_MouseX11 }, 3714 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3715 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3716 { 1003, PrivMode_MouseAnyEvent },
3717#if ENABLE_FRILLS
3718 { 1005, PrivMode_ExtModeMouse },
3719#endif
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3720 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605 { 1011, PrivMode_Keypress }, // rxvt extension 3721 { 1011, PrivMode_Keypress }, // rxvt extension
3722#if ENABLE_FRILLS
3723 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3724#endif
3606 // 1035 enable modifiers for alt, numlock NYI 3725 // 1035 enable modifiers for alt, numlock NYI
3607 // 1036 send ESC for meta keys NYI 3726 // 1036 send ESC for meta keys NYI
3608 // 1037 send DEL for keypad delete NYI 3727 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3728 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3729 // 1048 save and restore cursor, implemented in code
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3730 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3731 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3732 { 2004, PrivMode_BracketPaste },
3613 }; 3733 };
3614 3734
3615 if (nargs == 0) 3735 if (nargs == 0)
3616 return; 3736 return;
3617 3737
… …
3624 for (i = 0; i < nargs; i++) 3744 for (i = 0; i < nargs; i++)
3625 { 3745 {
3626 state = -1; 3746 state = -1;
3627 3747
3628 /* basic handling */ 3748 /* basic handling */
3629 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3749 for (j = 0; j < ecb_array_length (argtopriv); j++)
3630 if (argtopriv[j].argval == arg[i]) 3750 if (argtopriv[j].argval == arg[i])
3631 { 3751 {
3632 state = privcases (mode, argtopriv[j].bit); 3752 state = privcases (mode, argtopriv[j].bit);
3633 break; 3753 break;
3634 } 3754 }
… …
3642 3762
3643 scr_touch (true); 3763 scr_touch (true);
3644 break; 3764 break;
3645#endif 3765#endif
3646 case 1048: /* alternative cursor save */ 3766 case 1048: /* alternative cursor save */
3647 case 1049:
3648 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3649 if (mode == 0) 3768 if (mode == 0)
3650 scr_cursor (RESTORE); 3769 scr_cursor (RESTORE);
3651 else if (mode == 1) 3770 else if (mode == 1)
3652 scr_cursor (SAVE); 3771 scr_cursor (SAVE);
… …
3661 case 2: /* VT52 mode */ 3780 case 2: /* VT52 mode */
3662 /* oddball mode. should be set regardless of set/reset 3781 /* oddball mode. should be set regardless of set/reset
3663 * parameter. Return from VT52 mode with an ESC < from 3782 * parameter. Return from VT52 mode with an ESC < from
3664 * within VT52 mode 3783 * within VT52 mode
3665 */ 3784 */
3666 PrivMode (1, PrivMode_vt52); 3785 priv_modes |= PrivMode_vt52;
3667 break; 3786 break;
3668 case 3: /* 80/132 */ 3787 case 3: /* 80/132 */
3669 if (priv_modes & PrivMode_132OK) 3788 if (priv_modes & PrivMode_132OK)
3670 set_widthheight (((state ? 132 : 80) * fwidth), height); 3789 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 break; 3790 break;
3672 case 4: /* smooth scrolling */ 3791 case 4: /* smooth scrolling */
3673 set_option (Opt_jumpScroll, !state); 3792 set_option (Opt_jumpScroll, !state);
3674 break; 3793 break;
3675 case 5: /* reverse video */ 3794 case 5: /* reverse video */
… …
3686 if (state) /* orthogonal */ 3805 if (state) /* orthogonal */
3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3806 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3688 break; 3807 break;
3689#ifdef scrollBar_esc 3808#ifdef scrollBar_esc
3690 case scrollBar_esc: 3809 case scrollBar_esc:
3691 if (scrollbar_mapping (state)) 3810 scrollBar.map (state);
3692 {
3693 resize_all_windows (0, 0, 0); 3811 resize_all_windows (0, 0, 0);
3694 scr_touch (true); 3812 scr_touch (true);
3695 }
3696 break; 3813 break;
3697#endif 3814#endif
3698 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3699 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3700 break; 3817 break;
… …
3713 case 1003: 3830 case 1003:
3714 if (state) 3831 if (state)
3715 { 3832 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3833 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3834 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3835 mouse_row = mouse_col = 0;
3718 vt_emask_mouse = PointerMotionMask; 3836 vt_emask_mouse = PointerMotionMask;
3719 } 3837 }
3720 else 3838 else
3721 vt_emask_mouse = NoEventMask; 3839 vt_emask_mouse = NoEventMask;
3840
3722 vt_select_input (); 3841 vt_select_input ();
3723 break; 3842 break;
3724 case 1010: /* scroll to bottom on TTY output inhibit */ 3843 case 1010: /* scroll to bottom on TTY output inhibit */
3725 set_option (Opt_scrollTtyOutput, !state); 3844 set_option (Opt_scrollTtyOutput, !state);
3726 break; 3845 break;
3727 case 1011: /* scroll to bottom on key press */ 3846 case 1011: /* scroll to bottom on key press */
3728 set_option (Opt_scrollTtyKeypress, state); 3847 set_option (Opt_scrollTtyKeypress, state);
3729 break; 3848 break;
3730 case 1047: /* secondary screen w/ clearing last */ 3849 case 1047: /* secondary screen w/ clearing last */
3731 if (option (Opt_secondaryScreen)) 3850 if (option (Opt_secondaryScreen))
3732 if (current_screen != PRIMARY) 3851 if (!state)
3733 scr_erase_screen (2); 3852 scr_erase_screen (2);
3853
3734 scr_change_screen (state); 3854 scr_change_screen (state);
3735 break; 3855 break;
3736 case 1049: /* secondary screen w/ clearing first */ 3856 case 1049: /* secondary screen w/ clearing first */
3857 if (option (Opt_secondaryScreen))
3858 if (state)
3859 scr_cursor (SAVE);
3860
3737 scr_change_screen (state); 3861 scr_change_screen (state);
3862
3738 if (option (Opt_secondaryScreen)) 3863 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3864 if (state)
3740 scr_erase_screen (2); 3865 scr_erase_screen (2);
3866 else
3867 scr_cursor (RESTORE);
3741 break; 3868 break;
3742 default: 3869 default:
3743 break; 3870 break;
3744 } 3871 }
3745 } 3872 }
3746} 3873}
3747/*}}} */ 3874/*}}} */
3748 3875
3749/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3750void 3877void ecb_hot
3751rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3752{ 3879{
3753 unsigned int i; 3880 unsigned int i;
3754 short rendset; 3881 short rendset;
3755 int rendstyle; 3882 int rendstyle;
… …
3896 break; 4023 break;
3897#endif 4024#endif
3898 } 4025 }
3899 } 4026 }
3900} 4027}
3901/*}}} */
3902 4028
3903/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3904void 4029void
3905rxvt_term::process_graphics () 4030rxvt_term::set_cursor_style (int style)
3906{ 4031{
3907 unicode_t ch, cmd = cmd_getc (); 4032 if (!IN_RANGE_INC (style, 0, 4))
3908
3909 if (cmd == 'Q')
3910 {
3911 /* query graphics */
3912 tt_printf ("\033G0\012"); /* no graphics */
3913 return; 4033 return;
3914 } 4034
3915 /* swallow other graphics sequences until terminating ':' */ 4035 set_option (Opt_cursorUnderline, style >= 3);
3916 do 4036
3917 ch = cmd_getc (); 4037#ifdef CURSOR_BLINK
3918 while (ch != ':'); 4038 set_option (Opt_cursorBlink, !style || (style & 1));
4039 cursor_blink_reset ();
4040#endif
4041
4042 want_refresh = 1;
3919} 4043}
3920/*}}} */ 4044/*}}} */
3921 4045
3922/* ------------------------------------------------------------------------- */ 4046/* ------------------------------------------------------------------------- */
3923 4047
… …
3939 4063
3940/* ---------------------------------------------------------------------- */ 4064/* ---------------------------------------------------------------------- */
3941/* Write data to the pty as typed by the user, pasted with the mouse, 4065/* Write data to the pty as typed by the user, pasted with the mouse,
3942 * or generated by us in response to a query ESC sequence. 4066 * or generated by us in response to a query ESC sequence.
3943 */ 4067 */
3944const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4068static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3945 4069
3946void 4070void
3947rxvt_term::tt_write (const char *data, unsigned int len) 4071rxvt_term::tt_write (const char *data, unsigned int len)
3948{ 4072{
3949 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3954 4078
3955 if (v_buflen == 0) 4079 if (v_buflen == 0)
3956 { 4080 {
3957 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4081 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3958 4082
4083 max_it (written, 0);
4084
3959 if ((unsigned int)written == len) 4085 if (written == len)
3960 return; 4086 return;
3961 4087
3962 data += written; 4088 data += written;
3963 len -= written; 4089 len -= written;
3964 } 4090 }
3965 4091
3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4092 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3967 4093
3968 memcpy (v_buffer + v_buflen, data, len); 4094 memcpy (v_buffer + v_buflen, data, len);
3969 v_buflen += len; 4095 v_buflen += len;
3970 4096
3971 pty_ev.set (ev::READ | ev::WRITE); 4097 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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