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.175 by root, Sat Dec 11 17:18:29 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;
… …
750 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
751 1062
752 if (revents & EVENT_WRITE) 1063 if (revents & EVENT_WRITE)
753 tt_write (0, 0); 1064 tt_write (0, 0);
754 else if (revents & EVENT_READ) 1065 else if (revents & EVENT_READ)
755 {
756 bool flag = true;
757
758 // loop, but don't allow a single term to monopolize us 1066 // 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 ()) 1067 while (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 ()) 1068 if (cmd_parse ())
770 break;
771 }
772 }
773}
774
775bool
776rxvt_term::cmd_parse ()
777{
778 bool flag = false;
779 uint32_t ch = NOCHAR;
780
781 for (;;)
782 {
783 if (ch == NOCHAR)
784 ch = next_char ();
785
786 if (ch == NOCHAR) // TODO: improve
787 break;
788
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; 1069 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} 1070}
913 1071
914/* rxvt_cmd_getc () - Return next input character */ 1072void
915/* 1073rxvt_term::pointer_unblank ()
916 * Return the next input character after first passing any keyboard input
917 * to the command.
918 */
919uint32_t
920rxvt_term::cmd_getc ()
921{ 1074{
922 for (;;) 1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
923 { 1076 recolour_cursor ();
924 uint32_t c = next_char ();
925 if (c != NOCHAR)
926 return c;
927 1077
928 // incomplete sequences should occur rarely, still, a better solution 1078#ifdef POINTER_BLANK
929 // would be preferred. either setjmp/longjmp or better design. 1079 hidden_pointer = 0;
930 fcntl (cmd_fd, F_SETFL, 0); 1080
931 pty_fill (); 1081 if (options & Opt_pointerBlank)
932 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 1082 pointer_ev.start (NOW + pointerBlankDelay);
933 } 1083#endif
934} 1084}
935 1085
936#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
937void 1087void
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 () 1088rxvt_term::pointer_blank ()
951{ 1089{
952 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
953 return; 1091 return;
954 1092
955 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
956 XFlush (display->display); 1094 XFlush (display->display);
957 1095
… …
977 x = ev.x; 1115 x = ev.x;
978 y = ev.y; 1116 y = ev.y;
979 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
980 1118
981 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
982 {
983 button_number = 3; 1120 button_number = 3;
984 }
985 else 1121 else
986 { 1122 {
987 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
988 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
989 if (button_number >= 3) 1125 if (button_number >= 3)
990 button_number += (64 - 3); 1126 button_number += (64 - 3);
991 } 1127 }
992 1128
993 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
994 { 1130 {
995 /* 1131 /*
996 * do not report ButtonRelease 1132 * do not report ButtonRelease
997 * no state info allowed 1133 * no state info allowed
998 */ 1134 */
… …
1013 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1014 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
1015#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
1016 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1017#endif 1153#endif
1018
1019 } 1154 }
1020 1155
1021#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
1022 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
1023 if (key_state & 16) 1158 if (key_state & 16)
1024 fputc ('C', stderr); 1159 fputc ('C', stderr);
1025 if (key_state & 4) 1160 if (key_state & 4)
1026 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
1030 fputc ('2', stderr); 1165 fputc ('2', stderr);
1031 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
1032 button_number, 1167 button_number,
1033 x + 1, 1168 x + 1,
1034 y + 1); 1169 y + 1);
1035#else 1170#endif
1171
1036 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
1037 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
1038 (32 + x + 1), 1174 (32 + x + 1),
1039 (32 + y + 1)); 1175 (32 + y + 1));
1040#endif
1041} 1176}
1042 1177
1043#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
1044void 1179void
1045rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
1056{ 1191{
1057 SET_R (this); 1192 SET_R (this);
1058 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
1059 1194
1060#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
1061 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1062 { 1197 {
1063 if (hidden_cursor) 1198 if (hidden_cursor)
1064 { 1199 {
1065 hidden_cursor = 0; 1200 hidden_cursor = 0;
1066 want_refresh = 1; 1201 want_refresh = 1;
… …
1069 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1070 } 1205 }
1071#endif 1206#endif
1072 1207
1073#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
1074 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1075 { 1210 {
1076 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
1077 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
1078 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
1079 if (hidden_pointer) 1214 if (hidden_pointer)
… …
1082 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
1083 pointer_blank (); 1218 pointer_blank ();
1084 } 1219 }
1085#endif 1220#endif
1086 1221
1087#ifdef USE_XIM
1088 if (XFilterEvent (&ev, None))
1089 return;
1090#endif
1091
1092 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
1093 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
1094 unsigned int unused_mask; 1224 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 1225
1145 switch (ev.type) 1226 switch (ev.type)
1146 { 1227 {
1147 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1148 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1233
1234 break;
1235
1236 case KeyRelease:
1237 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
1149 break; 1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
1150 1297
1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1152 case KeyRelease:
1153 {
1154 if (! (ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R)
1155 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
1156 else 1303#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; 1304 break;
1165 } 1305 }
1166#endif
1167 1306
1168 case ButtonPress: 1307 case ButtonPress:
1169 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1170 break; 1309 break;
1171 1310
… …
1183 && (ev.xclient.data.l[0] == DndFile 1322 && (ev.xclient.data.l[0] == DndFile
1184 || ev.xclient.data.l[0] == DndDir 1323 || ev.xclient.data.l[0] == DndDir
1185 || ev.xclient.data.l[0] == DndLink)) 1324 || ev.xclient.data.l[0] == DndLink))
1186 { 1325 {
1187 /* Get Dnd data */ 1326 /* Get Dnd data */
1188 Atom ActualType; 1327 Atom ActualType;
1189 int ActualFormat; 1328 int ActualFormat;
1190 unsigned char *data; 1329 unsigned char *data;
1191 unsigned long Size, RemainingBytes; 1330 unsigned long Size, RemainingBytes;
1192 1331
1193 XGetWindowProperty (display->display, display->root, 1332 XGetWindowProperty (display->display, display->root,
1194 xa[XA_DNDSELECTION], 1333 xa[XA_DNDSELECTION],
1195 0L, 1000000L, 1334 0L, 1000000L,
1196 False, AnyPropertyType, 1335 False, AnyPropertyType,
1197 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1198 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1199 &data); 1338 &data);
1200 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1201 XA_CUT_BUFFER0, XA_STRING, 1340 XFree (data);
1202 8, PropModeReplace,
1203 data, STRLEN (data));
1204 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, True);
1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1206 } 1343 }
1207#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1208 break; 1345 break;
1209 1346
1210 case MappingNotify: 1347 case MappingNotify:
1211 XRefreshKeyboardMapping (& (ev.xmapping)); 1348 XRefreshKeyboardMapping (&ev.xmapping);
1212 break; 1349 break;
1213 1350
1214 /* 1351 /*
1215 * XXX: this is not the _current_ arrangement 1352 * XXX: this is not the _current_ arrangement
1216 * Here's my conclusion: 1353 * Here's my conclusion:
… …
1241 { 1378 {
1242 TermWin.focus = 1; 1379 TermWin.focus = 1;
1243 want_refresh = 1; 1380 want_refresh = 1;
1244#ifdef USE_XIM 1381#ifdef USE_XIM
1245 if (Input_Context != NULL) 1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1246 XSetICFocus (Input_Context); 1385 XSetICFocus (Input_Context);
1386 }
1247#endif 1387#endif
1248#ifdef CURSOR_BLINK 1388#ifdef CURSOR_BLINK
1249 if (Options & Opt_cursorBlink) 1389 if (options & Opt_cursorBlink)
1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391#endif
1392#ifdef OFF_FOCUS_FADING
1393 if (rs[Rs_fade])
1394 {
1395 pix_colors = pix_colors_focused;
1396 scr_recolour ();
1397 }
1251#endif 1398#endif
1252 1399
1253 } 1400 }
1254 break; 1401 break;
1255 1402
1256 case FocusOut: 1403 case FocusOut:
1257 if (TermWin.focus) 1404 if (TermWin.focus)
1258 { 1405 {
1259 TermWin.focus = 0; 1406 TermWin.focus = 0;
1260 want_refresh = 1; 1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1261#ifdef USE_XIM 1415#ifdef USE_XIM
1262 if (Input_Context != NULL) 1416 if (Input_Context != NULL)
1263 XUnsetICFocus (Input_Context); 1417 XUnsetICFocus (Input_Context);
1264#endif 1418#endif
1265#ifdef CURSOR_BLINK 1419#ifdef CURSOR_BLINK
1266 if (Options & Opt_cursorBlink) 1420 if (options & Opt_cursorBlink)
1267 cursor_blink_ev.stop (); 1421 cursor_blink_ev.stop ();
1268 hidden_cursor = 0; 1422 hidden_cursor = 0;
1269#endif 1423#endif
1270 1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1271 } 1431 }
1272 break; 1432 break;
1273 1433
1274 case ConfigureNotify: 1434 case ConfigureNotify:
1275 if (ev.xconfigure.window == TermWin.parent[0]) 1435 if (ev.xconfigure.window == TermWin.parent[0])
… …
1284 } 1444 }
1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1286 1446
1287 if (szHint.width != width || szHint.height != height) 1447 if (szHint.width != width || szHint.height != height)
1288 { 1448 {
1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1449 seen_resize = 1;
1290 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1291 } 1451 }
1292#ifdef DEBUG_SIZE 1452
1293 else
1294 {
1295 D_SIZE ((stderr, "Size: Not resizing"));
1296 }
1297#endif
1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1299 if (Options & Opt_transparent) 1454 if (options & Opt_transparent)
1300 {
1301 check_our_parents (); 1455 check_our_parents ();
1302 if (am_transparent)
1303 want_full_refresh = 1;
1304 }
1305#endif 1456#endif
1306
1307 } 1457 }
1308 break; 1458 break;
1309 1459
1460 case PropertyNotify:
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break;
1466
1310 case SelectionClear: 1467 case SelectionClear:
1311 display->set_selection_owner (0); 1468 selection_clear ();
1312 break; 1469 break;
1313 1470
1314 case SelectionNotify: 1471 case SelectionNotify:
1315 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1316 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor,
… …
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) 1673 if (xa[XA_XROOTPMAPID] == 0)
1512 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1513 1675
1514 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1515 return; 1677 return;
1516 }
1517 1678
1518 /* FALLTHROUGH */ 1679 /* FALLTHROUGH */
1519 case ReparentNotify: 1680 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ()) 1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1521 if (am_transparent)
1522 want_full_refresh = 1; 1682 want_refresh = want_full_refresh = 1;
1523 break; 1683 break;
1524#endif
1525 } 1684 }
1526} 1685}
1686#endif
1527 1687
1528void 1688void
1529rxvt_term::button_press (XButtonEvent &ev) 1689rxvt_term::button_press (XButtonEvent &ev)
1530{ 1690{
1531 int reportmode = 0, clickintime; 1691 int reportmode = 0, clickintime;
1532 1692
1533 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1534 if (!bypass_keystate) 1694 if (!bypass_keystate)
1535 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1695 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696
1536 /* 1697 /*
1537 * VT window processing of button press 1698 * VT window processing of button press
1538 */ 1699 */
1539 if (ev.window == TermWin.vt) 1700 if (ev.window == TermWin.vt)
1540 { 1701 {
1702#if ISO_14755
1703 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 {
1706 iso14755_54 (ev.x, ev.y);
1707 return;
1708 }
1709#endif
1710
1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1711 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1712
1542 if (reportmode) 1713 if (reportmode)
1543 { 1714 {
1544 /* mouse report from vt window */ 1715 /* mouse report from vt window */
1545 /* save the xbutton state (for ButtonRelease) */ 1716 /* save the xbutton state (for ButtonRelease) */
1546 MEvent.state = ev.state; 1717 MEvent.state = ev.state;
… …
1575 } 1746 }
1576 else 1747 else
1577 { 1748 {
1578 if (ev.button != MEvent.button) 1749 if (ev.button != MEvent.button)
1579 MEvent.clicks = 0; 1750 MEvent.clicks = 0;
1751
1580 switch (ev.button) 1752 switch (ev.button)
1581 { 1753 {
1582 case Button1: 1754 case Button1:
1755 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */
1757#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask);
1759#else
1760 selection.rect = false;
1761#endif
1762
1583 /* allow shift+left click to extend selection */ 1763 /* allow shift+left click to extend selection */
1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1585 { 1765 {
1586 if (MEvent.button == Button1 && clickintime) 1766 if (MEvent.button == Button1 && clickintime)
1587 selection_rotate (ev.x, ev.y); 1767 selection_rotate (ev.x, ev.y);
1588 else 1768 else
1589 selection_extend (ev.x, ev.y, 1); 1769 selection_extend (ev.x, ev.y, 1);
… …
1604 case Button3: 1784 case Button3:
1605 if (MEvent.button == Button3 && clickintime) 1785 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y); 1786 selection_rotate (ev.x, ev.y);
1607 else 1787 else
1608 selection_extend (ev.x, ev.y, 1); 1788 selection_extend (ev.x, ev.y, 1);
1789
1609 MEvent.button = Button3; 1790 MEvent.button = Button3;
1610 break; 1791 break;
1611 } 1792 }
1612 } 1793 }
1794
1613 MEvent.time = ev.time; 1795 MEvent.time = ev.time;
1614 return; 1796 return;
1615 } 1797 }
1616 1798
1617 /* 1799 /*
… …
1683 upordown = 1; /* down */ 1865 upordown = 1; /* down */
1684 } 1866 }
1685 if (upordown) 1867 if (upordown)
1686 { 1868 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1869#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1870 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1689#endif 1871#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1)) 1872 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 { 1873 {
1692 if (upordown < 0) 1874 if (upordown < 0)
1693 scrollBar.setUp (); 1875 scrollBar.setUp ();
… …
1709 break; 1891 break;
1710 case R_SB_ALIGN_BOTTOM: 1892 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top; 1893 csrO = scrollBar.bot - scrollBar.top;
1712 break; 1894 break;
1713 } 1895 }
1896
1714 if (scrollBar.style == R_SB_XTERM 1897 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y) 1898 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y)) 1899 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO, 1900 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1718 scrollbar_size ()); 1901
1719 scrollBar.setMotion (); 1902 scrollBar.setMotion ();
1720 break; 1903 break;
1721 1904
1722 case Button1: 1905 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1906 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1747 scr_page ((ev.button == Button1 ? DN : UP), 1930 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow 1931 (TermWin.nrow
1749 * scrollbar_position (ev.y) 1932 * scrollbar_position (ev.y)
1750 / scrollbar_size ())); 1933 / scrollbar_size ()));
1751 } 1934 }
1935
1752 break; 1936 break;
1753 } 1937 }
1754 } 1938 }
1755 return; 1939 return;
1756 } 1940 }
… …
1768{ 1952{
1769 int reportmode = 0; 1953 int reportmode = 0;
1770 1954
1771 csrO = 0; /* reset csr Offset */ 1955 csrO = 0; /* reset csr Offset */
1772 if (!bypass_keystate) 1956 if (!bypass_keystate)
1773 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1957 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1958
1775 if (scrollbar_isUpDn ()) 1959 if (scrollbar_isUpDn ())
1776 { 1960 {
1777 scrollBar.setIdle (); 1961 scrollBar.setIdle ();
1778 scrollbar_show (0); 1962 scrollbar_show (0);
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 refresh_type &= ~SMOOTH_REFRESH; 1964 refresh_type &= ~SMOOTH_REFRESH;
1781#endif 1965#endif
1782
1783 } 1966 }
1967
1784#ifdef SELECTION_SCROLLING 1968#ifdef SELECTION_SCROLLING
1785 pending_scroll_selection=0; 1969 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop();
1786#endif 1971#endif
1972
1787 if (ev.window == TermWin.vt) 1973 if (ev.window == TermWin.vt)
1788 { 1974 {
1975#if ISO_14755
1976 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return;
1979#endif
1789 if (reportmode) 1980 if (reportmode)
1790 { 1981 {
1791 /* mouse report from vt window */ 1982 /* mouse report from vt window */
1792 /* don't report release of wheel "buttons" */ 1983 /* don't report release of wheel "buttons" */
1793 if (ev.button >= 4) 1984 if (ev.button >= 4)
… …
1807 MEvent.button = AnyButton; 1998 MEvent.button = AnyButton;
1808 mouse_report (ev); 1999 mouse_report (ev);
1809#endif /* MOUSE_REPORT_DOUBLECLICK */ 2000#endif /* MOUSE_REPORT_DOUBLECLICK */
1810 return; 2001 return;
1811 } 2002 }
2003
1812 /* 2004 /*
1813 * dumb hack to compensate for the failure of click-and-drag 2005 * dumb hack to compensate for the failure of click-and-drag
1814 * when overriding mouse reporting 2006 * when overriding mouse reporting
1815 */ 2007 */
1816 if (PrivateModes & PrivMode_mouse_report 2008 if (priv_modes & PrivMode_mouse_report
1817 && bypass_keystate 2009 && bypass_keystate
1818 && ev.button == Button1 && MEvent.clicks <= 1) 2010 && ev.button == Button1 && MEvent.clicks <= 1)
1819 selection_extend (ev.x, ev.y, 0); 2011 selection_extend (ev.x, ev.y, 0);
1820 2012
1821 switch (ev.button) 2013 switch (ev.button)
… …
1832 case Button5: 2024 case Button5:
1833 { 2025 {
1834 int i; 2026 int i;
1835 page_dirn v; 2027 page_dirn v;
1836 2028
1837 v = (ev.button == Button4) ? UP : DN; 2029 v = ev.button == Button4 ? UP : DN;
2030
1838 if (ev.state & ShiftMask) 2031 if (ev.state & ShiftMask)
1839 i = 1; 2032 i = 1;
1840 else if ((Options & Opt_mouseWheelScrollPage)) 2033 else if (options & Opt_mouseWheelScrollPage)
1841 i = TermWin.nrow - 1; 2034 i = TermWin.nrow - 1;
1842 else 2035 else
1843 i = 5; 2036 i = 5;
2037
1844# ifdef MOUSE_SLIP_WHEELING 2038# ifdef MOUSE_SLIP_WHEELING
1845 if (ev.state & ControlMask) 2039 if (ev.state & ControlMask)
1846 { 2040 {
1847 mouse_slip_wheel_speed += (v ? -1 : 1); 2041 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2044
2045 if (slip_wheel_ev.at < NOW)
1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047
2048 slip_wheel_ev.start ();
1849 } 2049 }
2050 else
2051 {
1850# endif 2052# endif
1851# ifdef JUMP_MOUSE_WHEEL 2053# 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); 2054 scr_page (v, i);
1859 scr_refresh (SMOOTH_REFRESH); 2055 scr_refresh (SMOOTH_REFRESH);
1860 scrollbar_show (1); 2056 scrollbar_show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING
1861 } 2066 }
1862# endif 2067#endif
1863
1864 } 2068 }
1865 break; 2069 break;
1866#endif 2070#endif
1867
1868 } 2071 }
1869 } 2072 }
1870#ifdef MENUBAR 2073#ifdef MENUBAR
1871 else if (isMenuBarWindow (ev.window)) 2074 else if (isMenuBarWindow (ev.window))
1872 menubar_control (ev); 2075 menubar_control (ev);
1873#endif 2076#endif
1874} 2077}
1875 2078
1876
1877#ifdef TRANSPARENT 2079#ifdef TRANSPARENT
2080#if TINTING
2081/* taken from aterm-0.4.2 */
2082
2083typedef uint32_t RUINT32T;
2084
2085void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2086{
2087 int sh_r, sh_g, sh_b;
2088 RUINT32T mask_r, mask_g, mask_b;
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i;
2093
2094 Visual* visual = display->visual;
2095
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097
2098 /* for convenience */
2099 mask_r = visual->red_mask;
2100 mask_g = visual->green_mask;
2101 mask_b = visual->blue_mask;
2102
2103 /* boring lookup table pre-initialization */
2104 switch (srcImage->bits_per_pixel) {
2105 case 15:
2106 if ((mask_r != 0x7c00) ||
2107 (mask_g != 0x03e0) ||
2108 (mask_b != 0x001f))
2109 return;
2110 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2111 lookup_r = lookup;
2112 lookup_g = lookup+32;
2113 lookup_b = lookup+32+32;
2114 sh_r = 10;
2115 sh_g = 5;
2116 sh_b = 0;
2117 break;
2118 case 16:
2119 if ((mask_r != 0xf800) ||
2120 (mask_g != 0x07e0) ||
2121 (mask_b != 0x001f))
2122 return;
2123 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2124 lookup_r = lookup;
2125 lookup_g = lookup+32;
2126 lookup_b = lookup+32+64;
2127 sh_r = 11;
2128 sh_g = 5;
2129 sh_b = 0;
2130 break;
2131 case 24:
2132 if ((mask_r != 0xff0000) ||
2133 (mask_g != 0x00ff00) ||
2134 (mask_b != 0x0000ff))
2135 return;
2136 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2137 lookup_r = lookup;
2138 lookup_g = lookup+256;
2139 lookup_b = lookup+256+256;
2140 sh_r = 16;
2141 sh_g = 8;
2142 sh_b = 0;
2143 break;
2144 case 32:
2145 if ((mask_r != 0xff0000) ||
2146 (mask_g != 0x00ff00) ||
2147 (mask_b != 0x0000ff))
2148 return;
2149 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2150 lookup_r = lookup;
2151 lookup_g = lookup+256;
2152 lookup_b = lookup+256+256;
2153 sh_r = 16;
2154 sh_g = 8;
2155 sh_b = 0;
2156 break;
2157 default:
2158 return; /* we do not support this color depth */
2159 }
2160
2161 /* prepare limits for color transformation (each channel is handled separately) */
2162 if (shade < 0) {
2163 shade = -shade;
2164 if (shade < 0) shade = 0;
2165 if (shade > 100) shade = 100;
2166
2167 lower_lim_r = 65535-rm;
2168 lower_lim_g = 65535-gm;
2169 lower_lim_b = 65535-bm;
2170
2171 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2172 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2173 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2174
2175 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2176 } else {
2177 if (shade < 0) shade = 0;
2178 if (shade > 100) shade = 100;
2179
2180 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2181
2182 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2183 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2184 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2185 }
2186
2187 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2188 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2189 {
2190 unsigned int tmp;
2191
2192 tmp = lower_lim_r;
2193 lower_lim_r = lower_lim_b;
2194 lower_lim_b = tmp;
2195
2196 tmp = upper_lim_r;
2197 upper_lim_r = upper_lim_b;
2198 upper_lim_b = tmp;
2199 }
2200
2201 /* fill our lookup tables */
2202 for (i = 0; i <= mask_r>>sh_r; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2206 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2207 lookup_r[i] = (tmp/65535)<<sh_r;
2208 }
2209 for (i = 0; i <= mask_g>>sh_g; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2213 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2214 lookup_g[i] = (tmp/65535)<<sh_g;
2215 }
2216 for (i = 0; i <= mask_b>>sh_b; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2220 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2221 lookup_b[i] = (tmp/65535)<<sh_b;
2222 }
2223
2224 /* apply table to input image (replacing colors by newly calculated ones) */
2225 switch (srcImage->bits_per_pixel)
2226 {
2227 case 15:
2228 {
2229 unsigned short *p1, *pf, *p, *pl;
2230 p1 = (unsigned short *) srcImage->data;
2231 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2232 while (p1 < pf)
2233 {
2234 p = p1;
2235 pl = p1 + srcImage->width;
2236 for (; p < pl; p++)
2237 {
2238 *p = lookup_r[(*p & 0x7c00)>>10] |
2239 lookup_g[(*p & 0x03e0)>> 5] |
2240 lookup_b[(*p & 0x001f)];
2241 }
2242 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2243 }
2244 break;
2245 }
2246 case 16:
2247 {
2248 unsigned short *p1, *pf, *p, *pl;
2249 p1 = (unsigned short *) srcImage->data;
2250 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2251 while (p1 < pf)
2252 {
2253 p = p1;
2254 pl = p1 + srcImage->width;
2255 for (; p < pl; p++)
2256 {
2257 *p = lookup_r[(*p & 0xf800)>>11] |
2258 lookup_g[(*p & 0x07e0)>> 5] |
2259 lookup_b[(*p & 0x001f)];
2260 }
2261 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2262 }
2263 break;
2264 }
2265 case 24:
2266 {
2267 unsigned char *p1, *pf, *p, *pl;
2268 p1 = (unsigned char *) srcImage->data;
2269 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2270 while (p1 < pf)
2271 {
2272 p = p1;
2273 pl = p1 + srcImage->width * 3;
2274 for (; p < pl; p += 3)
2275 {
2276 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2277 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2278 p[2] = lookup_r[(p[2] & 0x0000ff)];
2279 }
2280 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2281 }
2282 break;
2283 }
2284 case 32:
2285 {
2286 RUINT32T *p1, *pf, *p, *pl;
2287 p1 = (RUINT32T *) srcImage->data;
2288 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2289
2290 while (p1 < pf)
2291 {
2292 p = p1;
2293 pl = p1 + srcImage->width;
2294 for (; p < pl; p++)
2295 {
2296 *p = lookup_r[(*p & 0xff0000)>>16] |
2297 lookup_g[(*p & 0x00ff00)>> 8] |
2298 lookup_b[(*p & 0x0000ff)] |
2299 (*p & ~0xffffff);
2300 }
2301 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2302 }
2303 break;
2304 }
2305 }
2306
2307 free (lookup);
2308}
2309#endif
2310
1878/* 2311/*
1879 * Check our parents are still who we think they are. 2312 * Check our parents are still who we think they are.
1880 * Do transparency updates if required 2313 * Do transparency updates if required
1881 */ 2314 */
1882int 2315int
1883rxvt_term::check_our_parents () 2316rxvt_term::check_our_parents ()
1884{ 2317{
1885 int i, pchanged, aformat, have_pixmap, rootdepth; 2318 int i, pchanged, aformat, have_pixmap, rootdepth;
1886 unsigned long nitems, bytes_after; 2319 unsigned long nitems, bytes_after;
1887 Atom atype; 2320 Atom atype;
1888 unsigned char *prop = NULL; 2321 unsigned char *prop = NULL;
1889 Window root, oldp, *list; 2322 Window root, oldp, *list;
1890 Pixmap rootpixmap = None; 2323 Pixmap rootpixmap = None;
1891 XWindowAttributes wattr, wrootattr; 2324 XWindowAttributes wattr, wrootattr;
1892 2325
1893 pchanged = 0; 2326 pchanged = 0;
1894 2327
1895 if (! (Options & Opt_transparent)) 2328 if (!(options & Opt_transparent))
1896 return pchanged; /* Don't try any more */ 2329 return pchanged; /* Don't try any more */
1897 2330
1898 XGetWindowAttributes (display->display, display->root, &wrootattr); 2331 XGetWindowAttributes (display->display, display->root, &wrootattr);
1899 rootdepth = wrootattr.depth; 2332 rootdepth = wrootattr.depth;
1900 2333
1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2335
1902 if (rootdepth != wattr.depth) 2336 if (rootdepth != wattr.depth)
1903 { 2337 {
1904 if (am_transparent) 2338 if (am_transparent)
1905 { 2339 {
1906 pchanged = 1; 2340 pchanged = 1;
1907 XSetWindowBackground (display->display, TermWin.vt, 2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1908 PixColors[Color_bg]);
1909 am_transparent = am_pixmap_trans = 0; 2342 am_transparent = am_pixmap_trans = 0;
1910 } 2343 }
2344
1911 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
1912 } 2346 }
1913 2347
1914 /* Get all X ops out of the queue so that our information is up-to-date. */ 2348 /* Get all X ops out of the queue so that our information is up-to-date. */
1915 XSync (display->display, False); 2349 XSync (display->display, False);
… …
1917 /* 2351 /*
1918 * Make the frame window set by the window manager have 2352 * Make the frame window set by the window manager have
1919 * the root background. Some window managers put multiple nested frame 2353 * the root background. Some window managers put multiple nested frame
1920 * windows for each client, so we have to take care about that. 2354 * windows for each client, so we have to take care about that.
1921 */ 2355 */
1922 i = (xa[XA_XROOTPMAPID] != 0 2356 i = (xa[XA_XROOTPMAPID]
1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1925 &nitems, &bytes_after, &prop) == Success)); 2359 &nitems, &bytes_after, &prop) == Success);
2360
1926 if (!i || prop == NULL) 2361 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success);
2366
2367 if (!i || prop == NULL
2368#if TINTING
2369 || !rs[Rs_color + Color_tint]
2370#endif
2371 )
1927 have_pixmap = 0; 2372 have_pixmap = 0;
1928 else 2373 else
1929 { 2374 {
1930 have_pixmap = 1; 2375 have_pixmap = 1;
1931 rootpixmap = * ((Pixmap *)prop); 2376 rootpixmap = *(Pixmap *)prop;
1932 XFree (prop); 2377 XFree (prop);
1933 } 2378 }
2379
1934 if (have_pixmap) 2380 if (have_pixmap)
1935 { 2381 {
1936 /* 2382 /*
1937 * Copy display->root pixmap transparency 2383 * Copy display->root pixmap transparency
1938 */ 2384 */
1939 int sx, sy, nx, ny; 2385 int sx, sy, nx, ny;
1940 unsigned int nw, nh; 2386 unsigned int nw, nh;
1941 Window cr; 2387 Window cr;
1942 XImage *image; 2388 XImage *image;
1943 GC gc; 2389 GC gc;
1944 XGCValues gcvalue; 2390 XGCValues gcvalue;
1945 2391
1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1947 0, 0, &sx, &sy, &cr); 2393 0, 0, &sx, &sy, &cr);
1948 nw = (unsigned int)szHint.width; 2394 nw = (unsigned int)szHint.width;
1949 nh = (unsigned int)szHint.height; 2395 nh = (unsigned int)szHint.height;
1950 nx = ny = 0; 2396 nx = ny = 0;
2397
1951 if (sx < 0) 2398 if (sx < 0)
1952 { 2399 {
1953 nw += sx; 2400 nw += sx;
1954 nx = -sx; 2401 nx = -sx;
1955 sx = 0; 2402 sx = 0;
1956 } 2403 }
2404
1957 if (sy < 0) 2405 if (sy < 0)
1958 { 2406 {
1959 nh += sy; 2407 nh += sy;
1960 ny = -sy; 2408 ny = -sy;
1961 sy = 0; 2409 sy = 0;
1962 } 2410 }
2411
1963 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1964 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
1965 allowedxerror = -1; 2416 allowedxerror = -1;
1966 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1967 ZPixmap); 2418
1968 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1969 /* XXX: may need a delay here? */ 2420 /* XXX: may need a delay here? */
1970 allowedxerror = 0; 2421 allowedxerror = 0;
2422
1971 if (image == NULL) 2423 if (image == NULL)
1972 { 2424 {
1973 if (am_transparent && am_pixmap_trans) 2425 if (am_transparent && am_pixmap_trans)
1974 { 2426 {
1975 pchanged = 1; 2427 pchanged = 1;
… …
1977 { 2429 {
1978 XFreePixmap (display->display, TermWin.pixmap); 2430 XFreePixmap (display->display, TermWin.pixmap);
1979 TermWin.pixmap = None; 2431 TermWin.pixmap = None;
1980 } 2432 }
1981 } 2433 }
2434
1982 am_pixmap_trans = 0; 2435 am_pixmap_trans = 0;
1983 } 2436 }
1984 else 2437 else
1985 { 2438 {
1986 if (TermWin.pixmap != None) 2439 if (TermWin.pixmap != None)
1987 XFreePixmap (display->display, TermWin.pixmap); 2440 XFreePixmap (display->display, TermWin.pixmap);
2441
2442#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint))
2444 {
2445 unsigned short rm, gm, bm;
2446 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2447
2448 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2449
2450 ShadeXImage (display, image, shade, rm, gm, bm);
2451 }
2452#endif
2453
1988 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1989 (unsigned int)szHint.width,
1990 (unsigned int)szHint.height, 2455 szHint.width, szHint.height, image->depth);
1991 (unsigned int)image->depth);
1992 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1993 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1994 nx, ny, (unsigned int)image->width,
1995 (unsigned int)image->height); 2458 nx, ny, image->width, image->height);
1996 XFreeGC (display->display, gc); 2459 XFreeGC (display->display, gc);
1997 XDestroyImage (image); 2460 XDestroyImage (image);
1998 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1999 TermWin.pixmap); 2462 XClearWindow (display->display, TermWin.parent[0]);
2463
2000 if (!am_transparent || !am_pixmap_trans) 2464 if (!am_transparent || !am_pixmap_trans)
2001 pchanged = 1; 2465 pchanged = 1;
2466
2002 am_transparent = am_pixmap_trans = 1; 2467 am_transparent = am_pixmap_trans = 1;
2003 } 2468 }
2004 } 2469 }
2470
2005 if (!am_pixmap_trans) 2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2006 { 2474 {
2007 unsigned int n; 2475 unsigned int n;
2008 /* 2476 /*
2009 * InheritPixmap transparency 2477 * InheritPixmap transparency
2010 */ 2478 */
2011 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2012 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2013 i++)
2014 { 2480 {
2015 oldp = TermWin.parent[i]; 2481 oldp = TermWin.parent[i];
2016 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2482 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2017 &TermWin.parent[i], &list, &n); 2483 &TermWin.parent[i], &list, &n);
2018 XFree (list); 2484 XFree (list);
2019 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2485
2020 if (TermWin.parent[i] == display->root) 2486 if (TermWin.parent[i] == display->root)
2021 { 2487 {
2022 if (oldp != None) 2488 if (oldp != None)
2023 pchanged = 1; 2489 pchanged = 1;
2490
2024 break; 2491 break;
2025 } 2492 }
2493
2026 if (oldp != TermWin.parent[i]) 2494 if (oldp != TermWin.parent[i])
2027 pchanged = 1; 2495 pchanged = 1;
2028 } 2496 }
2497
2029 n = 0; 2498 n = 0;
2499
2030 if (pchanged) 2500 if (pchanged)
2031 { 2501 {
2032 for (; n < (unsigned int)i; n++) 2502 for (; n < (unsigned int)i; n++)
2033 { 2503 {
2034 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2504 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) 2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2037 { 2506 {
2038 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2039 break; 2508 break;
2040 } 2509 }
2041 } 2510 }
2042 } 2511 }
2043 if (n > (int) (sizeof (TermWin.parent) 2512
2044 / sizeof (TermWin.parent[0]))) 2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2045 { 2514 {
2046 D_X ((stderr, "InheritPixmap Turning off"));
2047 XSetWindowBackground (display->display, TermWin.parent[0], 2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2048 PixColors[Color_fg]);
2049 XSetWindowBackground (display->display, TermWin.vt, 2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2050 PixColors[Color_bg]);
2051 am_transparent = 0; 2517 am_transparent = 0;
2052 /* XXX: also turn off Opt_transparent? */ 2518 /* XXX: also turn off Opt_transparent? */
2053 } 2519 }
2054 else 2520 else
2055 { 2521 {
2522#if WAIT_FOR_WM
2056 /* wait (an arbitrary period) for the WM to do its thing 2523 /* wait (an arbitrary period) for the WM to do its thing
2057 * needed for fvwm2.2.2 (and before?) */ 2524 * 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); 2525 sleep (1);
2066# endif 2526#endif
2067 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2068 for (n = 0; n < (unsigned int)i; n++) 2527 for (n = 0; n < (unsigned int)i; n++)
2528 {
2069 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2070 ParentRelative); 2530 XClearWindow (display->display, TermWin.parent[n]);
2531 }
2532
2071 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2072 ParentRelative);
2073 am_transparent = 1; 2534 am_transparent = 1;
2074 } 2535 }
2536
2075 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2076 TermWin.parent[i] = None; 2538 TermWin.parent[i] = None;
2077 } 2539 }
2540
2541 if (scrollBar.win)
2542 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle ();
2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2553 }
2554
2078 return pchanged; 2555 return pchanged;
2079} 2556}
2080#endif 2557#endif
2081 2558
2082/*}}} */ 2559/*}}} */
2560
2561bool
2562rxvt_term::cmd_parse ()
2563{
2564 bool flag = false;
2565 unicode_t ch = NOCHAR;
2566 unsigned char *seq_begin; // remember start of esc-sequence here
2567
2568 for (;;)
2569 {
2570 if (ch == NOCHAR)
2571 {
2572 seq_begin = cmdbuf_ptr;
2573 ch = next_char ();
2574 }
2575
2576 if (ch == NOCHAR) // TODO: improve
2577 break;
2578
2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2580 {
2581 if (!seen_input)
2582 {
2583 seen_input = 1;
2584 // many badly-written programs (e.g. jed) contain a race condition:
2585 // they first read the screensize and then install a SIGWINCH handler.
2586 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized.
2591 if (seen_resize)
2592 kill (-cmd_pid, SIGWINCH);
2593 }
2594
2595 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ];
2597 bool refreshnow = false;
2598 int nlines = 0;
2599 unicode_t *str = buf;
2600
2601 for (;;)
2602 {
2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2604 break;
2605
2606 *str++ = ch;
2607
2608 if (ch == C0_LF)
2609 {
2610 nlines++;
2611 refresh_count++;
2612
2613 if (!(options & Opt_jumpScroll)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2615 {
2616 refreshnow = true;
2617 ch = NOCHAR;
2618 break;
2619 }
2620
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2622 if (nlines >= TermWin.nrow - 1)
2623 {
2624 scr_add_lines (buf, nlines, str - buf);
2625 nlines = 0;
2626 str = buf;
2627 }
2628 }
2629
2630 if (str >= buf + UBUFSIZ)
2631 {
2632 ch = NOCHAR;
2633 break;
2634 }
2635
2636 seq_begin = cmdbuf_ptr;
2637 ch = next_char ();
2638 }
2639
2640 scr_add_lines (buf, nlines, str - buf);
2641
2642 /*
2643 * If there have been a lot of new lines, then update the screen
2644 * What the heck I'll cheat and only refresh less than every page-full.
2645 * the number of pages between refreshes is refresh_limit, which
2646 * is incremented here because we must be doing flat-out scrolling.
2647 */
2648 if (refreshnow)
2649 {
2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2651 refresh_limit++;
2652 else
2653 {
2654 flag = true;
2655 scr_refresh (refresh_type);
2656 }
2657 }
2658
2659 }
2660 else
2661 {
2662 try
2663 {
2664 process_nonprinting (ch);
2665 }
2666 catch (const class out_of_input &o)
2667 {
2668 // we ran out of input, retry later
2669 cmdbuf_ptr = seq_begin;
2670 break;
2671 }
2672
2673 ch = NOCHAR;
2674 }
2675 }
2676
2677 return flag;
2678}
2679
2680// read the next octet
2681unicode_t
2682rxvt_term::next_octet ()
2683{
2684 return cmdbuf_ptr < cmdbuf_endp
2685 ? *cmdbuf_ptr++
2686 : NOCHAR;
2687}
2688
2689// read the next character
2690unicode_t
2691rxvt_term::next_char ()
2692{
2693 while (cmdbuf_ptr < cmdbuf_endp)
2694 {
2695 // assume 7-bit to be ascii ALWAYS
2696 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2697 return *cmdbuf_ptr++;
2698
2699 wchar_t wc;
2700 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2701
2702 if (len == (size_t)-2)
2703 {
2704 // the mbstate stores incomplete sequences. didn't know this :/
2705 cmdbuf_ptr = cmdbuf_endp;
2706 break;
2707 }
2708
2709 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711
2712 // assume wchar == unicode
2713 cmdbuf_ptr += len;
2714 return wc;
2715 }
2716
2717 return NOCHAR;
2718}
2719
2720/* rxvt_cmd_getc () - Return next input character */
2721/*
2722 * Return the next input character after first passing any keyboard input
2723 * to the command.
2724 */
2725unicode_t
2726rxvt_term::cmd_getc ()
2727{
2728 unicode_t c = next_char ();
2729
2730 if (c == NOCHAR)
2731 throw out_of_input;
2732
2733 return c;
2734}
2735
2736unicode_t
2737rxvt_term::cmd_get8 ()
2738{
2739 unicode_t c = next_octet ();
2740
2741 if (c == NOCHAR)
2742 throw out_of_input;
2743
2744 return c;
2745}
2083 2746
2084/*{{{ print pipe */ 2747/*{{{ print pipe */
2085/*----------------------------------------------------------------------*/ 2748/*----------------------------------------------------------------------*/
2086#ifdef PRINTPIPE 2749#ifdef PRINTPIPE
2087FILE * 2750FILE *
2088rxvt_term::popen_printer () 2751rxvt_term::popen_printer ()
2089{ 2752{
2090 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2753 FILE *stream = popen (rs[Rs_print_pipe], "w");
2091 2754
2092 if (stream == NULL) 2755 if (stream == NULL)
2093 rxvt_print_error ("can't open printer pipe"); 2756 rxvt_warn ("can't open printer pipe, not printing.\n");
2757
2094 return stream; 2758 return stream;
2095} 2759}
2096 2760
2097int 2761int
2098rxvt_term::pclose_printer (FILE *stream) 2762rxvt_term::pclose_printer (FILE *stream)
2099{ 2763{
2100 fflush (stream); 2764 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); 2765 return pclose (stream);
2107# endif
2108} 2766}
2109 2767
2110/* 2768/*
2111 * simulate attached vt100 printer 2769 * simulate attached vt100 printer
2112 */ 2770 */
2113void 2771void
2114rxvt_term::process_print_pipe () 2772rxvt_term::process_print_pipe ()
2115{ 2773{
2116 int done; 2774 int done;
2117 FILE *fd; 2775 FILE *fd;
2118 2776
2119 if ((fd = popen_printer ()) == NULL) 2777 if ((fd = popen_printer ()) == NULL)
2120 return; 2778 return;
2121 2779
2122 /* 2780 /*
2123 * Send all input to the printer until either ESC[4i or ESC[?4i 2781 * Send all input to the printer until either ESC[4i or ESC[?4i
2124 * is received. 2782 * is received.
2125 */ 2783 */
2126 for (done = 0; !done;) 2784 for (done = 0; !done;)
2127 { 2785 {
2128 unsigned char buf[8]; 2786 unsigned char buf[8];
2129 unsigned char ch; 2787 unicode_t ch;
2130 unsigned int i, len; 2788 unsigned int i, len;
2131 2789
2132 if ((ch = cmd_getc ()) != C0_ESC) 2790 if ((ch = cmd_getc ()) != C0_ESC)
2133 { 2791 {
2134 if (putc (ch, fd) == EOF) 2792 if (putc (ch, fd) == EOF)
2135 break; /* done = 1 */ 2793 break; /* done = 1 */
… …
2150 { 2808 {
2151 if ((buf[len++] = cmd_getc ()) == 'i') 2809 if ((buf[len++] = cmd_getc ()) == 'i')
2152 break; /* done = 1 */ 2810 break; /* done = 1 */
2153 } 2811 }
2154 } 2812 }
2813
2155 for (i = 0; i < len; i++) 2814 for (i = 0; i < len; i++)
2156 if (putc (buf[i], fd) == EOF) 2815 if (putc (buf[i], fd) == EOF)
2157 { 2816 {
2158 done = 1; 2817 done = 1;
2159 break; 2818 break;
2160 } 2819 }
2161 } 2820 }
2162 } 2821 }
2822
2163 pclose_printer (fd); 2823 pclose_printer (fd);
2164} 2824}
2165#endif /* PRINTPIPE */ 2825#endif /* PRINTPIPE */
2166/*}}} */ 2826/*}}} */
2167 2827
2168/* *INDENT-OFF* */ 2828/* *INDENT-OFF* */
2169enum { 2829enum {
2170 C1_40 = 0x40, 2830 C1_40 = 0x40,
2171 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2831 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, 2832 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, 2833 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 2834 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2175}; 2835};
2176/* *INDENT-ON* */ 2836/* *INDENT-ON* */
2177 2837
2178/*{{{ process non-printing single characters */ 2838/*{{{ process non-printing single characters */
2179void 2839void
2180rxvt_term::process_nonprinting (unsigned char ch) 2840rxvt_term::process_nonprinting (unicode_t ch)
2181{ 2841{
2182 switch (ch) 2842 switch (ch)
2183 { 2843 {
2844 case C0_ESC:
2845 process_escape_seq ();
2846 break;
2184 case C0_ENQ: /* terminal Status */ 2847 case C0_ENQ: /* terminal Status */
2185 if (rs[Rs_answerbackstring]) 2848 if (rs[Rs_answerbackstring])
2186 tt_write (
2187 (const unsigned char *)rs[Rs_answerbackstring], 2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2188 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2189 else 2851 else
2190 tt_write ((unsigned char *)VT100_ANS, 2852 tt_write ((unsigned char *)VT100_ANS,
2191 (unsigned int)STRLEN (VT100_ANS)); 2853 (unsigned int)strlen (VT100_ANS));
2192 break; 2854 break;
2193 case C0_BEL: /* bell */ 2855 case C0_BEL: /* bell */
2194 scr_bell (); 2856 scr_bell ();
2195 break; 2857 break;
2196 case C0_BS: /* backspace */ 2858 case C0_BS: /* backspace */
… …
2211 scr_charset_choose (1); 2873 scr_charset_choose (1);
2212 break; 2874 break;
2213 case C0_SI: /* shift in - acs */ 2875 case C0_SI: /* shift in - acs */
2214 scr_charset_choose (0); 2876 scr_charset_choose (0);
2215 break; 2877 break;
2878
2879#ifdef EIGHT_BIT_CONTROLS
2880 // 8-bit controls
2881 case 0x90: /* DCS */
2882 process_dcs_seq ();
2883 break;
2884 case 0x9b: /* CSI */
2885 process_csi_seq ();
2886 break;
2887 case 0x9d: /* CSI */
2888 process_osc_seq ();
2889 break;
2890#endif
2216 } 2891 }
2217} 2892}
2218/*}}} */ 2893/*}}} */
2219 2894
2220 2895
2221/*{{{ process VT52 escape sequences */ 2896/*{{{ process VT52 escape sequences */
2222void 2897void
2223rxvt_term::process_escape_vt52 (unsigned char ch) 2898rxvt_term::process_escape_vt52 (unicode_t ch)
2224{ 2899{
2225 int row, col; 2900 int row, col;
2226 2901
2227 switch (ch) 2902 switch (ch)
2228 { 2903 {
… …
2280 2955
2281/*{{{ process escape sequences */ 2956/*{{{ process escape sequences */
2282void 2957void
2283rxvt_term::process_escape_seq () 2958rxvt_term::process_escape_seq ()
2284{ 2959{
2285 unsigned char ch = cmd_getc (); 2960 unicode_t ch = cmd_getc ();
2286 2961
2287 if (PrivateModes & PrivMode_vt52) 2962 if (priv_modes & PrivMode_vt52)
2288 { 2963 {
2289 process_escape_vt52 (ch); 2964 process_escape_vt52 (ch);
2290 return; 2965 return;
2291 } 2966 }
2292 2967
… …
2307 scr_charset_set (2, (unsigned int)cmd_getc ()); 2982 scr_charset_set (2, (unsigned int)cmd_getc ());
2308 break; 2983 break;
2309 case '+': 2984 case '+':
2310 scr_charset_set (3, (unsigned int)cmd_getc ()); 2985 scr_charset_set (3, (unsigned int)cmd_getc ());
2311 break; 2986 break;
2312#ifndef NO_FRILLS 2987#if ENABLE_FRILLS
2313 case '6': 2988 case '6':
2314 scr_backindex (); 2989 scr_backindex ();
2315 break; 2990 break;
2316#endif 2991#endif
2317 case '7': 2992 case '7':
2318 scr_cursor (SAVE); 2993 scr_cursor (SAVE);
2319 break; 2994 break;
2320 case '8': 2995 case '8':
2321 scr_cursor (RESTORE); 2996 scr_cursor (RESTORE);
2322 break; 2997 break;
2323#ifndef NO_FRILLS 2998#if ENABLE_FRILLS
2324 case '9': 2999 case '9':
2325 scr_forwardindex (); 3000 scr_forwardindex ();
2326 break; 3001 break;
2327#endif 3002#endif
2328 case '=': 3003 case '=':
… …
2338 break; 3013 break;
2339 3014
2340 /* 8.3.87: NEXT LINE */ 3015 /* 8.3.87: NEXT LINE */
2341 case C1_NEL: /* ESC E */ 3016 case C1_NEL: /* ESC E */
2342 { 3017 {
2343 uint32_t nlcr[] = { '\n', '\r' }; 3018 unicode_t nlcr[] = { C0_LF, C0_CR };
2344 scr_add_lines (nlcr, 1, 2); 3019 scr_add_lines (nlcr, 1, 2);
2345 } 3020 }
2346 break; 3021 break;
2347 3022
2348 /* kidnapped escape sequence: Should be 8.3.48 */ 3023 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2359 case C1_RI: /* ESC M */ 3034 case C1_RI: /* ESC M */
2360 scr_index (DN); 3035 scr_index (DN);
2361 break; 3036 break;
2362 3037
2363 /* 8.3.142: SINGLE-SHIFT TWO */ 3038 /* 8.3.142: SINGLE-SHIFT TWO */
2364 /*case C1_SS2: scr_single_shift (2); break; */ 3039 /*case C1_SS2: scr_single_shift (2); break; */
2365 3040
2366 /* 8.3.143: SINGLE-SHIFT THREE */ 3041 /* 8.3.143: SINGLE-SHIFT THREE */
2367 /*case C1_SS3: scr_single_shift (3); break; */ 3042 /*case C1_SS3: scr_single_shift (3); break; */
2368 3043
2369 /* 8.3.27: DEVICE CONTROL STRING */ 3044 /* 8.3.27: DEVICE CONTROL STRING */
2370 case C1_DCS: /* ESC P */ 3045 case C1_DCS: /* ESC P */
2371 process_dcs_seq (); 3046 process_dcs_seq ();
2372 break; 3047 break;
… …
2387 process_osc_seq (); 3062 process_osc_seq ();
2388 break; 3063 break;
2389 3064
2390 /* 8.3.106: RESET TO INITIAL STATE */ 3065 /* 8.3.106: RESET TO INITIAL STATE */
2391 case 'c': 3066 case 'c':
3067 mbstate.reset ();
2392 scr_poweron (); 3068 scr_poweron ();
2393 scrollbar_show (1); 3069 scrollbar_show (1);
2394 break; 3070 break;
2395 3071
2396 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3072 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2408 3084
2409/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3085/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2410/* *INDENT-OFF* */ 3086/* *INDENT-OFF* */
2411enum { 3087enum {
2412 CSI_ICH = 0x40, 3088 CSI_ICH = 0x40,
2413 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3089 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 , 3090 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, 3091 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, 3092 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, 3093 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, 3094 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, */ 3109 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, [, \, ], ^, _, */ 3110 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, */ 3111 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, */ 3112 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, */ 3113 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, {, |, }, ~, */ 3114 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2439 }; 3115 };
2440/* *INDENT-ON* */ 3116/* *INDENT-ON* */
2441 3117
2442void 3118void
2443rxvt_term::process_csi_seq () 3119rxvt_term::process_csi_seq ()
2444{ 3120{
2445 unsigned char ch, priv, i; 3121 unicode_t ch, priv, i;
2446 unsigned int nargs, p; 3122 unsigned int nargs, p;
2447 int n, ndef; 3123 int n, ndef;
2448 int arg[ESC_ARGS]; 3124 int arg[ESC_ARGS];
2449 3125
2450 for (nargs = ESC_ARGS; nargs > 0;) 3126 for (nargs = ESC_ARGS; nargs > 0;)
2451 arg[--nargs] = 0; 3127 arg[--nargs] = 0;
2452 3128
2453 priv = 0; 3129 priv = 0;
… …
2455 if (ch >= '<' && ch <= '?') 3131 if (ch >= '<' && ch <= '?')
2456 { /* '<' '=' '>' '?' */ 3132 { /* '<' '=' '>' '?' */
2457 priv = ch; 3133 priv = ch;
2458 ch = cmd_getc (); 3134 ch = cmd_getc ();
2459 } 3135 }
3136
2460 /* read any numerical arguments */ 3137 /* read any numerical arguments */
2461 for (n = -1; ch < CSI_ICH; ) 3138 for (n = -1; ch < CSI_ICH; )
2462 { 3139 {
2463 if (isdigit (ch)) 3140 if (isdigit (ch))
2464 { 3141 {
… …
2471 { 3148 {
2472 if (nargs < ESC_ARGS) 3149 if (nargs < ESC_ARGS)
2473 arg[nargs++] = n; 3150 arg[nargs++] = n;
2474 n = -1; 3151 n = -1;
2475 } 3152 }
2476 else if (ch == '\b') 3153 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); 3154 process_nonprinting (ch);
2488 } 3155
2489 ch = cmd_getc (); 3156 ch = cmd_getc ();
2490 } 3157 }
2491 3158
2492 if (ch > CSI_7F) 3159 if (ch > CSI_7F)
2493 return; 3160 return;
… …
2635 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2636 break; 3303 break;
2637 3304
2638 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2639 tt_write ((const unsigned char *)VT100_ANS, 3306 tt_write ((const unsigned char *)VT100_ANS,
2640 (unsigned int) (sizeof (VT100_ANS) - 1)); 3307 (unsigned int) (sizeof (VT100_ANS) - 1));
2641 break; 3308 break;
2642 3309
2643 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2644 process_sgr_mode (nargs, arg); 3311 process_sgr_mode (nargs, arg);
2645 break; 3312 break;
… …
2651 tt_printf ("\033[0n"); 3318 tt_printf ("\033[0n");
2652 break; 3319 break;
2653 case 6: /* CPR requested */ 3320 case 6: /* CPR requested */
2654 scr_report_position (); 3321 scr_report_position ();
2655 break; 3322 break;
2656#if defined (ENABLE_DISPLAY_ANSWER)
2657 case 7: /* unofficial extension */ 3323 case 7: /* unofficial extension */
3324 if (options & Opt_insecure)
2658 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3325 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2659 break; 3326 break;
2660#endif
2661 case 8: /* unofficial extension */ 3327 case 8: /* unofficial extension */
2662 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2663 break; 3329 break;
2664 } 3330 }
2665 break; 3331 break;
2666 3332
2667 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3333 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2700 break; 3366 break;
2701 3367
2702 case CSI_RM: /* 8.3.107: RESET MODE */ 3368 case CSI_RM: /* 8.3.107: RESET MODE */
2703 if (arg[0] == 4) 3369 if (arg[0] == 4)
2704 scr_insert_mode (0); 3370 scr_insert_mode (0);
3371 else if (arg[0] == 20)
3372 priv_modes &= ~PrivMode_LFNL;
2705 break; 3373 break;
2706 3374
2707 case CSI_SM: /* 8.3.126: SET MODE */ 3375 case CSI_SM: /* 8.3.126: SET MODE */
2708 if (arg[0] == 4) 3376 if (arg[0] == 4)
2709 scr_insert_mode (1); 3377 scr_insert_mode (1);
3378 else if (arg[0] == 20)
3379 priv_modes |= PrivMode_LFNL;
2710 break; 3380 break;
2711 3381
2712 /* 3382 /*
2713 * PRIVATE USE beyond this point. All CSI_7? sequences here 3383 * PRIVATE USE beyond this point. All CSI_7? sequences here
2714 */ 3384 */
… …
2726 break; 3396 break;
2727 case CSI_75: 3397 case CSI_75:
2728 scr_cursor (RESTORE); 3398 scr_cursor (RESTORE);
2729 break; 3399 break;
2730 3400
2731#ifndef NO_FRILLS 3401#if ENABLE_FRILLS
2732 case CSI_74: 3402 case CSI_74:
2733 process_window_ops (arg, nargs); 3403 process_window_ops (arg, nargs);
2734 break; 3404 break;
2735#endif 3405#endif
2736 3406
2737 case CSI_78: /* DECREQTPARM */ 3407 case CSI_78: /* DECREQTPARM */
2738 if (arg[0] == 0 || arg[0] == 1) 3408 if (arg[0] == 0 || arg[0] == 1)
2739 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3409 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2740 /* FALLTHROUGH */ 3410 break;
2741 3411
2742 default: 3412 default:
2743 break; 3413 break;
2744 } 3414 }
2745} 3415}
2746/*}}} */ 3416/*}}} */
2747 3417
2748#ifndef NO_FRILLS 3418#if ENABLE_FRILLS
2749/* ARGSUSED */ 3419/* ARGSUSED */
2750void 3420void
2751rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3421rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2752{ 3422{
2753 int x, y; 3423 int x, y;
2754#if 0
2755 char *s;
2756#endif
2757 XWindowAttributes wattr; 3424 XWindowAttributes wattr;
2758 Window wdummy; 3425 Window wdummy;
2759 3426
2760 if (nargs == 0) 3427 if (nargs == 0)
2761 return; 3428 return;
3429
2762 switch (args[0]) 3430 switch (args[0])
2763 { 3431 {
2764 /* 3432 /*
2765 * commands 3433 * commands
2766 */ 3434 */
2767 case 1: /* deiconify window */ 3435 case 1: /* deiconify window */
2768 XMapWindow (display->display, TermWin.parent[0]); 3436 XMapWindow (display->display, TermWin.parent[0]);
2769 break; 3437 break;
2770 case 2: /* iconify window */ 3438 case 2: /* iconify window */
2771 XIconifyWindow (display->display, TermWin.parent[0], 3439 XIconifyWindow (display->display, TermWin.parent[0],
… …
2788 break; 3456 break;
2789 case 8: /* set size (chars) */ 3457 case 8: /* set size (chars) */
2790 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2791 (unsigned int) (args[1] * TermWin.fheight)); 3459 (unsigned int) (args[1] * TermWin.fheight));
2792 break; 3460 break;
3461
3462 //case 9: NYI, TODO, restore maximized window or maximize window
2793 default: 3463 default:
2794 if (args[0] >= 24) /* set height (chars) */ 3464 if (args[0] >= 24) /* set height (chars) */
2795 set_widthheight ((unsigned int)TermWin.width, 3465 set_widthheight ((unsigned int)TermWin.width,
2796 (unsigned int) (args[1] * TermWin.fheight)); 3466 (unsigned int) (args[1] * TermWin.fheight));
2797 break; 3467 break;
3468
3469
2798 /* 3470 /*
2799 * reports - some output format copied from XTerm 3471 * reports - some output format copied from XTerm
2800 */ 3472 */
2801 case 11: /* report window state */ 3473 case 11: /* report window state */
2802 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2803 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2804 break; 3476 break;
2805 case 13: /* report window position */ 3477 case 13: /* report window position */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2808 -wattr.border_width, -wattr.border_width, 3480 -wattr.border_width, -wattr.border_width,
2809 &x, &y, &wdummy); 3481 &x, &y, &wdummy);
2810 tt_printf ("\033[3;%d;%dt", x, y); 3482 tt_printf ("\033[3;%d;%dt", x, y);
2811 break; 3483 break;
2812 case 14: /* report window size (pixels) */ 3484 case 14: /* report window size (pixels) */
2813 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2814 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2815 break; 3487 break;
2816 case 18: /* report window size (chars) */ 3488 case 18: /* report text area size (chars) */
2817 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3490 break;
2819#if 0 /* XXX: currently disabled due to security concerns */ 3491 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3493 break;
2820 case 20: /* report icon label */ 3494 case 20: /* report icon label */
3495 {
3496 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3497 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s);
3500 }
2823 break; 3501 break;
2824 case 21: /* report window title */ 3502 case 21: /* report window title */
3503 {
3504 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3505 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s);
3508 }
2827 break; 3509 break;
2828#endif
2829
2830 } 3510 }
2831} 3511}
2832#endif 3512#endif
2833 3513
2834/*----------------------------------------------------------------------*/ 3514/*----------------------------------------------------------------------*/
2835/* 3515/*
2836 * get input up until STRING TERMINATOR (or BEL) 3516 * get input up until STRING TERMINATOR (or BEL)
2837 * ends_how is terminator used. returned input must be free ()d 3517 * ends_how is terminator used. returned input must be free()'d
2838 */ 3518 */
2839unsigned char * 3519unsigned char *
2840rxvt_term::get_to_st (unsigned char *ends_how) 3520rxvt_term::get_to_st (unicode_t &ends_how)
2841{ 3521{
2842 int seen_esc = 0; /* seen escape? */ 3522 unicode_t ch;
3523 bool seen_esc = false;
2843 unsigned int n = 0; 3524 unsigned int n = 0;
2844 unsigned char *s; 3525 wchar_t string[STRING_MAX];
2845 unsigned char ch, string[STRING_MAX];
2846 3526
2847 for (; (ch = cmd_getc ());) 3527 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3528 {
2849 if (ch == C0_BEL 3529 if (seen_esc)
2850 || ch == CHAR_ST 3530 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3531 if (ch == 0x5c) /* 7bit ST */
2852 break; 3532 break;
3533 else
3534 return NULL;
3535 }
2853 if (ch == C0_ESC) 3536 else if (ch == C0_ESC)
2854 { 3537 {
2855 seen_esc = 1; 3538 seen_esc = true;
2856 continue; 3539 continue;
2857 } 3540 }
2858 else if (ch == '\t') 3541 else if (ch == C0_BEL || ch == CHAR_ST)
2859 ch = ' '; /* translate '\t' to space */ 3542 break;
2860 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3543 else if (ch < 0x20)
2861 return NULL; /* other control character - exit */ 3544 return NULL; /* other control character - exit */
3545
3546 seen_esc = false;
3547
2862 if (n < sizeof (string) - 1) 3548 if (n >= sizeof (string) - 1)
3549 // stop at some sane length
3550 return NULL;
3551
3552 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 ();
3554 else
2863 string[n++] = ch; 3555 string[n++] = ch;
2864 seen_esc = 0;
2865 } 3556 }
3557
2866 string[n++] = '\0'; 3558 string[n++] = '\0';
2867 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3559
2868 return NULL;
2869 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3560 ends_how = (ch == 0x5c ? C0_ESC : ch);
2870 STRNCPY (s, string, n); 3561
2871 return s; 3562 return (unsigned char *)rxvt_wcstombs (string);
2872} 3563}
2873 3564
2874/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
2875/* 3566/*
2876 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2877 */ 3568 */
2878void 3569void
2879rxvt_term::process_dcs_seq () 3570rxvt_term::process_dcs_seq ()
2880{ 3571{
2881 unsigned char eh, *s; 3572 unsigned char *s;
3573 unicode_t eh;
3574
2882 /* 3575 /*
2883 * Not handled yet 3576 * Not handled yet
2884 */ 3577 */
2885 s = get_to_st (&eh); 3578 s = get_to_st (eh);
2886 if (s) 3579 if (s)
2887 free (s); 3580 free (s);
3581
2888 return; 3582 return;
2889} 3583}
2890 3584
2891/*----------------------------------------------------------------------*/ 3585/*----------------------------------------------------------------------*/
2892/* 3586/*
2893 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3587 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2894 */ 3588 */
2895void 3589void
2896rxvt_term::process_osc_seq () 3590rxvt_term::process_osc_seq ()
2897{ 3591{
2898 unsigned char ch, eh, *s; 3592 unicode_t ch, eh;
2899 int arg; 3593 int arg;
2900 3594
2901 ch = cmd_getc (); 3595 ch = cmd_getc ();
2902 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3596 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2903 arg = arg * 10 + (ch - '0'); 3597 arg = arg * 10 + (ch - '0');
2904 3598
2905 if (ch == ';') 3599 if (ch == ';')
2906 { 3600 {
2907 s = get_to_st (&eh); 3601 unsigned char *s = get_to_st (eh);
3602
2908 if (s) 3603 if (s)
2909 { 3604 {
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); 3605 process_xterm_seq (arg, (char *)s, eh);
2922 free (s); 3606 free (s);
2923 } 3607 }
2924 } 3608 }
2925} 3609}
3610
3611void
3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3613{
3614 if (str[0] == '?' && !str[1])
3615 {
3616 unsigned short r, g, b;
3617 pix_colors_focused[color].get (display, r, g, b);
3618 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3619 }
3620 else
3621 set_window_color (color, str);
3622}
3623
2926/* 3624/*
2927 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2928 * 0 = change iconName/title 3626 * 0 = change iconName/title
2929 * 1 = change iconName 3627 * 1 = change iconName
2930 * 2 = change title 3628 * 2 = change title
2931 * 4 = change color 3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
2932 * 12 = change text color 3632 * 12 = change text color
2933 * 13 = change mouse foreground color 3633 * 13 = change mouse foreground color
2934 * 17 = change highlight character colour 3634 * 17 = change highlight character colour
2935 * 18 = change bold character color 3635 * 18 = change bold character color
2936 * 19 = change underlined character color 3636 * 19 = change underlined character color
2937 * 46 = change logfile (not implemented) 3637 * 46 = change logfile (not implemented)
2938 * 50 = change font 3638 * 50 = change font
2939 * 3639 *
2940 * rxvt extensions: 3640 * rxvt extensions:
2941 * 9 = change locale (NYI)
2942 * 10 = menu (may change in future)
2943 * 20 = bg pixmap 3641 * 20 = bg pixmap
2944 * 39 = change default fg color 3642 * 39 = change default fg color
2945 * 49 = change default bg color 3643 * 49 = change default bg color
2946 * 55 = dump scrollback buffer and all of screen 3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
2947 */ 3648 */
2948void 3649void
2949rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2950{ 3651{
2951 int changed = 0; 3652 int changed = 0;
2952 int color; 3653 int color;
2953 char *buf, *name; 3654 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1];
3656 int saveop = op;
2954 3657
2955 assert (str != NULL); 3658 assert (str != NULL);
2956 switch (op) 3659 switch (op)
2957 { 3660 {
2958 case XTerm_name: 3661 case XTerm_name:
2959 set_title (str); 3662 set_title (str);
2960 /* FALLTHROUGH */ 3663 /* FALLTHROUGH */
2961 case XTerm_iconName: 3664 case XTerm_iconName:
2962 set_iconName (str); 3665 set_icon_name (str);
2963 break; 3666 break;
2964 case XTerm_title: 3667 case XTerm_title:
2965 set_title (str); 3668 set_title (str);
2966 break; 3669 break;
3670 case XTerm_property:
3671 if (str[0] == '?')
3672 {
3673 Atom prop = display->atom (str + 1);
3674 Atom actual_type;
3675 int actual_format;
3676 unsigned long nitems;
3677 unsigned long bytes_after;
3678 unsigned char *value = 0;
3679 const char *str = "";
3680
3681 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None
3687 && actual_format == 8)
3688 str = (const char *)(value);
3689
3690 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3691
3692 XFree (value);
3693 }
3694 else
3695 {
3696 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3697
3698 if (eq)
3699 {
3700 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1);
3702 }
3703 else
3704 XDeleteProperty (display->display, TermWin.parent[0],
3705 display->atom (str));
3706 }
3707 break;
3708
2967 case XTerm_Color: 3709 case XTerm_Color:
2968 for (buf = (char *)str; buf && *buf;) 3710 for (buf = (char *)str; buf && *buf;)
2969 { 3711 {
2970 if ((name = STRCHR (buf, ';')) == NULL) 3712 if ((name = strchr (buf, ';')) == NULL)
2971 break; 3713 break;
3714
2972 *name++ = '\0'; 3715 *name++ = '\0';
2973 color = atoi (buf); 3716 color = atoi (buf);
3717
2974 if (color < 0 || color >= TOTAL_COLORS) 3718 if (color < 0 || color >= TOTAL_COLORS)
2975 break; 3719 break;
3720
2976 if ((buf = STRCHR (name, ';')) != NULL) 3721 if ((buf = strchr (name, ';')) != NULL)
2977 *buf++ = '\0'; 3722 *buf++ = '\0';
3723
3724 if (name[0] == '?' && !name[1])
3725 {
3726 unsigned short r, g, b;
3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3729 }
3730 else
2978 set_window_color (color + minCOLOR, name); 3731 set_window_color (color + minCOLOR, name);
2979 } 3732 }
3733 break;
3734 case XTerm_Color00:
3735 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3736 break;
3737 case XTerm_Color01:
3738 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2980 break; 3739 break;
2981#ifndef NO_CURSORCOLOR 3740#ifndef NO_CURSORCOLOR
2982 case XTerm_Color_cursor: 3741 case XTerm_Color_cursor:
2983 set_window_color (Color_cursor, str); 3742 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2984 break; 3743 break;
2985#endif 3744#endif
2986 case XTerm_Color_pointer: 3745 case XTerm_Color_pointer_fg:
2987 set_window_color (Color_pointer, str); 3746 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3747 break;
3748 case XTerm_Color_pointer_bg:
3749 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2988 break; 3750 break;
2989#ifndef NO_BOLD_UNDERLINE_REVERSE 3751#ifndef NO_BOLD_UNDERLINE_REVERSE
2990 case XTerm_Color_BD: 3752 case XTerm_Color_BD:
2991 set_window_color (Color_BD, str); 3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
2992 break; 3757 break;
2993 case XTerm_Color_UL: 3758 case XTerm_Color_UL:
2994 set_window_color (Color_UL, str); 3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2995 break; 3760 break;
2996 case XTerm_Color_RV: 3761 case XTerm_Color_RV:
2997 set_window_color (Color_RV, str); 3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2998 break; 3763 break;
2999#endif 3764#endif
3000 3765#if TRANSPARENT && TINTING
3001 case XTerm_Menu: 3766 case XTerm_Color_tint:
3002 /* 3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3003 * rxvt_menubar_dispatch () violates the constness of the string, 3768 check_our_parents ();
3004 * so DON'T do it here 3769 if (am_transparent)
3005 */ 3770 want_full_refresh = want_refresh = 1;
3006 break; 3771 break;
3772#endif
3773
3007 case XTerm_Pixmap: 3774 case XTerm_Pixmap:
3008 if (*str != ';') 3775 if (*str != ';')
3009 { 3776 {
3010#if XPM_BACKGROUND 3777#if XPM_BACKGROUND
3011 scale_pixmap (""); /* reset to default scaling */ 3778 scale_pixmap (""); /* reset to default scaling */
3012 set_bgPixmap (str); /* change pixmap */ 3779 set_bgPixmap (str); /* change pixmap */
3013#endif 3780#endif
3014 scr_touch (true); 3781 scr_touch (true);
3015 } 3782 }
3016 while ((str = STRCHR (str, ';')) != NULL) 3783 while ((str = strchr (str, ';')) != NULL)
3017 { 3784 {
3018 str++; 3785 str++;
3019#if XPM_BACKGROUND 3786#if XPM_BACKGROUND
3020 changed += scale_pixmap (str); 3787 changed += scale_pixmap (str);
3021#endif 3788#endif
… …
3034 set_window_color (Color_fg, str); 3801 set_window_color (Color_fg, str);
3035 break; 3802 break;
3036 case XTerm_restoreBG: 3803 case XTerm_restoreBG:
3037 set_window_color (Color_bg, str); 3804 set_window_color (Color_bg, str);
3038 break; 3805 break;
3806
3039 case XTerm_logfile: 3807 case XTerm_logfile:
3808 // TODO, when secure mode?
3040 break; 3809 break;
3810
3041 case XTerm_font: 3811 case XTerm_font:
3042 change_font (str); 3812 op = URxvt_font;
3813 case URxvt_font:
3814#if ENABLE_STYLES
3815 case URxvt_boldFont:
3816 case URxvt_italicFont:
3817 case URxvt_boldItalicFont:
3818#endif
3819 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3823 resp);
3824 else
3825 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827
3828 res = strdup (str);
3829 allocated.push_back ((void *)res);
3830 set_fonts ();
3831 }
3043 break; 3832 break;
3044#ifndef NO_FRILLS 3833
3834#if ENABLE_FRILLS
3045 case XTerm_locale: 3835 case XTerm_locale:
3046 if (str[0] == '?' && !str[1]) 3836 if (query)
3047 tt_printf ("%-.250s\n", locale); 3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3048 else 3838 else
3049 { 3839 {
3050 set_locale (str); 3840 set_locale (str);
3051# ifdef USE_XIM 3841# ifdef USE_XIM
3052 im_cb (); 3842 im_cb ();
3053# endif 3843# 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 } 3844 }
3059 break; 3845 break;
3846#endif
3847
3848#ifdef MENUBAR
3849 case XTerm_Menu:
3850 if (options & Opt_insecure)
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3852 break;
3060#endif 3853#endif
3061#if 0 3854#if 0
3062 case XTerm_dumpscreen: /* no error notices */ 3855 case XTerm_dumpscreen: /* no error notices */
3063 { 3856 {
3064 int fd; 3857 int fd;
3065 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3066 { 3859 {
3067 scr_dump (fd); 3860 scr_dump (fd);
3068 close (fd); 3861 close (fd);
3069 } 3862 }
3070 } 3863 }
3071 break; 3864 break;
3072#endif 3865#endif
3073
3074 } 3866 }
3075} 3867}
3076/*----------------------------------------------------------------------*/ 3868/*----------------------------------------------------------------------*/
3077 3869
3078/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3870/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3086 * so no need for fancy checking 3878 * so no need for fancy checking
3087 */ 3879 */
3088int 3880int
3089rxvt_term::privcases (int mode, unsigned long bit) 3881rxvt_term::privcases (int mode, unsigned long bit)
3090{ 3882{
3091 int state; 3883 int state;
3092 3884
3093 if (mode == 's') 3885 if (mode == 's')
3094 { 3886 {
3095 SavedModes |= (PrivateModes & bit); 3887 SavedModes |= (priv_modes & bit);
3096 return -1; 3888 return -1;
3097 } 3889 }
3098 else 3890 else
3099 { 3891 {
3100 if (mode == 'r') 3892 if (mode == 'r')
3101 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3893 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3102 else 3894 else
3103 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3895 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3104 PrivMode (state, bit); 3896 PrivMode (state, bit);
3105 } 3897 }
3898
3106 return state; 3899 return state;
3107} 3900}
3108 3901
3109/* we're not using priv _yet_ */ 3902/* we're not using priv _yet_ */
3110void 3903void
3111rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3904rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3112{ 3905{
3113 unsigned int i, j; 3906 unsigned int i, j;
3114 int state; 3907 int state;
3908
3115 static const struct 3909 static const struct
3116 { 3910 {
3117 const int argval; 3911 const int argval;
3118 const unsigned long bit; 3912 const unsigned long bit;
3119 } 3913 }
3914
3120 argtopriv[] = { 3915 argtopriv[] = {
3121 { 1, PrivMode_aplCUR }, 3916 { 1, PrivMode_aplCUR },
3122 { 2, PrivMode_vt52 }, 3917 { 2, PrivMode_vt52 },
3123 { 3, PrivMode_132 }, 3918 { 3, PrivMode_132 },
3124 { 4, PrivMode_smoothScroll }, 3919 { 4, PrivMode_smoothScroll },
3125 { 5, PrivMode_rVideo }, 3920 { 5, PrivMode_rVideo },
3126 { 6, PrivMode_relOrigin }, 3921 { 6, PrivMode_relOrigin },
3127 { 7, PrivMode_Autowrap }, 3922 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode
3128 { 9, PrivMode_MouseX10 }, 3924 { 9, PrivMode_MouseX10 },
3129#ifdef menuBar_esc 3925#ifdef menuBar_esc
3130 { menuBar_esc, PrivMode_menuBar }, 3926 { menuBar_esc, PrivMode_menuBar },
3131#endif 3927#endif
3928 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor },
3132#ifdef scrollBar_esc 3930#ifdef scrollBar_esc
3133 { scrollBar_esc, PrivMode_scrollBar }, 3931 { scrollBar_esc, PrivMode_scrollBar },
3134#endif 3932#endif
3135 { 25, PrivMode_VisibleCursor },
3136 { 35, PrivMode_ShiftKeys }, 3933 { 35, PrivMode_ShiftKeys }, // rxvt extension
3137 { 40, PrivMode_132OK }, 3934 { 40, PrivMode_132OK },
3935 // 41 xterm more fixes NYI
3936 // 45 margin bell NYI
3937 // 46 start logging
3138 { 47, PrivMode_Screen }, 3938 { 47, PrivMode_Screen },
3139 { 66, PrivMode_aplKP }, 3939 { 66, PrivMode_aplKP },
3140#ifndef NO_BACKSPACE_KEY 3940#ifndef NO_BACKSPACE_KEY
3141 { 67, PrivMode_BackSpace }, 3941 { 67, PrivMode_BackSpace },
3142#endif 3942#endif
3143 { 1000, PrivMode_MouseX11 }, 3943 { 1000, PrivMode_MouseX11 },
3944 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3945 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3946 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3144 { 1010, PrivMode_TtyOutputInh }, 3947 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3145 { 1011, PrivMode_Keypress }, 3948 { 1011, PrivMode_Keypress }, // rxvt extension
3949 // 1035 enable modifiers for alt, numlock NYI
3950 // 1036 send ESC for meta keys NYI
3951 // 1037 send DEL for keypad delete NYI
3146 { 1047, PrivMode_Screen }, 3952 { 1047, PrivMode_Screen },
3953 // 1048 save and restore cursor
3147 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3954 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3955 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3148 }; 3956 };
3149 3957
3150 if (nargs == 0) 3958 if (nargs == 0)
3151 return; 3959 return;
3152 3960
… …
3167 state = privcases (mode, argtopriv[j].bit); 3975 state = privcases (mode, argtopriv[j].bit);
3168 break; 3976 break;
3169 } 3977 }
3170 3978
3171 /* extra handling for values with state unkept */ 3979 /* extra handling for values with state unkept */
3172 if (state == -1)
3173 switch (arg[i]) 3980 switch (arg[i])
3174 { 3981 {
3175 case 1048: /* alternative cursor save */ 3982 case 1048: /* alternative cursor save */
3983 case 1049:
3984 if (options & Opt_secondaryScreen)
3176 if (mode == 0) 3985 if (mode == 0)
3177 scr_cursor (RESTORE); 3986 scr_cursor (RESTORE);
3178 else if (mode == 1) 3987 else if (mode == 1)
3179 scr_cursor (SAVE); 3988 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; 3989 break;
3990 }
3991
3992 if (state >= 0)
3993 /* extra handling for values with valid 0 or 1 state */
3994 switch (arg[i])
3995 {
3996 /* case 1: - application cursor keys */
3997 case 2: /* VT52 mode */
3998 /* oddball mode. should be set regardless of set/reset
3999 * parameter. Return from VT52 mode with an ESC < from
4000 * within VT52 mode
4001 */
4002 PrivMode (1, PrivMode_vt52);
4003 break;
3196 case 3: /* 80/132 */ 4004 case 3: /* 80/132 */
3197 if (PrivateModes & PrivMode_132OK) 4005 if (priv_modes & PrivMode_132OK)
3198 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3199 (unsigned int)TermWin.height);
3200 break; 4007 break;
3201 case 4: /* smooth scrolling */ 4008 case 4: /* smooth scrolling */
3202 if (state) 4009 if (state)
3203 Options &= ~Opt_jumpScroll; 4010 options &= ~Opt_jumpScroll;
3204 else 4011 else
3205 Options |= Opt_jumpScroll; 4012 options |= Opt_jumpScroll;
3206 break; 4013 break;
3207 case 5: /* reverse video */ 4014 case 5: /* reverse video */
3208 scr_rvideo_mode (state); 4015 scr_rvideo_mode (state);
3209 break; 4016 break;
3210 case 6: /* relative/absolute origins */ 4017 case 6: /* relative/absolute origins */
3211 scr_relative_origin (state); 4018 scr_relative_origin (state);
3212 break; 4019 break;
3213 case 7: /* autowrap */ 4020 case 7: /* autowrap */
3214 scr_autowrap (state); 4021 scr_autowrap (state);
3215 break; 4022 break;
3216 /* case 8: - auto repeat, can't do on a per window basis */ 4023 /* case 8: - auto repeat, can't do on a per window basis */
3217 case 9: /* X10 mouse reporting */ 4024 case 9: /* X10 mouse reporting */
3218 if (state) /* orthogonal */ 4025 if (state) /* orthogonal */
3219 PrivateModes &= ~ (PrivMode_MouseX11); 4026 priv_modes &= ~PrivMode_MouseX11;
3220 break; 4027 break;
3221#ifdef menuBar_esc 4028#ifdef menuBar_esc
3222 case menuBar_esc: 4029 case menuBar_esc:
3223#ifdef MENUBAR 4030#ifdef MENUBAR
3224 map_menuBar (state); 4031 map_menuBar (state);
3225#endif 4032#endif
3226 break; 4033 break;
3227#endif 4034#endif
3228#ifdef scrollBar_esc 4035#ifdef scrollBar_esc
3229 case scrollBar_esc: 4036 case scrollBar_esc:
3230 if (scrollbar_mapping (state)) 4037 if (scrollbar_mapping (state))
3231 { 4038 {
3232 resize_all_windows (0, 0, 0); 4039 resize_all_windows (0, 0, 0);
3233 scr_touch (true); 4040 scr_touch (true);
3234 } 4041 }
3235 break; 4042 break;
3236#endif 4043#endif
3237 case 25: /* visible/invisible cursor */ 4044 case 25: /* visible/invisible cursor */
3238 scr_cursor_visible (state); 4045 scr_cursor_visible (state);
3239 break; 4046 break;
3240 /* case 35: - shift keys */ 4047 /* case 35: - shift keys */
3241 /* case 40: - 80 <--> 132 mode */ 4048 /* case 40: - 80 <--> 132 mode */
3242 case 47: /* secondary screen */ 4049 case 47: /* secondary screen */
3243 scr_change_screen (state); 4050 scr_change_screen (state);
3244 break; 4051 break;
3245 /* case 66: - application key pad */ 4052 /* case 66: - application key pad */
3246 /* case 67: - backspace key */ 4053 /* case 67: - backspace key */
3247 case 1000: /* X11 mouse reporting */ 4054 case 1000: /* X11 mouse reporting */
3248 if (state) /* orthogonal */ 4055 if (state) /* orthogonal */
3249 PrivateModes &= ~ (PrivMode_MouseX10); 4056 priv_modes &= ~PrivMode_MouseX10;
3250 break; 4057 break;
3251#if 0 4058#if 0
3252 case 1001: 4059 case 1001:
3253 break; /* X11 mouse highlighting */ 4060 break; /* X11 mouse highlighting */
3254#endif 4061#endif
3255 case 1010: /* scroll to bottom on TTY output inhibit */ 4062 case 1010: /* scroll to bottom on TTY output inhibit */
3256 if (state) 4063 if (state)
3257 Options &= ~Opt_scrollTtyOutput; 4064 options &= ~Opt_scrollTtyOutput;
3258 else 4065 else
3259 Options |= Opt_scrollTtyOutput; 4066 options |= Opt_scrollTtyOutput;
3260 break; 4067 break;
3261 case 1011: /* scroll to bottom on key press */ 4068 case 1011: /* scroll to bottom on key press */
3262 if (state) 4069 if (state)
3263 Options |= Opt_scrollTtyKeypress; 4070 options |= Opt_scrollTtyKeypress;
3264 else 4071 else
3265 Options &= ~Opt_scrollTtyKeypress; 4072 options &= ~Opt_scrollTtyKeypress;
3266 break; 4073 break;
3267 case 1047: /* secondary screen w/ clearing */ 4074 case 1047: /* secondary screen w/ clearing last */
3268 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4075 if (options & Opt_secondaryScreen)
3269 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3270 scr_erase_screen (2); 4077 scr_erase_screen (2);
3271 scr_change_screen (state); 4078 scr_change_screen (state);
3272 /* FALLTHROUGH */
3273 default:
3274 break; 4079 break;
4080 case 1049: /* secondary screen w/ clearing first */
4081 scr_change_screen (state);
4082 if (options & Opt_secondaryScreen)
4083 if (current_screen != PRIMARY)
4084 scr_erase_screen (2);
4085 break;
4086 default:
4087 break;
3275 } 4088 }
3276 } 4089 }
3277} 4090}
3278/*}}} */ 4091/*}}} */
3279 4092
3280/*{{{ process sgr sequences */ 4093/*{{{ process sgr sequences */
3281void 4094void
3282rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4095rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3283{ 4096{
3284 unsigned int i; 4097 unsigned int i;
3285 short rendset; 4098 short rendset;
3286 int rendstyle; 4099 int rendstyle;
3287 4100
3288 if (nargs == 0) 4101 if (nargs == 0)
3289 { 4102 {
3290 scr_rendition (0, ~RS_None); 4103 scr_rendition (0, ~RS_None);
3291 return; 4104 return;
3292 } 4105 }
4106
3293 for (i = 0; i < nargs; i++) 4107 for (i = 0; i < nargs; i++)
3294 { 4108 {
3295 rendset = -1; 4109 rendset = -1;
3296 switch (arg[i]) 4110 switch (arg[i])
3297 { 4111 {
… …
3299 rendset = 0, rendstyle = ~RS_None; 4113 rendset = 0, rendstyle = ~RS_None;
3300 break; 4114 break;
3301 case 1: 4115 case 1:
3302 rendset = 1, rendstyle = RS_Bold; 4116 rendset = 1, rendstyle = RS_Bold;
3303 break; 4117 break;
4118 //case 2: // low intensity
4119 case 3:
4120 rendset = 1, rendstyle = RS_Italic;
4121 break;
3304 case 4: 4122 case 4:
3305 rendset = 1, rendstyle = RS_Uline; 4123 rendset = 1, rendstyle = RS_Uline;
3306 break; 4124 break;
3307 case 5: 4125 case 5: // slowly blinking
4126 case 6: // rapidly blinking
3308 rendset = 1, rendstyle = RS_Blink; 4127 rendset = 1, rendstyle = RS_Blink;
3309 break; 4128 break;
4129 //case 6: // scoansi light background
3310 case 7: 4130 case 7:
3311 rendset = 1, rendstyle = RS_RVid; 4131 rendset = 1, rendstyle = RS_RVid;
3312 break; 4132 break;
3313 case 22: 4133 case 8:
4134 // invisible. NYI
4135 break;
4136 //case 9: // crossed out
4137 //case 10: // scoansi acs off, primary font
4138 //case 11: // scoansi acs on, first alt font
4139 //case 12: // scoansi acs on, |0x80, second alt font
4140 //...
4141 //case 19: // ninth alt font
4142 //case 20: // gothic
4143 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3314 rendset = 0, rendstyle = RS_Bold; 4144 rendset = 0, rendstyle = RS_Bold;
4145 break;
4146 case 22: // normal intensity
4147 rendset = 0, rendstyle = RS_Bold;
4148 break;
4149 case 23: // disable italic
4150 rendset = 0, rendstyle = RS_Italic;
3315 break; 4151 break;
3316 case 24: 4152 case 24:
3317 rendset = 0, rendstyle = RS_Uline; 4153 rendset = 0, rendstyle = RS_Uline;
3318 break; 4154 break;
3319 case 25: 4155 case 25:
3320 rendset = 0, rendstyle = RS_Blink; 4156 rendset = 0, rendstyle = RS_Blink;
3321 break; 4157 break;
4158 case 26: // variable spacing (iso 8613)
4159 rendset = 0, rendstyle = RS_Blink;
4160 break;
3322 case 27: 4161 case 27:
3323 rendset = 0, rendstyle = RS_RVid; 4162 rendset = 0, rendstyle = RS_RVid;
3324 break; 4163 break;
4164 //case 28: // visible. NYI
4165 //case 29: // not crossed-out
3325 } 4166 }
4167
3326 if (rendset != -1) 4168 if (rendset != -1)
3327 { 4169 {
3328 scr_rendition (rendset, rendstyle); 4170 scr_rendition (rendset, rendstyle);
3329 continue; /* for (;i;) */ 4171 continue; /* for (;i;) */
3330 } 4172 }
… …
3337 case 33: 4179 case 33:
3338 case 34: 4180 case 34:
3339 case 35: 4181 case 35:
3340 case 36: 4182 case 36:
3341 case 37: 4183 case 37:
3342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4184 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3343 Color_fg);
3344 break; 4185 break;
3345#ifdef TTY_256COLOR 4186 case 38: // set fg color, ISO 8613-6
3346 case 38:
3347 if (nargs > i + 2 && arg[i + 1] == 5) 4187 if (nargs > i + 2 && arg[i + 1] == 5)
3348 { 4188 {
3349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4189 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3350 Color_fg);
3351 i += 2; 4190 i += 2;
3352 } 4191 }
3353 break; 4192 break;
3354#endif
3355 case 39: /* default fg */ 4193 case 39: /* default fg */
3356 scr_color (Color_fg, Color_fg); 4194 scr_color (Color_fg, Color_fg);
3357 break; 4195 break;
3358 4196
3359 case 40: 4197 case 40:
… …
3362 case 43: 4200 case 43:
3363 case 44: 4201 case 44:
3364 case 45: 4202 case 45:
3365 case 46: 4203 case 46:
3366 case 47: 4204 case 47:
3367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4205 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3368 Color_bg);
3369 break; 4206 break;
3370#ifdef TTY_256COLOR 4207 case 48: // set bg color, ISO 8613-6
3371 case 48:
3372 if (nargs > i + 2 && arg[i + 1] == 5) 4208 if (nargs > i + 2 && arg[i + 1] == 5)
3373 { 4209 {
3374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4210 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3375 Color_bg);
3376 i += 2; 4211 i += 2;
3377 } 4212 }
3378 break; 4213 break;
3379#endif
3380 case 49: /* default bg */ 4214 case 49: /* default bg */
3381 scr_color (Color_bg, Color_bg); 4215 scr_color (Color_bg, Color_bg);
3382 break; 4216 break;
4217
4218 //case 50: // not variable spacing
3383 4219
3384#ifndef NO_BRIGHTCOLOR 4220#ifndef NO_BRIGHTCOLOR
3385 case 90: 4221 case 90:
3386 case 91: /* set bright fg color */ 4222 case 91: /* set bright fg color */
3387 case 92: 4223 case 92:
3388 case 93: 4224 case 93:
3389 case 94: 4225 case 94:
3390 case 95: 4226 case 95:
3391 case 96: 4227 case 96:
3392 case 97: 4228 case 97:
3393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4229 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3394 Color_fg);
3395 break; 4230 break;
3396 case 100: 4231 case 100:
3397 case 101: /* set bright bg color */ 4232 case 101: /* set bright bg color */
3398 case 102: 4233 case 102:
3399 case 103: 4234 case 103:
3400 case 104: 4235 case 104:
3401 case 105: 4236 case 105:
3402 case 106: 4237 case 106:
3403 case 107: 4238 case 107:
3404 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3405 Color_bg);
3406 break; 4240 break;
3407#endif 4241#endif
3408 4242
3409 } 4243 }
3410 } 4244 }
3411} 4245}
3412/*}}} */ 4246/*}}} */
3413 4247
3414/*{{{ process Rob Nation's own graphics mode sequences */ 4248/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3415void 4249void
3416rxvt_term::process_graphics () 4250rxvt_term::process_graphics ()
3417{ 4251{
3418 unsigned char ch, cmd = cmd_getc (); 4252 unicode_t ch, cmd = cmd_getc ();
3419 4253
3420 if (cmd == 'Q') 4254 if (cmd == 'Q')
3421 { /* query graphics */ 4255 { /* query graphics */
3422 tt_printf ("\033G0\n"); /* no graphics */ 4256 tt_printf ("\033G0\012"); /* no graphics */
3423 return; 4257 return;
3424 } 4258 }
3425 /* swallow other graphics sequences until terminating ':' */ 4259 /* swallow other graphics sequences until terminating ':' */
3426 do 4260 do
3427 ch = cmd_getc (); 4261 ch = cmd_getc ();
… …
3442 unsigned char buf[256]; 4276 unsigned char buf[256];
3443 4277
3444 va_start (arg_ptr, fmt); 4278 va_start (arg_ptr, fmt);
3445 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3446 va_end (arg_ptr); 4280 va_end (arg_ptr);
3447 tt_write (buf, STRLEN (buf)); 4281 tt_write (buf, strlen (buf));
3448} 4282}
3449 4283
3450/* ---------------------------------------------------------------------- */ 4284/* ---------------------------------------------------------------------- */
3451/* Write data to the pty as typed by the user, pasted with the mouse, 4285/* 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. 4286 * or generated by us in response to a query ESC sequence.
3453 */ 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 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3458 4292
3459 if (len) 4293 if (len)
3460 { 4294 {
3461 if (v_buflen == 0) 4295 if (v_buflen == 0)
3462 { 4296 {
3463 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4297 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3464 4298
3465 if ((unsigned int)written == len) 4299 if ((unsigned int)written == len)
3466 return; 4300 return;
3467 4301
3468 data += written; 4302 data += written;
… …
3476 v_buflen += len; 4310 v_buflen += len;
3477 } 4311 }
3478 4312
3479 for (;;) 4313 for (;;)
3480 { 4314 {
3481 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4315 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3482 4316
3483 if (written > 0) 4317 if (written > 0)
3484 { 4318 {
3485 v_buflen -= written; 4319 v_buflen -= written;
3486 4320

Diff Legend

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