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

Diff Legend

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