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

Diff Legend

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