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

Diff Legend

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