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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.179 by root, Wed Dec 15 05:39:08 2004 UTC

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

Diff Legend

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